diff options
Diffstat (limited to 'meta/recipes-graphics/shaderc/files/0001-cmake-disable-building-external-dependencies.patch')
-rw-r--r-- | meta/recipes-graphics/shaderc/files/0001-cmake-disable-building-external-dependencies.patch | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/meta/recipes-graphics/shaderc/files/0001-cmake-disable-building-external-dependencies.patch b/meta/recipes-graphics/shaderc/files/0001-cmake-disable-building-external-dependencies.patch index cc9a400028..5c49aa7fd5 100644 --- a/meta/recipes-graphics/shaderc/files/0001-cmake-disable-building-external-dependencies.patch +++ b/meta/recipes-graphics/shaderc/files/0001-cmake-disable-building-external-dependencies.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 071a9d71bea91bbefcf15e061fc87e53568f3188 Mon Sep 17 00:00:00 2001 | 1 | From 941f5f5831e7a52c26168f81f25d0470860ca6f1 Mon Sep 17 00:00:00 2001 |
2 | From: Jose Quaresma <quaresma.jose@gmail.com> | 2 | From: Jose Quaresma <quaresma.jose@gmail.com> |
3 | Date: Sat, 13 Feb 2021 00:45:56 +0000 | 3 | Date: Sat, 13 Feb 2021 00:45:56 +0000 |
4 | Subject: [PATCH 1/3] cmake: disable building external dependencies | 4 | Subject: [PATCH] cmake: disable building external dependencies |
5 | 5 | ||
6 | - add cmake option to disable the build of the third_party dependencies | 6 | - add cmake option to disable the build of the third_party dependencies |
7 | - change the update_build_version.py to use pkg-config when third_party dependencies not found | 7 | - change the update_build_version.py to use pkg-config when third_party dependencies not found |
@@ -15,18 +15,18 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | |||
15 | 2 files changed, 25 insertions(+), 10 deletions(-) | 15 | 2 files changed, 25 insertions(+), 10 deletions(-) |
16 | 16 | ||
17 | diff --git a/CMakeLists.txt b/CMakeLists.txt | 17 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
18 | index 5c74cd8..b358f6b 100644 | 18 | index ffcb54b..cce715e 100644 |
19 | --- a/CMakeLists.txt | 19 | --- a/CMakeLists.txt |
20 | +++ b/CMakeLists.txt | 20 | +++ b/CMakeLists.txt |
21 | @@ -41,6 +41,7 @@ else() | 21 | @@ -62,6 +62,7 @@ else() |
22 | endif() | 22 | endif() |
23 | 23 | ||
24 | option(SHADERC_ENABLE_WERROR_COMPILE "Enable passing -Werror to compiler, if available" ON) | 24 | option(SHADERC_ENABLE_WERROR_COMPILE "Enable passing -Werror to compiler, if available" ON) |
25 | +option(BUILD_EXTERNAL "Build external dependencies in /third_party" ON) | 25 | +option(BUILD_EXTERNAL "Build external dependencies in /third_party" ON) |
26 | 26 | ||
27 | set (CMAKE_CXX_STANDARD 11) | 27 | set (CMAKE_CXX_STANDARD 17) |
28 | 28 | ||
29 | @@ -101,8 +102,14 @@ endif(MSVC) | 29 | @@ -119,8 +120,14 @@ endif(MSVC) |
30 | 30 | ||
31 | 31 | ||
32 | # Configure subdirectories. | 32 | # Configure subdirectories. |
@@ -43,9 +43,9 @@ index 5c74cd8..b358f6b 100644 | |||
43 | 43 | ||
44 | add_subdirectory(libshaderc_util) | 44 | add_subdirectory(libshaderc_util) |
45 | add_subdirectory(libshaderc) | 45 | add_subdirectory(libshaderc) |
46 | @@ -112,7 +119,7 @@ add_subdirectory(examples) | 46 | @@ -132,7 +139,7 @@ endif() |
47 | add_custom_target(build-version | 47 | add_custom_target(build-version |
48 | ${PYTHON_EXECUTABLE} | 48 | ${Python_EXECUTABLE} |
49 | ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py | 49 | ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py |
50 | - ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc | 50 | - ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc |
51 | + ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} | 51 | + ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} |
@@ -53,7 +53,7 @@ index 5c74cd8..b358f6b 100644 | |||
53 | 53 | ||
54 | function(define_pkg_config_file NAME LIBS) | 54 | function(define_pkg_config_file NAME LIBS) |
55 | diff --git a/utils/update_build_version.py b/utils/update_build_version.py | 55 | diff --git a/utils/update_build_version.py b/utils/update_build_version.py |
56 | index 5785390..f72b762 100755 | 56 | index b7ce5b8..95b34c5 100755 |
57 | --- a/utils/update_build_version.py | 57 | --- a/utils/update_build_version.py |
58 | +++ b/utils/update_build_version.py | 58 | +++ b/utils/update_build_version.py |
59 | @@ -30,6 +30,7 @@ import re | 59 | @@ -30,6 +30,7 @@ import re |
@@ -104,6 +104,3 @@ index 5785390..f72b762 100755 | |||
104 | mkdir_p(os.path.dirname(output_file)) | 104 | mkdir_p(os.path.dirname(output_file)) |
105 | 105 | ||
106 | if os.path.isfile(output_file): | 106 | if os.path.isfile(output_file): |
107 | -- | ||
108 | 2.30.1 | ||
109 | |||