diff options
Diffstat (limited to 'meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch')
| -rw-r--r-- | meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch b/meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch index 0d58925adc..e4e3f0be1e 100644 --- a/meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch +++ b/meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch @@ -1,11 +1,12 @@ -From e092619a9ef7910ad56acfb8728c66f0125d176a Mon Sep 17 00:00:00 2001 +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 3/3] cmake: de-vendor libs and disable git versioning +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 - @@ -14,18 +15,15 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> create mode 100644 glslc/src/build-version.inc diff --git a/CMakeLists.txt b/CMakeLists.txt -index a4e779b..cfa7bd8 100644 +index 5c74cd8..9451fbc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -70,7 +70,6 @@ endif(MSVC) +@@ -102,12 +102,10 @@ 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) @@ -34,10 +32,10 @@ index a4e779b..cfa7bd8 100644 add_custom_target(build-version ${PYTHON_EXECUTABLE} diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt -index 0f5d888..08686e0 100644 +index 35b3f19..52006b8 100644 --- a/glslc/CMakeLists.txt +++ b/glslc/CMakeLists.txt -@@ -26,7 +26,6 @@ shaderc_default_compile_options(glslc_exe) +@@ -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) @@ -48,6 +46,3 @@ index 0f5d888..08686e0 100644 diff --git a/glslc/src/build-version.inc b/glslc/src/build-version.inc new file mode 100644 index 0000000..e69de29 --- -2.28.0 - |