File tree Expand file tree Collapse file tree
modules/Utils/include/Utils Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -44,8 +44,8 @@ FetchContent_Declare(
4444 GIT_PROGRESS TRUE
4545)
4646FetchContent_MakeAvailable (nlohmann-json)
47- set (GLM_BUILD_TESTS OFF CACHE INTERNAL "" )
48- set (BUILD_SHARED_LIBS OFF CACHE INTERNAL "" )
47+ set (GLM_BUILD_TESTS OFF CACHE BOOL "" FORCE )
48+ set (BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE )
4949FetchContent_Declare (
5050 glm
5151 GIT_REPOSITORY "https://github.com/g-truc/glm.git"
Original file line number Diff line number Diff line change @@ -143,6 +143,7 @@ namespace utl
143143 }
144144 catch (const std::exception &e)
145145 {
146+ throw std::runtime_error (std::string (" Unknown exception: " ) + e.what ());
146147 return nullptr ;
147148 }
148149 }
Original file line number Diff line number Diff line change @@ -5,12 +5,9 @@ project(cae-renderer-vulkan
55
66find_package (Vulkan QUIET CONFIG )
77if (NOT Vulkan_FOUND)
8- message (STATUS "Vulkan SDK not found." )
9-
108 include (FetchContent )
11-
129 set (VULKAN_VERSION "v1.4.329" )
13-
10+ set (VULKAN_HEADERS_ENABLE_TESTS OFF CACHE BOOL "" FORCE )
1411 FetchContent_Declare (
1512 VulkanHeaders
1613 GIT_REPOSITORY "https://github.com/KhronosGroup/Vulkan-Headers.git"
Original file line number Diff line number Diff line change @@ -5,12 +5,12 @@ project(cae-shaders-frontend-glsl
55
66find_package (glslang QUIET CONFIG )
77if (NOT glslang_FOUND)
8- message (STATUS "glslang not found." )
9-
108 include (FetchContent )
9+ set (BUILD_EXTERNAL OFF CACHE BOOL "" FORCE )
1110 set (ENABLE_HLSL OFF CACHE BOOL "" FORCE )
1211 set (ENABLE_OPT OFF CACHE BOOL "" FORCE )
1312 set (ENABLE_SPIRV ON CACHE BOOL "" FORCE )
13+ set (ENABLE_GLSLANG_BINARIES ON CACHE BOOL "" FORCE )
1414 set (GLSLANG_TESTS OFF CACHE BOOL "" FORCE )
1515 FetchContent_Declare (
1616 glslang
Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ include(FetchContent)
2020find_package (SPIRV-Headers QUIET CONFIG )
2121
2222if (NOT SPIRV-Headers_FOUND)
23- message ( STATUS "SPIRV-Headers not found." )
23+ set (SPIRV_HEADERS_ENABLE_TESTS OFF CACHE BOOL "" FORCE )
2424 FetchContent_Declare (
2525 spirv-headers
2626 GIT_REPOSITORY "https://github.com/KhronosGroup/SPIRV-Headers.git"
@@ -38,7 +38,8 @@ endif()
3838find_package (SPIRV-Cross QUIET CONFIG )
3939
4040if (NOT SPIRV-Cross_FOUND)
41- message (STATUS "SPIRV-Cross not found." )
41+ set (SPIRV_CROSS_ENABLE_TESTS OFF CACHE BOOL "" FORCE )
42+ set (SPIRV_CROSS_CLI OFF CACHE BOOL "" FORCE )
4243 FetchContent_Declare (
4344 spirv-cross
4445 GIT_REPOSITORY "https://github.com/KhronosGroup/SPIRV-Cross.git"
Original file line number Diff line number Diff line change @@ -22,12 +22,8 @@ endif()
2222
2323
2424file (GLOB_RECURSE SOURCE "${PROJECT_SOURCE_DIR } /src/*.cpp" )
25- file (GLOB_RECURSE HEADERS "${PROJECT_SOURCE_DIR } /include/*.hpp" )
2625
27- add_library (${PROJECT_NAME } SHARED
28- ${SOURCE}
29- ${HEADERS}
30- )
26+ add_library (${PROJECT_NAME } SHARED ${SOURCE} )
3127
3228target_include_directories (${PROJECT_NAME } PRIVATE "${PROJECT_SOURCE_DIR } /include" )
3329target_compile_options (${PROJECT_NAME } PRIVATE ${WARNING_FLAGS} )
You can’t perform that action at this time.
0 commit comments