[Cmake-commits] CMake branch, next, updated. v3.6.0-rc1-188-gbcd2094

[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  bcd209460fb45bc04ed0e99d23fac5c3c2e2c213 (commit)
       via  f28401554af8fe48994b0c08668f0c1408708fe1 (commit)
      from  29dd8a8ff8ca44b8bcc6af4ad0496106cd72c5c3 (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=bcd209460fb45bc04ed0e99d23fac5c3c2e2c213
commit bcd209460fb45bc04ed0e99d23fac5c3c2e2c213
Merge: 29dd8a8 f284015
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 9 13:21:42 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 9 13:21:42 2016 -0400

    Merge topic 'cmake-gui-osx-symlink-qt5-plugin' into next
    
    f2840155 cmake-gui: Teach Qt5 where plugins are when launched through a symlink


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f28401554af8fe48994b0c08668f0c1408708fe1
commit f28401554af8fe48994b0c08668f0c1408708fe1
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Thu Jun 9 08:23:47 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 9 13:21:27 2016 -0400

    cmake-gui: Teach Qt5 where plugins are when launched through a symlink
    
    When we are on OSX and we are launching cmake-gui from a symlink, the
    application will fail to launch as it can't find the qt.conf file which
    tells it what the name of the plugin folder is. We need to add this path
    BEFORE the application is constructed as that is what triggers the
    searching for the platform plugins

diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx
index c3c1468..c849d52 100644
--- a/Source/QtDialog/CMakeSetup.cxx
+++ b/Source/QtDialog/CMakeSetup.cxx
@@ -19,6 +19,7 @@
 #include <QApplication>
 #include <QDir>
 #include <QLocale>
+#include <QString>
 #include <QTextCodec>
 #include <QTranslator>
 #include <cmsys/CommandLineArguments.hxx>
@@ -40,6 +41,7 @@ static const char* cmDocumentationOptions[][2] = { { 0, 0 } };
 
 #if defined(Q_OS_MAC)
 static int cmOSXInstall(std::string dir);
+static void cmAddPluginPath();
 #endif
 
 int main(int argc, char** argv)
@@ -81,6 +83,15 @@ int main(int argc, char** argv)
   }
 #endif
 
+// When we are on OSX and we are launching cmake-gui from a symlink, the
+// application will fail to launch as it can't find the qt.conf file which
+// tells it what the name of the plugin folder is. We need to add this path
+// BEFORE the application is constructed as that is what triggers the
+// searching for the platform plugins
+#if defined(Q_OS_MAC)
+  cmAddPluginPath();
+#endif
+
   QApplication app(argc, argv);
 
   setlocale(LC_NUMERIC, "C");
@@ -215,4 +226,27 @@ static int cmOSXInstall(std::string dir)
     ? 0
     : 1;
 }
+
+// Locate the PlugIns directory and add it to the QApplication library paths.
+// We need to resolve all symlinks so we have a known relative path between
+// MacOS/CMake and the PlugIns directory.
+//
+// Note we are using cmSystemTools since Qt can't provide the path to the
+// executable before the QApplication is created, and that is when plugin
+// searching occurs.
+static void cmAddPluginPath()
+{
+  std::string const& path = cmSystemTools::GetCMakeGUICommand();
+  if (path.empty()) {
+    return;
+  }
+  std::string const& realPath = cmSystemTools::GetRealPath(path);
+  QFileInfo appPath(QString::fromLocal8Bit(realPath.c_str()));
+  QDir pluginDir = appPath.dir();
+  bool const foundPluginDir = pluginDir.cd("../PlugIns");
+  if (foundPluginDir) {
+    QApplication::addLibraryPath(pluginDir.path());
+  }
+}
+
 #endif

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

Summary of changes:


hooks/post-receive
-- 
CMake