[Cmake-commits] CMake branch, next, updated. v3.6.0-rc4-639-g4969b98

[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  4969b98f735f715d6d9b8fac7e1eb6b8d403afb3 (commit)
       via  73a3c0cd9857b519350df09811f78c29e3fbd7be (commit)
      from  4f12695240947fde7b43529ecd5a2f3322668e3b (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=4969b98f735f715d6d9b8fac7e1eb6b8d403afb3
commit 4969b98f735f715d6d9b8fac7e1eb6b8d403afb3
Merge: 4f12695 73a3c0c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 30 11:27:27 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 30 11:27:27 2016 -0400

    Merge topic 'cmake-gui-static-xcb' into next
    
    73a3c0cd cmake-gui: Add build option to use Qt5 xcb plugin statically


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=73a3c0cd9857b519350df09811f78c29e3fbd7be
commit 73a3c0cd9857b519350df09811f78c29e3fbd7be
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 30 10:43:51 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 30 11:26:53 2016 -0400

    cmake-gui: Add build option to use Qt5 xcb plugin statically
    
    This will enable builds against a static Qt5.

diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index 68c65ac..80c0dc0 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -36,6 +36,12 @@ if (Qt5Widgets_FOUND)
 
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
 
+  if(CMake_QT_STATIC_QXcbIntegrationPlugin_LIBRARIES)
+    list(APPEND CMake_QT_LIBRARIES ${CMake_QT_STATIC_QXcbIntegrationPlugin_LIBRARIES})
+    set_property(SOURCE CMakeSetup.cxx
+      PROPERTY COMPILE_DEFINITIONS USE_QXcbIntegrationPlugin)
+  endif()
+
   # We need to install platform plugin and add qt.conf for Qt5 on Mac and Windows.
   # FIXME: This should be part of Qt5 CMake scripts, but unfortunatelly
   # Qt5 support is missing there.
diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx
index c849d52..ff3a7b2 100644
--- a/Source/QtDialog/CMakeSetup.cxx
+++ b/Source/QtDialog/CMakeSetup.cxx
@@ -20,6 +20,7 @@
 #include <QDir>
 #include <QLocale>
 #include <QString>
+#include <QtPlugin>
 #include <QTextCodec>
 #include <QTranslator>
 #include <cmsys/CommandLineArguments.hxx>
@@ -44,6 +45,10 @@ static int cmOSXInstall(std::string dir);
 static void cmAddPluginPath();
 #endif
 
+#if defined(USE_QXcbIntegrationPlugin)
+Q_IMPORT_PLUGIN(QXcbIntegrationPlugin);
+#endif
+
 int main(int argc, char** argv)
 {
   cmsys::Encoding::CommandLineArguments encoding_args =

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

Summary of changes:
 Source/QtDialog/CMakeLists.txt |    6 ++++++
 Source/QtDialog/CMakeSetup.cxx |    5 +++++
 2 files changed, 11 insertions(+)


hooks/post-receive
-- 
CMake