[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-191-g6d0145d
Daniele E. Domenichelli
daniele.domenichelli at gmail.com
Thu Oct 8 10:20:28 EDT 2015
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 6d0145dbeace6b7be1073796cf95154764378114 (commit)
via 8036c7f0d40a45614937f386636d0a227d9de7dd (commit)
from 5f678ee258419a1f50bc5d88e04ca14a4a2b7d91 (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=6d0145dbeace6b7be1073796cf95154764378114
commit 6d0145dbeace6b7be1073796cf95154764378114
Merge: 5f678ee 8036c7f
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
AuthorDate: Thu Oct 8 10:20:28 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 8 10:20:28 2015 -0400
Merge topic 'FindGTK2_sigc++_c++11' into next
8036c7f0 FindGTK2: Do not perform sigc++ version check if config file was not found
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8036c7f0d40a45614937f386636d0a227d9de7dd
commit 8036c7f0d40a45614937f386636d0a227d9de7dd
Author: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Thu Oct 8 16:19:58 2015 +0200
Commit: Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Thu Oct 8 16:19:58 2015 +0200
FindGTK2: Do not perform sigc++ version check if config file was not found
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 501055b..ab4ef3e 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -772,23 +772,25 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
_GTK2_FIND_LIBRARY (SIGC++ sigc true true)
_GTK2_ADD_TARGET (SIGC++)
# Since sigc++ 2.5.1 c++11 support is required
- _GTK2_SIGCXX_GET_VERSION(GTK2_SIGC++_VERSION_MAJOR
- GTK2_SIGC++_VERSION_MINOR
- GTK2_SIGC++_VERSION_MICRO
- ${GTK2_SIGC++CONFIG_INCLUDE_DIR}/sigc++config.h)
- if(NOT ${GTK2_SIGC++_VERSION_MAJOR}.${GTK2_SIGC++_VERSION_MINOR}.${GTK2_SIGC++_VERSION_MICRO} VERSION_LESS 2.5.1)
- # These are the features needed by clients in order to include the
- # project headers:
- set_property(TARGET GTK2::sigc++
- PROPERTY INTERFACE_COMPILE_FEATURES cxx_alias_templates
- cxx_auto_type
- cxx_decltype
- cxx_deleted_functions
- cxx_noexcept
- cxx_nullptr
- cxx_right_angle_brackets
- cxx_rvalue_references
- cxx_variadic_templates)
+ if(GTK2_SIGC++CONFIG_INCLUDE_DIR)
+ _GTK2_SIGCXX_GET_VERSION(GTK2_SIGC++_VERSION_MAJOR
+ GTK2_SIGC++_VERSION_MINOR
+ GTK2_SIGC++_VERSION_MICRO
+ ${GTK2_SIGC++CONFIG_INCLUDE_DIR}/sigc++config.h)
+ if(NOT ${GTK2_SIGC++_VERSION_MAJOR}.${GTK2_SIGC++_VERSION_MINOR}.${GTK2_SIGC++_VERSION_MICRO} VERSION_LESS 2.5.1)
+ # These are the features needed by clients in order to include the
+ # project headers:
+ set_property(TARGET GTK2::sigc++
+ PROPERTY INTERFACE_COMPILE_FEATURES cxx_alias_templates
+ cxx_auto_type
+ cxx_decltype
+ cxx_deleted_functions
+ cxx_noexcept
+ cxx_nullptr
+ cxx_right_angle_brackets
+ cxx_rvalue_references
+ cxx_variadic_templates)
+ endif()
endif()
_GTK2_FIND_INCLUDE_DIR(GLIBMM glibmm.h)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindGTK2.cmake | 36 +++++++++++++++++++-----------------
1 file changed, 19 insertions(+), 17 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list