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 4668f9ed6842fee90007c6134710c0c2d9aa787d (commit)
via 5f933bd6620e6abf54268087d6714691cec57194 (commit)
from 7b24b3bb11baee969d6a8942f08c8f6fbe108f35 (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=4668f9ed6842fee90007c6134710c0c2d9aa787d
commit 4668f9ed6842fee90007c6134710c0c2d9aa787d
Merge: 7b24b3b 5f933bd
Author: Daniele E. Domenichelli <daniele.domeniche...@gmail.com>
AuthorDate: Tue Nov 3 05:04:13 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Nov 3 05:04:13 2015 -0500
Merge topic 'FindGTK2_GTK2_TARGETS' into next
5f933bd6 FindGTK2: Use targets in GTK2_LIBRARIES if
GTK2_USE_IMPORTED_TARGETS is ON
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5f933bd6620e6abf54268087d6714691cec57194
commit 5f933bd6620e6abf54268087d6714691cec57194
Author: Daniele E. Domenichelli <daniele.domeniche...@iit.it>
AuthorDate: Fri Oct 30 12:33:53 2015 +0100
Commit: Daniele E. Domenichelli <daniele.domeniche...@iit.it>
CommitDate: Mon Nov 2 12:38:19 2015 +0100
FindGTK2: Use targets in GTK2_LIBRARIES if GTK2_USE_IMPORTED_TARGETS is ON
Also add GTK2_TARGETS variable containing all imported targets.
Previously, the GTK2_LIBRARIES variable was filled with the paths to the
libraries, and only the GTK2_XXX_LIBRARY variables contained the imported
targets.
diff --git a/Help/release/dev/FindGTK2_GTK2_TARGETS.rst
b/Help/release/dev/FindGTK2_GTK2_TARGETS.rst
new file mode 100644
index 0000000..216e2e8
--- /dev/null
+++ b/Help/release/dev/FindGTK2_GTK2_TARGETS.rst
@@ -0,0 +1,7 @@
+FindGTK2_GTK2_TARGETS
+---------------------
+
+* The `GTK2_LIBRARIES` variable created by the :module:`FindGTK2` module
+ now contains the targets instead of the paths to the libraries if
+ `GTK2_USE_IMPORTED_TARGETS` is enabled. Moreover it adds a new
+ `GTK2_TARGETS` variable containing all the targets imported.
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index ab4ef3e..6e4a7f2 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -34,6 +34,7 @@
# GTK2_FOUND - Were all of your specified components found?
# GTK2_INCLUDE_DIRS - All include directories
# GTK2_LIBRARIES - All libraries
+# GTK2_TARGETS - All imported targets
# GTK2_DEFINITIONS - Additional compiler flags
#
#
@@ -550,6 +551,9 @@ function(_GTK2_ADD_TARGET _var)
add_library(GTK2::${_basename} UNKNOWN IMPORTED)
+ set(GTK2_TARGETS ${GTK2_TARGETS} GTK2::${_basename})
+ set(GTK2_TARGETS ${GTK2_TARGETS} PARENT_SCOPE)
+
if(GTK2_${_var}_LIBRARY_RELEASE)
set_property(TARGET GTK2::${_basename} APPEND PROPERTY
IMPORTED_CONFIGURATIONS RELEASE)
set_property(TARGET GTK2::${_basename} PROPERTY
IMPORTED_LOCATION_RELEASE "${GTK2_${_var}_LIBRARY_RELEASE}" )
@@ -602,6 +606,7 @@ endfunction()
set(GTK2_FOUND)
set(GTK2_INCLUDE_DIRS)
set(GTK2_LIBRARIES)
+set(GTK2_TARGETS)
set(GTK2_DEFINITIONS)
if(NOT GTK2_FIND_COMPONENTS)
@@ -940,6 +945,11 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
endif()
endforeach()
+if(GTK2_USE_IMPORTED_TARGETS)
+ set(GTK2_LIBRARIES ${GTK2_TARGETS})
+endif()
+
+
if(_GTK2_did_we_find_everything AND NOT GTK2_VERSION_CHECK_FAILED)
set(GTK2_FOUND true)
else()
@@ -951,6 +961,7 @@ else()
set(GTK2_VERSION_PATCH)
set(GTK2_INCLUDE_DIRS)
set(GTK2_LIBRARIES)
+ set(GTK2_TARGETS)
set(GTK2_DEFINITIONS)
endif()
-----------------------------------------------------------------------
Summary of changes:
Help/release/dev/FindGTK2_GTK2_TARGETS.rst | 7 +++++++
Modules/FindGTK2.cmake | 11 +++++++++++
2 files changed, 18 insertions(+)
create mode 100644 Help/release/dev/FindGTK2_GTK2_TARGETS.rst
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
