diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2018-11-09 05:21:49 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2018-11-09 05:21:49 +0000 |
| commit | 893d4b53441722e9f492aff018e2eed4e2e35f74 (patch) | |
| tree | 5a98a83a2293001d1f7ba0f6ba8afb515042896d | |
| parent | Fixed issue with ~FenceVkImpl(): not disposing pending fences as they may not... (diff) | |
| download | DiligentCore-893d4b53441722e9f492aff018e2eed4e2e35f74.tar.gz DiligentCore-893d4b53441722e9f492aff018e2eed4e2e35f74.zip | |
Fixed cmake 3.13 policy CMP0077 warnings
| -rw-r--r-- | External/CMakeLists.txt | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/External/CMakeLists.txt b/External/CMakeLists.txt index 44806e3e..567d26af 100644 --- a/External/CMakeLists.txt +++ b/External/CMakeLists.txt @@ -15,9 +15,10 @@ if(PLATFORM_WIN32 OR PLATFORM_LINUX) #set_directory_root_folder("SPIRV-Headers" "Core/External/SPIRV-Headers") set(SPIRV-Headers_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/SPIRV-Headers") - set(SPIRV_SKIP_TESTS ON) - set(SPIRV_SKIP_EXECUTABLES ON) - set(SKIP_SPIRV_TOOLS_INSTALL ON) + set(SPIRV_SKIP_TESTS ON CACHE BOOL "Skip SPIRV tests") + set(SPIRV_BUILD_COMPRESSION OFF CACHE BOOL "Do not build SPIRV compressing codec") + set(SPIRV_SKIP_EXECUTABLES ON CACHE BOOL "Skip building SPIRV executable and tests along with the library") + set(SKIP_SPIRV_TOOLS_INSTALL ON CACHE BOOL "Skip SPIRV tools installation") add_subdirectory(SPIRV-Tools) set_directory_root_folder("SPIRV-Tools" "Core/External/SPIRV-Tools") # We only need SPIRV-Tools-opt for glslang that also depends on SPIRV-Tools. @@ -26,9 +27,9 @@ if(PLATFORM_WIN32 OR PLATFORM_LINUX) list(REMOVE_ITEM SPIRV_Tools_Targets SPIRV-Tools SPIRV-Tools-opt) set_target_properties(${SPIRV_Tools_Targets} PROPERTIES EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_DEFAULT_BUILD 1) - option(ENABLE_GLSLANG_BINARIES OFF) - option(ENABLE_SPVREMAPPER OFF) - set(SKIP_GLSLANG_INSTALL ON) + set(ENABLE_GLSLANG_BINARIES OFF CACHE BOOL "Do not build glslang binaries") + set(ENABLE_SPVREMAPPER OFF CACHE BOOL "Do not build SPIRV remapper") + set(SKIP_GLSLANG_INSTALL ON CACHE BOOL "Skip glslang installation") add_subdirectory(glslang) set_directory_root_folder("glslang" "Core/External/glslang") |