| From e092619a9ef7910ad56acfb8728c66f0125d176a 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 3/3] 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 a4e779b..cfa7bd8 100644 |
| --- a/CMakeLists.txt |
| +++ b/CMakeLists.txt |
| @@ -70,7 +70,6 @@ endif(MSVC) |
| |
| # Configure subdirectories. |
| # We depend on these for later projects, so they should come first. |
| -add_subdirectory(third_party) |
| |
| if(SHADERC_ENABLE_SPVC) |
| add_subdirectory(libshaderc_spvc) |
| @@ -79,7 +78,6 @@ endif() |
| 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 0f5d888..08686e0 100644 |
| --- a/glslc/CMakeLists.txt |
| +++ b/glslc/CMakeLists.txt |
| @@ -26,7 +26,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 |
| -- |
| 2.28.0 |
| |