blob: e4e3f0be1e2a1317b5657d46e4e1630d0a213d4a (
plain)
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
|
From 180250f098e0ab899eff0db3708d9693f3486ff4 Mon Sep 17 00:00:00 2001
From: Jose Quaresma <quaresma.jose@gmail.com>
Date: Sat, 17 Oct 2020 12:51:50 +0100
Subject: [PATCH] cmake: de-vendor libs and disable git versioning
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
---
CMakeLists.txt | 2 --
glslc/CMakeLists.txt | 1 -
glslc/src/build-version.inc | 0
3 files changed, 3 deletions(-)
create mode 100644 glslc/src/build-version.inc
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c74cd8..9451fbc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -102,12 +102,10 @@ endif(MSVC)
# Configure subdirectories.
# We depend on these for later projects, so they should come first.
-add_subdirectory(third_party)
add_subdirectory(libshaderc_util)
add_subdirectory(libshaderc)
add_subdirectory(glslc)
-add_subdirectory(examples)
add_custom_target(build-version
${PYTHON_EXECUTABLE}
diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt
index 35b3f19..52006b8 100644
--- a/glslc/CMakeLists.txt
+++ b/glslc/CMakeLists.txt
@@ -53,7 +53,6 @@ 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)
shaderc_add_tests(
TEST_PREFIX glslc
diff --git a/glslc/src/build-version.inc b/glslc/src/build-version.inc
new file mode 100644
index 0000000..e69de29
|
