[Cmake-commits] CMake branch, next, updated. v3.5.2-1393-gdda2854
Rolf Eike Beer
eike at sf-mail.de
Fri May 13 13:50:35 EDT 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 dda2854f441e9108266392bc5d40b0e3c6ec53cb (commit)
via 52eb6a22d621e2a143e6ffa330886ea1d8c78cb4 (commit)
from 3f70479e1714a16cd505d2930e414cb7cd72a5a2 (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=dda2854f441e9108266392bc5d40b0e3c6ec53cb
commit dda2854f441e9108266392bc5d40b0e3c6ec53cb
Merge: 3f70479 52eb6a2
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri May 13 13:50:34 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 13 13:50:34 2016 -0400
Merge topic 'findpkgconfig-target' into next
52eb6a22 FindPkgConfig-target: fix property setting
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=52eb6a22d621e2a143e6ffa330886ea1d8c78cb4
commit 52eb6a22d621e2a143e6ffa330886ea1d8c78cb4
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri May 13 19:48:16 2016 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Fri May 13 19:48:16 2016 +0200
FindPkgConfig-target: fix property setting
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index 542d127..644687c 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -228,15 +228,17 @@ function(_pkg_create_imp_target _prefix _no_cmake_path _no_cmake_environment_pat
unset(_props)
if(${_prefix}_INCLUDE_DIRS)
- list(APPEND _props INTERFACE_INCLUDE_DIRECTORIES "${${_prefix}_INCLUDE_DIRS}")
+ set_property(TARGET PkgConfig::${_prefix} PROPERTY
+ INTERFACE_INCLUDE_DIRECTORIES "${${_prefix}_INCLUDE_DIRS}")
endif()
if(_libs)
- list(APPEND _props INTERFACE_LINK_LIBRARIES "${_libs}")
+ set_property(TARGET PkgConfig::${_prefix} PROPERTY
+ INTERFACE_LINK_LIBRARIES "${_libs}")
endif()
if(${_prefix}_CFLAGS_OTHER)
- list(APPEND _props INTERFACE_COMPILE_OPTIONS "${${_prefix}_CFLAGS_OTHER}")
+ set_property(TARGET PkgConfig::${_prefix} PROPERTY
+ INTERFACE_COMPILE_OPTIONS "${${_prefix}_CFLAGS_OTHER}")
endif()
- set_target_properties(PkgConfig::${_prefix} PROPERTIES ${_props})
endif()
endfunction()
-----------------------------------------------------------------------
Summary of changes:
Modules/FindPkgConfig.cmake | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list