diff options
| author | Brad King <brad.king@kitware.com> | 2018-04-25 12:58:34 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-04-25 12:58:39 (GMT) |
| commit | 9df096633bf64a6b3f6db6489e422715a6aecbf9 (patch) | |
| tree | a53cff329cad5cd3ec7c2795e83f0036ed075cb4 /Modules | |
| parent | 22e483744290a27c17cca42e22ed47ef1b37007d (diff) | |
| parent | 7d756f37cc0dcd3dfff1c8524db5943af023cff8 (diff) | |
| download | CMake-9df096633bf64a6b3f6db6489e422715a6aecbf9.zip CMake-9df096633bf64a6b3f6db6489e422715a6aecbf9.tar.gz CMake-9df096633bf64a6b3f6db6489e422715a6aecbf9.tar.bz2 | |
Merge topic 'BLAS-no-target-in-libs'
7d756f37cc FindBLAS: do not write an imported target name into BLAS_LIBRARIES
946846aaf5 FindPkgConfig: do not unset unused variable
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2006
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindBLAS.cmake | 6 | ||||
| -rw-r--r-- | Modules/FindPkgConfig.cmake | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake index 8e8c6f4..5223b1d 100644 --- a/Modules/FindBLAS.cmake +++ b/Modules/FindBLAS.cmake @@ -90,7 +90,11 @@ if(BLA_PREFER_PKGCONFIG) find_package(PkgConfig) pkg_check_modules(PKGC_BLAS IMPORTED_TARGET blas) if(PKGC_BLAS_FOUND) - set(BLAS_LIBRARIES PkgConfig::PKGC_BLAS) + # FIXME: We should not interpret the INTERFACE_LINK_LIBRARIES property + # because it could have generator expressions and such. This is a + # workaround for pkg_check_modules not providing a first-class way to + # get the list of libraries. + get_property(BLAS_LIBRARIES TARGET PkgConfig::PKGC_BLAS PROPERTY INTERFACE_LINK_LIBRARIES) find_package_handle_standard_args(BLAS REQUIRED_VARS BLAS_LIBRARIES VERSION_VAR PKGC_BLAS_VERSION) diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake index 952ca92..415e914 100644 --- a/Modules/FindPkgConfig.cmake +++ b/Modules/FindPkgConfig.cmake @@ -222,7 +222,6 @@ function(_pkg_create_imp_target _prefix _no_cmake_path _no_cmake_environment_pat AND ( ${_prefix}_INCLUDE_DIRS OR _libs OR ${_prefix}_CFLAGS_OTHER )) add_library(PkgConfig::${_prefix} INTERFACE IMPORTED) - unset(_props) if(${_prefix}_INCLUDE_DIRS) set_property(TARGET PkgConfig::${_prefix} PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${${_prefix}_INCLUDE_DIRS}") |