[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2871-gdab35af

[Brad King]

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  dab35af351de8c881f39732e82eae411bd10e533 (commit)
       via  60e4555c89500a5ba0548ac59a12fe6a72cfba8d (commit)
      from  43d36952f6147e8cb72e20570727a9b7ea7a99f5 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dab35af351de8c881f39732e82eae411bd10e533
commit dab35af351de8c881f39732e82eae411bd10e533
Merge: 43d3695 60e4555
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 1 11:28:09 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 1 11:28:09 2013 -0400

    Merge topic 'FindGTK2vd2' into next
    
    60e4555 FindGTK2: Add GTK2_DEFINITIONS variable


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=60e4555c89500a5ba0548ac59a12fe6a72cfba8d
commit 60e4555c89500a5ba0548ac59a12fe6a72cfba8d
Author:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Sat Jun 29 16:44:54 2013 +0200
Commit:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Sat Jun 29 16:44:57 2013 +0200

    FindGTK2: Add GTK2_DEFINITIONS variable
    
    According to https://wiki.gnome.org/gtkmm/MSWindows on MSVC the /vd2
    flag should be passed to the compiler in order to use gtkmm

diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index f398c79..8c120bc 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -18,6 +18,7 @@
 #   GTK2_FOUND - Were all of your specified components found?
 #   GTK2_INCLUDE_DIRS - All include directories
 #   GTK2_LIBRARIES - All libraries
+#   GTK2_DEFINITIONS - Additional compiler flags
 #
 #   GTK2_VERSION - The version of GTK2 found (x.y.z)
 #   GTK2_MAJOR_VERSION - The major version of GTK2
@@ -374,6 +375,7 @@ endfunction()
 set(GTK2_FOUND)
 set(GTK2_INCLUDE_DIRS)
 set(GTK2_LIBRARIES)
+set(GTK2_DEFINITIONS)
 
 if(NOT GTK2_FIND_COMPONENTS)
     # Assume they only want GTK
@@ -542,6 +544,20 @@ if(NOT GTK2_FIND_VERSION AND GTK2_GTK_INCLUDE_DIR)
 endif()
 
 #
+# On MSVC, according to https://wiki.gnome.org/gtkmm/MSWindows, the /vd2 flag needs to be
+# passed to the compiler in order to use gtkmm
+#
+if(MSVC)
+    foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
+        if(_GTK2_component STREQUAL "gtkmm")
+            set(GTK2_DEFINITIONS "/vd2")
+        elseif(_GTK2_component STREQUAL "glademm")
+            set(GTK2_DEFINITIONS "/vd2")
+        endif()
+    endforeach()
+endif()
+
+#
 # Try to enforce components
 #
 
@@ -609,6 +625,7 @@ else()
     set(GTK2_VERSION_PATCH)
     set(GTK2_INCLUDE_DIRS)
     set(GTK2_LIBRARIES)
+    set(GTK2_DEFINITIONS)
 endif()
 
 if(GTK2_INCLUDE_DIRS)

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindGTK2.cmake |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake