-
Notifications
You must be signed in to change notification settings - Fork 6.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
cf035d9
commit 536c08d
Showing
2 changed files
with
30 additions
and
43 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,49 +1,35 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 30cb2da..dbc051b 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -232,8 +232,13 @@ if(BUILD_VULKAN_COMPILER OR BUILD_TOOL) | ||
spirv-cross-util) | ||
|
||
else() | ||
- list(APPEND LLGI_THIRDPARTY_INCLUDES ${GLSLANG_INCLUDE_DIR} | ||
- ${SPIRVCROSS_INCLUDE_DIR}) | ||
+ # from vcpkg | ||
+ find_package(glslang CONFIG REQUIRED) | ||
+ find_package(spirv_cross_core CONFIG REQUIRED) | ||
+ find_package(spirv_cross_glsl CONFIG REQUIRED) | ||
+ find_package(spirv_cross_hlsl CONFIG REQUIRED) | ||
+ find_package(spirv_cross_msl CONFIG REQUIRED) | ||
+ find_package(spirv_cross_cpp CONFIG REQUIRED) | ||
|
||
endif() | ||
|
||
diff --git a/tools/ShaderTranspilerCore/CMakeLists.txt b/tools/ShaderTranspilerCore/CMakeLists.txt | ||
index 4ce40d4..d4950ce 100644 | ||
--- a/tools/ShaderTranspilerCore/CMakeLists.txt | ||
+++ b/tools/ShaderTranspilerCore/CMakeLists.txt | ||
@@ -24,6 +24,10 @@ else() | ||
|
||
endif() | ||
|
||
+target_link_libraries(ShaderTranspilerCore PUBLIC | ||
+ glslang::glslang glslang::SPIRV glslang::OSDependent glslang::MachineIndependent glslang::GenericCodeGen glslang::glslang-default-resource-limits glslang::OGLCompiler glslang::SPVRemapper glslang::HLSL | ||
+ spirv-cross-cpp spirv-cross-glsl spirv-cross-msl spirv-cross-hlsl | ||
+) | ||
if(USE_THIRDPARTY_DIRECTORY) | ||
add_dependencies(ShaderTranspilerCore EP_glslang EP_SPIRV-Cross) | ||
endif() | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index dbc051b..b898b4c 100644 | ||
index 5fd2ce0..976b845 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -27,9 +27,6 @@ option(SPIRVCROSS_WITHOUT_INSTALL "Compile with spirv-cross without install" | ||
OFF) | ||
option(USE_CREATE_COMPILER_FUNCTION "Whether LLGI::CreateCompiler is used." ON) | ||
@@ -234,8 +234,13 @@ if(BUILD_VULKAN_COMPILER OR BUILD_TOOL) | ||
spirv-cross-util) | ||
|
||
-if(LINUX) | ||
- set(BUILD_VULKAN TRUE) | ||
-endif() | ||
else() | ||
- list(APPEND LLGI_THIRDPARTY_INCLUDES ${GLSLANG_INCLUDE_DIR} | ||
- ${SPIRVCROSS_INCLUDE_DIR}) | ||
+ # from vcpkg | ||
+ find_package(glslang CONFIG REQUIRED) | ||
+ find_package(spirv_cross_core CONFIG REQUIRED) | ||
+ find_package(spirv_cross_glsl CONFIG REQUIRED) | ||
+ find_package(spirv_cross_hlsl CONFIG REQUIRED) | ||
+ find_package(spirv_cross_msl CONFIG REQUIRED) | ||
+ find_package(spirv_cross_cpp CONFIG REQUIRED) | ||
|
||
option(USE_MSVC_RUNTIME_LIBRARY_DLL "compile as multithreaded DLL" ON) | ||
endif() | ||
|
||
diff --git a/tools/ShaderTranspilerCore/CMakeLists.txt b/tools/ShaderTranspilerCore/CMakeLists.txt | ||
index bf34437..09e428d 100644 | ||
--- a/tools/ShaderTranspilerCore/CMakeLists.txt | ||
+++ b/tools/ShaderTranspilerCore/CMakeLists.txt | ||
@@ -24,6 +24,10 @@ else() | ||
|
||
endif() | ||
|
||
+target_link_libraries(ShaderTranspilerCore PUBLIC | ||
+ glslang::glslang glslang::glslang-default-resource-limits glslang::SPIRV glslang::SPVRemapper spirv-cross-cpp spirv-cross-glsl spirv-cross-msl spirv-cross-hlsl | ||
+) | ||
+ | ||
if(USE_THIRDPARTY_DIRECTORY) | ||
add_dependencies(ShaderTranspilerCore EP_glslang EP_SPIRV-Cross) | ||
endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters