| Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 1 | From a07ac322a5a5fd4f0339913eb4456321ad1a69fd 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 | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 4 | Subject: [PATCH] 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> |
| Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 9 | |
| Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame] | 10 | --- |
| 11 | CMakeLists.txt | 2 -- |
| 12 | glslc/CMakeLists.txt | 1 - |
| 13 | glslc/src/build-version.inc | 0 |
| 14 | 3 files changed, 3 deletions(-) |
| 15 | create mode 100644 glslc/src/build-version.inc |
| 16 | |
| 17 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
| Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 18 | index 5c74cd8..9451fbc 100644 |
| Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame] | 19 | --- a/CMakeLists.txt |
| 20 | +++ b/CMakeLists.txt |
| Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 21 | @@ -102,12 +102,10 @@ endif(MSVC) |
| Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame] | 22 | |
| 23 | # Configure subdirectories. |
| 24 | # We depend on these for later projects, so they should come first. |
| 25 | -add_subdirectory(third_party) |
| 26 | |
| Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame] | 27 | add_subdirectory(libshaderc_util) |
| 28 | add_subdirectory(libshaderc) |
| 29 | add_subdirectory(glslc) |
| 30 | -add_subdirectory(examples) |
| 31 | |
| 32 | add_custom_target(build-version |
| 33 | ${PYTHON_EXECUTABLE} |
| 34 | diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt |
| Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 35 | index 31664d1..358d91b 100644 |
| Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame] | 36 | --- a/glslc/CMakeLists.txt |
| 37 | +++ b/glslc/CMakeLists.txt |
| Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame^] | 38 | @@ -53,7 +53,6 @@ shaderc_default_compile_options(glslc_exe) |
| Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame] | 39 | target_include_directories(glslc_exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/.. ${spirv-tools_SOURCE_DIR}/include) |
| 40 | set_target_properties(glslc_exe PROPERTIES OUTPUT_NAME glslc) |
| 41 | target_link_libraries(glslc_exe PRIVATE glslc shaderc_util shaderc) |
| 42 | -add_dependencies(glslc_exe build-version) |
| 43 | |
| 44 | shaderc_add_tests( |
| 45 | TEST_PREFIX glslc |
| 46 | diff --git a/glslc/src/build-version.inc b/glslc/src/build-version.inc |
| 47 | new file mode 100644 |
| 48 | index 0000000..e69de29 |