1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
|
From: Philippe SWARTVAGHER <phil.swart@gmx.fr>
Date: Tue, 13 Sep 2022 22:13:11 +0200
Subject: Use system libraries instead of bundled third parties.
Forwarded: not-needed
Last-Update: 2024-02-25
CMakeLists.txt | 12 ++++++------
glslc/CMakeLists.txt | 6 +++---
libshaderc/CMakeLists.txt | 3 +++
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7bc8f5d..771eb5d 100644
@@ -124,7 +124,7 @@ endif(MSVC)
# Configure subdirectories.
# We depend on these for later projects, so they should come first.
-add_subdirectory(third_party)
+#add_subdirectory(third_party)
add_subdirectory(libshaderc_util)
add_subdirectory(libshaderc)
@@ -133,11 +133,11 @@ if(${SHADERC_ENABLE_EXAMPLES})
add_subdirectory(examples)
endif()
-add_custom_target(build-version
- ${Python_EXECUTABLE}
- ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py
- ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc
- COMMENT "Update build-version.inc in the Shaderc build directory (if necessary).")
+#add_custom_target(build-version
+ #${Python_EXECUTABLE}
+ #${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py
+ #${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc
+ #COMMENT "Update build-version.inc in the Shaderc build directory (if necessary).")
function(define_pkg_config_file NAME LIBS)
add_custom_target(${NAME}-pkg-config ALL
diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt
index 1277d87..7657b0e 100644
@@ -43,7 +43,7 @@ if (SHADERC_ENABLE_WGSL_OUTPUT)
endif(SHADERC_ENABLE_WGSL_OUTPUT)
target_link_libraries(glslc PRIVATE
- glslang SPIRV # Glslang libraries
+ glslang SPIRV SPIRV-Tools # Glslang libraries
$<$<BOOL:${SHADERC_ENABLE_WGSL_OUTPUT}>:libtint> # Tint libraries, optional
shaderc_util shaderc # internal Shaderc libraries
${CMAKE_THREAD_LIBS_INIT})
@@ -52,8 +52,8 @@ add_executable(glslc_exe src/main.cc)
shaderc_default_compile_options(glslc_exe)
target_include_directories(glslc_exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/.. ${spirv-tools_SOURCE_DIR}/include)
set_target_properties(glslc_exe PROPERTIES OUTPUT_NAME glslc)
-target_link_libraries(glslc_exe PRIVATE glslc shaderc_util shaderc)
-add_dependencies(glslc_exe build-version)
+target_link_libraries(glslc_exe PRIVATE glslc shaderc_util shaderc_static)
+# add_dependencies(glslc_exe build-version)
shaderc_add_tests(
TEST_PREFIX glslc
diff --git a/libshaderc/CMakeLists.txt b/libshaderc/CMakeLists.txt
index df9a88d..1f89da4 100644
@@ -66,6 +66,9 @@ set(SHADERC_LIBS
glslang ${CMAKE_THREAD_LIBS_INIT}
shaderc_util
SPIRV # from glslang
+ MachineIndependent
+ GenericCodeGen
+ SPIRV-Tools-opt
SPIRV-Tools
)
|
