[Cmake-commits] CMake branch, next, updated. v3.7.0-rc3-962-gb40c0bb
Brad King
brad.king at kitware.com
Tue Nov 8 09:48:20 EST 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via b40c0bb7fa48d84edf00c1468b1ae17031d9e716 (commit)
via 61898de64180ce8123219f5e6450cb8375840045 (commit)
from a5b31cdac6050fa034285a7aab63c1534c9b003e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b40c0bb7fa48d84edf00c1468b1ae17031d9e716
commit b40c0bb7fa48d84edf00c1468b1ae17031d9e716
Merge: a5b31cd 61898de
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 8 09:48:19 2016 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 8 09:48:19 2016 -0500
Merge topic 'pkgconfig_imported_target' into next
61898de6 PkgConfig: Fix FindPkgConfig imported target feature
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=61898de64180ce8123219f5e6450cb8375840045
commit 61898de64180ce8123219f5e6450cb8375840045
Author: Florent Castelli <florent.castelli at gmail.com>
AuthorDate: Fri Nov 4 23:35:27 2016 +0100
Commit: Florent Castelli <florent.castelli at gmail.com>
CommitDate: Fri Nov 4 23:35:27 2016 +0100
PkgConfig: Fix FindPkgConfig imported target feature
The options to the find_library call to create the imported target
used a literal string "HINTS /path NO_DEFAULT_PATH" instead of a
list of options. This resulted in never finding any library in my
testing.
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index 072a27a..3f75b19 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -193,7 +193,7 @@ function(_pkg_create_imp_target _prefix _no_cmake_path _no_cmake_environment_pat
foreach (flag IN LISTS ${_prefix}_LDFLAGS)
if (flag MATCHES "^-L(.*)")
# only look into the given paths from now on
- set(_find_opts "HINTS ${${CMAKE_MATCH_1}} NO_DEFAULT_PATH")
+ set(_find_opts HINTS ${CMAKE_MATCH_1} NO_DEFAULT_PATH)
continue()
endif()
if (flag MATCHES "^-l(.*)")
-----------------------------------------------------------------------
Summary of changes:
Modules/FindPkgConfig.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list