| Andrew Geissler | 706d5aa | 2021-02-12 15:55:30 -0600 | [diff] [blame^] | 1 | From e092619a9ef7910ad56acfb8728c66f0125d176a Mon Sep 17 00:00:00 2001 |
| Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame] | 2 | From: Jose Quaresma <quaresma.jose@gmail.com> |
| 3 | Date: Sat, 17 Oct 2020 12:51:50 +0100 |
| Andrew Geissler | 706d5aa | 2021-02-12 15:55:30 -0600 | [diff] [blame^] | 4 | Subject: [PATCH 3/3] cmake: de-vendor libs and disable git versioning |
| Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame] | 5 | |
| 6 | Upstream-Status: Inappropriate [configuration] |
| 7 | |
| 8 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> |
| 9 | --- |
| 10 | CMakeLists.txt | 2 -- |
| 11 | glslc/CMakeLists.txt | 1 - |
| 12 | glslc/src/build-version.inc | 0 |
| 13 | 3 files changed, 3 deletions(-) |
| 14 | create mode 100644 glslc/src/build-version.inc |
| 15 | |
| 16 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
| Andrew Geissler | 706d5aa | 2021-02-12 15:55:30 -0600 | [diff] [blame^] | 17 | index a4e779b..cfa7bd8 100644 |
| Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame] | 18 | --- a/CMakeLists.txt |
| 19 | +++ b/CMakeLists.txt |
| Andrew Geissler | 706d5aa | 2021-02-12 15:55:30 -0600 | [diff] [blame^] | 20 | @@ -70,7 +70,6 @@ endif(MSVC) |
| Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame] | 21 | |
| 22 | # Configure subdirectories. |
| 23 | # We depend on these for later projects, so they should come first. |
| 24 | -add_subdirectory(third_party) |
| 25 | |
| Andrew Geissler | 706d5aa | 2021-02-12 15:55:30 -0600 | [diff] [blame^] | 26 | if(SHADERC_ENABLE_SPVC) |
| 27 | add_subdirectory(libshaderc_spvc) |
| 28 | @@ -79,7 +78,6 @@ endif() |
| Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame] | 29 | add_subdirectory(libshaderc_util) |
| 30 | add_subdirectory(libshaderc) |
| 31 | add_subdirectory(glslc) |
| 32 | -add_subdirectory(examples) |
| 33 | |
| 34 | add_custom_target(build-version |
| 35 | ${PYTHON_EXECUTABLE} |
| 36 | diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt |
| Andrew Geissler | 706d5aa | 2021-02-12 15:55:30 -0600 | [diff] [blame^] | 37 | index 0f5d888..08686e0 100644 |
| Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame] | 38 | --- a/glslc/CMakeLists.txt |
| 39 | +++ b/glslc/CMakeLists.txt |
| Andrew Geissler | 706d5aa | 2021-02-12 15:55:30 -0600 | [diff] [blame^] | 40 | @@ -26,7 +26,6 @@ shaderc_default_compile_options(glslc_exe) |
| Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame] | 41 | target_include_directories(glslc_exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/.. ${spirv-tools_SOURCE_DIR}/include) |
| 42 | set_target_properties(glslc_exe PROPERTIES OUTPUT_NAME glslc) |
| 43 | target_link_libraries(glslc_exe PRIVATE glslc shaderc_util shaderc) |
| 44 | -add_dependencies(glslc_exe build-version) |
| 45 | |
| 46 | shaderc_add_tests( |
| 47 | TEST_PREFIX glslc |
| 48 | diff --git a/glslc/src/build-version.inc b/glslc/src/build-version.inc |
| 49 | new file mode 100644 |
| 50 | index 0000000..e69de29 |
| Andrew Geissler | 706d5aa | 2021-02-12 15:55:30 -0600 | [diff] [blame^] | 51 | -- |
| 52 | 2.28.0 |
| 53 | |