Skip to content

Reset minimum cmake version to 3.22 #7548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gtong-nv merged 2 commits into from
Jun 30, 2025
Merged

Reset minimum cmake version to 3.22 #7548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f9cd78
Reset minimum cmake version to 3.22
gtong-nv Jun 27, 2025
756b560
update slang-rhi
gtong-nv Jun 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.26)
cmake_minimum_required(VERSION 3.22)

# Our module dir, include that now so that we can get the version automatically
# from git describe
Expand Down
31 changes: 23 additions & 8 deletions cmake/SlangTarget.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,10 +414,18 @@ function(slang_add_target dir type)
#
# Link and include from dependencies
#
target_link_libraries(
${target}
PRIVATE $<BUILD_LOCAL_INTERFACE:${ARG_LINK_WITH_PRIVATE}>
)
if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.26")
target_link_libraries(
${target}
PRIVATE $<BUILD_LOCAL_INTERFACE:${ARG_LINK_WITH_PRIVATE}>
)
else()
target_link_libraries(
${target}
PRIVATE $<BUILD_INTERFACE:${ARG_LINK_WITH_PRIVATE}>
)
endif()

target_link_libraries(${target} PUBLIC ${ARG_LINK_WITH_PUBLIC})

if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
Expand Down Expand Up @@ -458,10 +466,17 @@ function(slang_add_target dir type)
endforeach()
foreach(inc ${ARG_INCLUDE_DIRECTORIES_PRIVATE})
get_filename_component(inc_abs ${inc} ABSOLUTE)
target_include_directories(
${target}
PRIVATE "$<BUILD_LOCAL_INTERFACE:${inc_abs}>"
)
if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.26")
target_include_directories(
${target}
PRIVATE "$<BUILD_LOCAL_INTERFACE:${inc_abs}>"
)
else()
target_include_directories(
${target}
PRIVATE "$<BUILD_INTERFACE:${inc_abs}>"
)
endif()
endforeach()

#
Expand Down
2 changes: 1 addition & 1 deletion docs/building.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ version of Slang.

Please install:

- CMake (3.25 preferred, but 3.22 works[^1])
- CMake (3.26 preferred, but 3.22 works[^1])
- A C++ compiler with support for C++17. GCC, Clang and MSVC are supported
- A CMake compatible backend, for example Visual Studio or Ninja
- Python3 (a dependency for building spirv-tools)
Expand Down
2 changes: 1 addition & 1 deletion external/slang-rhi
Open in desktop
Submodule slang-rhi updated 71 files
+23 −6 CMakeLists.txt
+21 −13 include/slang-rhi.h
+10 −5 src/cuda/cuda-surface.cpp
+110 −91 src/cuda/cuda-texture.cpp
+2 −0 src/cuda/cuda-texture.h
+9 −2 src/d3d/d3d-surface.h
+133 −2 src/d3d11/d3d11-command.cpp
+0 −16 src/d3d11/d3d11-helper-functions.cpp
+0 −1 src/d3d11/d3d11-helper-functions.h
+1 −1 src/d3d11/d3d11-pipeline.cpp
+2 −2 src/d3d12/d3d12-pipeline.cpp
+1 −1 src/debug-layer/debug-command-queue.cpp
+0 −4 src/debug-layer/debug-surface.cpp
+4 −4 src/format-conversion.h
+6 −1 src/metal/metal-surface.cpp
+5 −5 src/metal/metal-util.cpp
+1 −1 src/metal/metal-util.h
+6 −6 src/rhi.cpp
+1 −1 src/vulkan/vk-pipeline.cpp
+32 −1 src/vulkan/vk-surface.cpp
+1 −1 src/wgpu/wgpu-device.cpp
+1 −1 src/wgpu/wgpu-pipeline.cpp
+13 −2 src/wgpu/wgpu-surface.cpp
+3 −5 tests/test-benchmark-command.cpp
+1 −1 tests/test-bindless-descriptor-handles.cpp
+1 −1 tests/test-buffer-from-handle.cpp
+1 −1 tests/test-buffer-shared.cpp
+1 −1 tests/test-cmd-copy-buffer-to-texture.cpp
+10 −10 tests/test-cmd-copy-texture-to-buffer.cpp
+15 −15 tests/test-cmd-copy-texture.cpp
+1 −1 tests/test-cmd-debug.cpp
+20 −20 tests/test-cmd-draw.cpp
+1 −1 tests/test-compilation-report.cpp
+1 −1 tests/test-compute-smoke.cpp
+1 −1 tests/test-compute-trivial.cpp
+1 −1 tests/test-cooperative-vector.cpp
+1 −1 tests/test-device-from-handle.cpp
+5 −17 tests/test-formats.cpp
+0 −35 tests/test-formats.slang
+1 −1 tests/test-link-time-constant.cpp
+1 −1 tests/test-link-time-default.cpp
+1 −1 tests/test-link-time-options.cpp
+1 −1 tests/test-link-time-type.cpp
+1 −1 tests/test-mutable-shader-object.cpp
+2 −3 tests/test-nested-parameter-block.cpp
+1 −1 tests/test-null-views.cpp
+1 −1 tests/test-pipeline-cache.cpp
+1 −1 tests/test-precompiled-module-cache.cpp
+5 −6 tests/test-precompiled-module.cpp
+3 −3 tests/test-ray-tracing-sphere.cpp
+3 −3 tests/test-ray-tracing.cpp
+2 −2 tests/test-resolve-resource-tests.cpp
+3 −4 tests/test-resource-states.cpp
+1 −1 tests/test-root-mutable-shader-object.cpp
+1 −1 tests/test-root-shader-parameter.cpp
+1 −1 tests/test-sampler-array.cpp
+3 −3 tests/test-sampler.cpp
+33 −35 tests/test-shader-cache.cpp
+1 −1 tests/test-shader-object-large.cpp
+1 −1 tests/test-shader-object-resource-tracking.cpp
+20 −9 tests/test-surface.cpp
+10 −10 tests/test-task-pool.cpp
+35 −35 tests/test-texture-layout.cpp
+2 −2 tests/test-texture-shared.cpp
+12 −10 tests/test-texture-types.cpp
+207 −0 tests/test-texture-view-3d.cpp
+1 −1 tests/test-texture-view-3d.slang
+342 −171 tests/test-texture-view.cpp
+1 −1 tests/test-uint16-structured-buffer.cpp
+17 −6 tests/testing.cpp
+12 −12 tests/texture-test.cpp
Loading