diff options
| author | Brad King <brad.king@kitware.com> | 2022-06-22 14:11:16 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-06-22 14:13:00 (GMT) |
| commit | 7e4adcac820d90bb431b374a07ee3d0c6cfe3f1f (patch) | |
| tree | 2bc1c4e69b53d1df265c5a41aa9b1f5305195d87 /Tests/RunCMake/FindPkgConfig/FindPkgConfig_LIBRARY_PATH.cmake | |
| parent | aae6a67e5c850f0f4dd0be4bb7d645d48995f24c (diff) | |
| download | CMake-7e4adcac820d90bb431b374a07ee3d0c6cfe3f1f.zip CMake-7e4adcac820d90bb431b374a07ee3d0c6cfe3f1f.tar.gz CMake-7e4adcac820d90bb431b374a07ee3d0c6cfe3f1f.tar.bz2 | |
FindPkgConfig: Revert "Populate _STATIC_LINK_LIBRARIES. Add STATIC_TARGET."
Revert commit 020976d637 (FindPkgConfig: Populate
_STATIC_LINK_LIBRARIES. Add STATIC_TARGET., 2021-12-31,
v3.24.0-rc1~105^2). Several regressions have been reported.
Revert the feature pending further discussion and design work.
Issue: #21714
Fixes: #23642
Diffstat (limited to 'Tests/RunCMake/FindPkgConfig/FindPkgConfig_LIBRARY_PATH.cmake')
| -rw-r--r-- | Tests/RunCMake/FindPkgConfig/FindPkgConfig_LIBRARY_PATH.cmake | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_LIBRARY_PATH.cmake b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_LIBRARY_PATH.cmake index 536addc..1278c49 100644 --- a/Tests/RunCMake/FindPkgConfig/FindPkgConfig_LIBRARY_PATH.cmake +++ b/Tests/RunCMake/FindPkgConfig/FindPkgConfig_LIBRARY_PATH.cmake @@ -15,20 +15,10 @@ Version: 1.0 Libs: -L\${libdir} -lzot ") -set(shared_lib_prefix "dyprefix-") -set(shared_lib_suffix "-dysuffix") -set(static_lib_prefix "stprefix-") -set(static_lib_suffix "-stsuffix") - -set(CMAKE_SHARED_LIBRARY_PREFIX ${shared_lib_prefix}) -set(CMAKE_SHARED_LIBRARY_SUFFIX ${shared_lib_suffix}) -set(CMAKE_STATIC_LIBRARY_PREFIX ${static_lib_prefix}) -set(CMAKE_STATIC_LIBRARY_SUFFIX ${static_lib_suffix}) - # Create a "library" file to find in libdir. -foreach(variant shared static) - file(WRITE "${LIB_DIR}/${${variant}_lib_prefix}zot${${variant}_lib_suffix}") -endforeach() +set(CMAKE_FIND_LIBRARY_PREFIXES "prefix-") +set(CMAKE_FIND_LIBRARY_SUFFIXES "-suffix") +file(WRITE "${LIB_DIR}/prefix-zot-suffix") # 'pkg-config --libs' drops -L flags in PKG_CONFIG_SYSTEM_LIBRARY_PATH by default. set(ENV{PKG_CONFIG_SYSTEM_LIBRARY_PATH} "${LIB_DIR}") @@ -42,6 +32,3 @@ pkg_check_modules(ZOT REQUIRED zot) message(STATUS "ZOT_LIBRARIES='${ZOT_LIBRARIES}'") message(STATUS "ZOT_LINK_LIBRARIES='${ZOT_LINK_LIBRARIES}'") message(STATUS "ZOT_LDFLAGS='${ZOT_LDFLAGS}'") -message(STATUS "ZOT_STATIC_LIBRARIES='${ZOT_STATIC_LIBRARIES}'") -message(STATUS "ZOT_STATIC_LINK_LIBRARIES='${ZOT_STATIC_LINK_LIBRARIES}'") -message(STATUS "ZOT_STATIC_LDFLAGS='${ZOT_STATIC_LDFLAGS}'") |