Skip to content

Commit 7d97854

Browse files
committed
Build: cmake option for shaders frontend glsl and shader ir spirv
1 parent 319f90e commit 7d97854

6 files changed

Lines changed: 10 additions & 15 deletions

File tree

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ FetchContent_Declare(
4444
GIT_PROGRESS TRUE
4545
)
4646
FetchContent_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)
4949
FetchContent_Declare(
5050
glm
5151
GIT_REPOSITORY "https://github.com/g-truc/glm.git"

modules/Utils/include/Utils/PluginLoader.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff 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
}

plugins/Renderer/Vulkan/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,9 @@ project(cae-renderer-vulkan
55

66
find_package(Vulkan QUIET CONFIG)
77
if(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"

plugins/Shader/Frontend/GLSL/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ project(cae-shaders-frontend-glsl
55

66
find_package(glslang QUIET CONFIG)
77
if (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

plugins/Shader/IR/SPIRV/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ include(FetchContent)
2020
find_package(SPIRV-Headers QUIET CONFIG)
2121

2222
if(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()
3838
find_package(SPIRV-Cross QUIET CONFIG)
3939

4040
if(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"

plugins/Window/Win32/CMakeLists.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,8 @@ endif()
2222

2323

2424
file(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

3228
target_include_directories(${PROJECT_NAME} PRIVATE "${PROJECT_SOURCE_DIR}/include")
3329
target_compile_options(${PROJECT_NAME} PRIVATE ${WARNING_FLAGS})

0 commit comments

Comments
 (0)