diff options
| author | Ellie Hermaszewska <ellieh@nvidia.com> | 2024-10-15 19:16:43 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-15 19:16:43 +0800 |
| commit | be42eeed7d9e510fea93922c615f1801bc54f336 (patch) | |
| tree | 029aaa2fdfcbe628f0985a42edf2a7f47c6fc54d /external | |
| parent | 456df23cff531566dfe3a6ca7be998f1251b1774 (diff) | |
Lower minimum CMake version to 3.22 (#5295)
* Lower minimum CMake version to 3.22
Reverts https://github.com/shader-slang/slang/pull/4193
* Update build instructions to mention older CMake versions
Diffstat (limited to 'external')
| -rw-r--r-- | external/CMakeLists.txt | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index ebbfefb4a..4f861c759 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -8,6 +8,13 @@ if(NOT CMAKE_MESSAGE_LOG_LEVEL) set(CMAKE_MESSAGE_LOG_LEVEL NOTICE) endif() +if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.25") + set(system SYSTEM) +else() + message(STATUS "CMake 3.25 is required to suppress warnings originating in headers in external/ but you are using ${CMAKE_VERSION}, be prepared for some warnings") + set(system) +endif() + # Similarly, disable warnings for external projects if(NOT SLANG_ENABLE_EXTERNAL_COMPILER_WARNINGS) if(MSVC) @@ -18,12 +25,12 @@ if(NOT SLANG_ENABLE_EXTERNAL_COMPILER_WARNINGS) endif() if (NOT ${SLANG_USE_SYSTEM_UNORDERED_DENSE}) - add_subdirectory(unordered_dense EXCLUDE_FROM_ALL SYSTEM) + add_subdirectory(unordered_dense EXCLUDE_FROM_ALL ${system}) endif() # Miniz if (NOT ${SLANG_USE_SYSTEM_MINIZ}) - add_subdirectory(miniz EXCLUDE_FROM_ALL SYSTEM) + add_subdirectory(miniz EXCLUDE_FROM_ALL ${system}) set_property(TARGET miniz PROPERTY POSITION_INDEPENDENT_CODE ON) # Work around https://github.com/richgel999/miniz/pull/292 get_target_property(miniz_c_launcher miniz C_COMPILER_LAUNCHER) @@ -36,7 +43,7 @@ endif() # LZ4 if (NOT ${SLANG_USE_SYSTEM_LZ4}) set(LZ4_BUNDLED_MODE ON) - add_subdirectory(lz4/build/cmake EXCLUDE_FROM_ALL SYSTEM) + add_subdirectory(lz4/build/cmake EXCLUDE_FROM_ALL ${system}) if(MSVC) target_compile_options( lz4_static @@ -47,7 +54,7 @@ endif() # Vulkan headers if (NOT ${SLANG_USE_SYSTEM_VULKAN_HEADERS}) - add_subdirectory(vulkan EXCLUDE_FROM_ALL SYSTEM) + add_subdirectory(vulkan EXCLUDE_FROM_ALL ${system}) endif() # metal-cpp headers @@ -56,7 +63,7 @@ target_include_directories(metal-cpp INTERFACE "${CMAKE_CURRENT_LIST_DIR}/metal- # SPIRV-Headers if (NOT ${SLANG_USE_SYSTEM_SPIRV_HEADERS}) - add_subdirectory(spirv-headers EXCLUDE_FROM_ALL SYSTEM) + add_subdirectory(spirv-headers EXCLUDE_FROM_ALL ${system}) endif() if(SLANG_ENABLE_SLANG_GLSLANG) @@ -65,13 +72,13 @@ if(SLANG_ENABLE_SLANG_GLSLANG) set(SPIRV_WERROR OFF) set(SPIRV_HEADER_DIR "${CMAKE_CURRENT_LIST_DIR}/spirv-headers/") set(SPIRV_SKIP_TESTS ON) - add_subdirectory(spirv-tools EXCLUDE_FROM_ALL SYSTEM) + add_subdirectory(spirv-tools EXCLUDE_FROM_ALL ${system}) # glslang set(SKIP_GLSLANG_INSTALL ON) set(ENABLE_OPT ON) set(ENABLE_PCH OFF) - add_subdirectory(glslang EXCLUDE_FROM_ALL SYSTEM) + add_subdirectory(glslang EXCLUDE_FROM_ALL ${system}) endif() # imgui |