diff options
| author | Serdar Kocdemir <kocdemir@google.com> | 2023-03-10 13:51:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-10 13:51:29 +0000 |
| commit | 04a4b91b52d0330fe5f4734455df85bfa31c356a (patch) | |
| tree | 2348ac4693fa0f042847c76b892e5a9dd2487c05 /CMakeLists.txt | |
| parent | 70b613713902d192dbb22888cde87aa561dac727 (diff) | |
| parent | 63f702d9f6f27cbc1bfbd905d7f41feb4215c8d8 (diff) | |
| download | SPIRV-Headers-04a4b91b52d0330fe5f4734455df85bfa31c356a.tar.gz | |
Merge commit '87d5b782bec60822aa878941e6b13c0a9a954c9b' into udc-dev am: 63f702d9f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/deqp-deps/SPIRV-Headers/+/21792280
Change-Id: I67462862468fc501a0743ab6832d5393453acf1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f19390a..9cfba73 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,11 +44,6 @@ project(SPIRV-Headers VERSION 1.5.5) # 2. cmake .. # 3. cmake --build . --target install -# legacy -add_custom_target(install-headers - COMMAND cmake -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/include/spirv - $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/include/spirv) - option(SPIRV_HEADERS_SKIP_EXAMPLES "Skip building examples" ${SPIRV_HEADERS_SKIP_EXAMPLES}) @@ -61,6 +56,10 @@ endif() if(NOT ${SPIRV_HEADERS_SKIP_INSTALL}) set(SPIRV_HEADERS_ENABLE_INSTALL ON) + # legacy + add_custom_target(install-headers + COMMAND cmake -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/include/spirv + $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/include/spirv) endif() if (SPIRV_HEADERS_ENABLE_EXAMPLES) @@ -89,9 +88,14 @@ if (SPIRV_HEADERS_ENABLE_INSTALL) set(namespace "${PROJECT_NAME}::") include(CMakePackageConfigHelpers) + + if (NOT CMAKE_VERSION VERSION_LESS 3.14) + set(arch_independent_str ARCH_INDEPENDENT) + endif() write_basic_package_version_file( "${version_config}" COMPATIBILITY SameMajorVersion + ${arch_independent_str} ) configure_package_config_file( |