diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-02-12 18:51:09 +0100 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-02-26 09:33:26 +0100 |
| commit | cdc338b74337e29c903bb73b61dc6f22877208e7 (patch) | |
| tree | f1e3ab563c48aeddd94e51b7612dc210bd3a1256 /mesonbuild/dependencies/data/CMakeLists.txt | |
| parent | 6efc94b5dd0d360218eec3fae98caf3a87a757b9 (diff) | |
| download | meson-cdc338b74337e29c903bb73b61dc6f22877208e7.zip meson-cdc338b74337e29c903bb73b61dc6f22877208e7.tar.gz meson-cdc338b74337e29c903bb73b61dc6f22877208e7.tar.bz2 | |
Preliminary CMake module search
Diffstat (limited to 'mesonbuild/dependencies/data/CMakeLists.txt')
| -rw-r--r-- | mesonbuild/dependencies/data/CMakeLists.txt | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/mesonbuild/dependencies/data/CMakeLists.txt b/mesonbuild/dependencies/data/CMakeLists.txt index 6f51681..64f5b23 100644 --- a/mesonbuild/dependencies/data/CMakeLists.txt +++ b/mesonbuild/dependencies/data/CMakeLists.txt @@ -1,16 +1,5 @@ cmake_minimum_required(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} ) -# Inspired by CMakeDetermineCompilerABI.cmake to set CMAKE_LIBRARY_ARCHITECTURE -set(LIB_ARCH_LIST) -if(CMAKE_LIBRARY_ARCHITECTURE_REGEX) - file(GLOB implicit_dirs RELATIVE /lib /lib/*-linux-gnu* ) - foreach(dir ${implicit_dirs}) - if("${dir}" MATCHES "${CMAKE_LIBRARY_ARCHITECTURE_REGEX}") - list(APPEND LIB_ARCH_LIST "${dir}") - endif() - endforeach() -endif() - set(PACKAGE_FOUND FALSE) set(_packageName "${NAME}") string(TOUPPER "${_packageName}" PACKAGE_NAME) @@ -18,12 +7,13 @@ string(TOUPPER "${_packageName}" PACKAGE_NAME) while(TRUE) find_package("${NAME}" QUIET) - if(${_packageName}_FOUND OR ${PACKAGE_NAME}_FOUND OR "${LIB_ARCH_LIST}" STREQUAL "") + # ARCHS has to be set via the CMD interface + if(${_packageName}_FOUND OR ${PACKAGE_NAME}_FOUND OR "${ARCHS}" STREQUAL "") break() endif() - list(GET LIB_ARCH_LIST 0 CMAKE_LIBRARY_ARCHITECTURE) - list(REMOVE_AT LIB_ARCH_LIST 0) + list(GET ARCHS 0 CMAKE_LIBRARY_ARCHITECTURE) + list(REMOVE_AT ARCHS 0) endwhile() if(${_packageName}_FOUND OR ${PACKAGE_NAME}_FOUND) |