diff options
author | Brad King <brad.king@kitware.com> | 2022-05-23 13:00:44 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2022-05-23 13:01:00 (GMT) |
commit | 1b30958719ea742d66fa97717f66382627472b1e (patch) | |
tree | 071744ca898099551f35062c2860b210eb44cf1d /Tests/RunCMake/FindPkgConfig/RunCMakeTest.cmake | |
parent | cf68f3eb8bd18ac53fbb95181f7f49e021f903bf (diff) | |
parent | 020976d637bc85ed688d57bb79828bc153a5369b (diff) | |
download | CMake-1b30958719ea742d66fa97717f66382627472b1e.zip CMake-1b30958719ea742d66fa97717f66382627472b1e.tar.gz CMake-1b30958719ea742d66fa97717f66382627472b1e.tar.bz2 |
Merge topic 'pkgconfig-static-libs'
020976d637 FindPkgConfig: Populate _STATIC_LINK_LIBRARIES. Add STATIC_TARGET.
3c5cc79adb Tests: De-duplicate some code in RunCMake.FindPkgConfig
5cfbc76371 FindPkgConfig: Fix parsing of backslash-escaped spaces in pkg-config output
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7070
Diffstat (limited to 'Tests/RunCMake/FindPkgConfig/RunCMakeTest.cmake')
-rw-r--r-- | Tests/RunCMake/FindPkgConfig/RunCMakeTest.cmake | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Tests/RunCMake/FindPkgConfig/RunCMakeTest.cmake b/Tests/RunCMake/FindPkgConfig/RunCMakeTest.cmake index f36d1eb..f89b3b3 100644 --- a/Tests/RunCMake/FindPkgConfig/RunCMakeTest.cmake +++ b/Tests/RunCMake/FindPkgConfig/RunCMakeTest.cmake @@ -29,11 +29,9 @@ if (PKG_CONFIG_FOUND) run_cmake(FindPkgConfig_GET_VARIABLE_PKGCONFIG_PATH) run_cmake(FindPkgConfig_cache_variables) run_cmake(FindPkgConfig_IMPORTED_TARGET) + run_cmake(FindPkgConfig_LINK_LIBRARIES) run_cmake(FindPkgConfig_VERSION_OPERATORS) run_cmake(FindPkgConfig_GET_MATCHING_MODULE_NAME) run_cmake(FindPkgConfig_empty_target) - - if(NOT RunCMake_BINARY_DIR MATCHES " ") - run_cmake(FindPkgConfig_LIBRARY_PATH) - endif() + run_cmake(FindPkgConfig_LIBRARY_PATH) endif () |