[Cmake-commits] CMake branch, next, updated. v3.3.0-1411-g976fbac

[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  976fbac9dc99fb4657254c33243013c83929b220 (commit)
       via  42f0155bb9f7cb65c7af103ec1170f4193244d69 (commit)
      from  f62c764dcc5dce9154f0da53eb3a63d8b8910357 (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=976fbac9dc99fb4657254c33243013c83929b220
commit 976fbac9dc99fb4657254c33243013c83929b220
Merge: f62c764 42f0155
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 27 11:03:48 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 27 11:03:48 2015 -0400

    Merge topic 'cmake-gui-install-plugin' into next
    
    42f0155b cmake-gui: Install Qt5 Windows platform plugin


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=42f0155bb9f7cb65c7af103ec1170f4193244d69
commit 42f0155bb9f7cb65c7af103ec1170f4193244d69
Author:     Konstantin Podsvirov <konstantin at podsvirov.pro>
AuthorDate: Fri Jul 24 10:15:06 2015 +0300
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 27 10:21:10 2015 -0400

    cmake-gui: Install Qt5 Windows platform plugin
    
    Qt5 requires a platform-specific runtime-loaded plugin.  We already
    install it for OS X.  Install it for Windows too.

diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index 038c411..ba993eb 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -36,17 +36,22 @@ if (Qt5Widgets_FOUND)
 
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
 
-  # We need to install Cocoa platform plugin and add qt.conf for Qt5 on Mac.
+  # 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 Mac support is missing there.
-  if(APPLE)
+  # Qt5 support is missing there.
+  if(APPLE OR WIN32)
     macro(install_qt5_plugin _qt_plugin_name _qt_plugins_var)
       get_target_property(_qt_plugin_path "${_qt_plugin_name}" LOCATION)
       if(EXISTS "${_qt_plugin_path}")
         get_filename_component(_qt_plugin_file "${_qt_plugin_path}" NAME)
         get_filename_component(_qt_plugin_type "${_qt_plugin_path}" PATH)
         get_filename_component(_qt_plugin_type "${_qt_plugin_type}" NAME)
-        set(_qt_plugin_dest "PlugIns/${_qt_plugin_type}")
+        if(APPLE)
+          set(_qt_plugin_dir "PlugIns")
+        elseif(WIN32)
+          set(_qt_plugin_dir "plugins")
+        endif()
+        set(_qt_plugin_dest "${_qt_plugin_dir}/${_qt_plugin_type}")
         install(FILES "${_qt_plugin_path}"
           DESTINATION "${_qt_plugin_dest}"
           ${COMPONENT})
@@ -56,12 +61,21 @@ if (Qt5Widgets_FOUND)
         message(FATAL_ERROR "QT plugin ${_qt_plugin_name} not found")
       endif()
     endmacro()
-    install_qt5_plugin("Qt5::QCocoaIntegrationPlugin" QT_PLUGINS)
-    file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
-      "[Paths]\nPlugins = PlugIns\n")
-    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
-      DESTINATION "${CMAKE_INSTALL_PREFIX}/Resources"
-      ${COMPONENT})
+    if(APPLE)
+      install_qt5_plugin("Qt5::QCocoaIntegrationPlugin" QT_PLUGINS)
+      file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
+        "[Paths]\nPlugins = ${_qt_plugin_dir}\n")
+      install(FILES "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
+        DESTINATION "${CMAKE_INSTALL_PREFIX}/Resources"
+        ${COMPONENT})
+    elseif(WIN32)
+      install_qt5_plugin("Qt5::QWindowsIntegrationPlugin" QT_PLUGINS)
+      file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
+        "[Paths]\nPlugins = ../${_qt_plugin_dir}\n")
+      install(FILES "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
+        DESTINATION bin
+        ${COMPONENT})
+    endif()
   endif()
 
   if(WIN32 AND TARGET Qt5::Core)

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

Summary of changes:
 Source/QtDialog/CMakeLists.txt |   34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake