diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/SlangTarget.cmake | 31 | ||||
| -rw-r--r-- | docs/building.md | 2 | ||||
| m--------- | external/slang-rhi | 0 |
4 files changed, 25 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a57b2190c..eb1c5808f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 diff --git a/cmake/SlangTarget.cmake b/cmake/SlangTarget.cmake index aa87c16bf..41d77a079 100644 --- a/cmake/SlangTarget.cmake +++ b/cmake/SlangTarget.cmake @@ -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") @@ -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() # diff --git a/docs/building.md b/docs/building.md index 54fca8d6a..f32bda997 100644 --- a/docs/building.md +++ b/docs/building.md @@ -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) diff --git a/external/slang-rhi b/external/slang-rhi -Subproject 6792a7ca55380b08420cd5521a2aaabd287a139 +Subproject 753c6f84de19d0b25382946c503770a67154e36 |