[Cmake-commits] CMake branch, master, updated. v3.10.0-rc5-312-g6c23107
Kitware Robot
kwrobot at kitware.com
Tue Nov 14 07:25:25 EST 2017
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, master has been updated
via 6c231077256a7032c2833c45166290c50c39a11a (commit)
via 8203895caa5d767e87760b22deea36fa2f5e99bf (commit)
via 3a993c49db687b8cd74fa70d680ebf10eae7708d (commit)
via 27a73f1613a6c45eba3ca0d210564df8cbdac66e (commit)
via 23dd8b9e93d670a6e19e8a0278611aa147ab87e8 (commit)
from 7a06f9973a349ad07d19c8794966a11047790b84 (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=6c231077256a7032c2833c45166290c50c39a11a
commit 6c231077256a7032c2833c45166290c50c39a11a
Merge: 8203895 3a993c4
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 14 12:22:44 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Nov 14 07:23:40 2017 -0500
Merge topic 'cmake-gui-qt-static-windows'
3a993c49 Tests: Add options to disable tests requiring Qt
27a73f16 cmake-gui: Add build option to use Qt5 windows plugin statically
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1476
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8203895caa5d767e87760b22deea36fa2f5e99bf
commit 8203895caa5d767e87760b22deea36fa2f5e99bf
Merge: 7a06f99 23dd8b9
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 14 12:22:00 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Nov 14 07:22:42 2017 -0500
Merge topic 'xcode64'
23dd8b9e cmGlobalXCodeGenerator: Support XCTest for XCode 6.4
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1471
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3a993c49db687b8cd74fa70d680ebf10eae7708d
commit 3a993c49db687b8cd74fa70d680ebf10eae7708d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 13 13:58:32 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 13 13:58:32 2017 -0500
Tests: Add options to disable tests requiring Qt
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index ce53454..533788a 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -407,11 +407,14 @@ if(BUILD_TESTING)
list(APPEND TEST_BUILD_DIRS ${CMake_TEST_INSTALL_PREFIX})
- if(NOT QT4_FOUND)
+ if(NOT DEFINED CMake_TEST_Qt4)
+ set(CMake_TEST_Qt4 1)
+ endif()
+ if(CMake_TEST_Qt4 AND NOT QT4_FOUND)
find_package(Qt4 QUIET)
endif()
- if(QT4_FOUND)
+ if(CMake_TEST_Qt4 AND QT4_FOUND)
# test whether the Qt4 which has been found works, on some machines
# which run nightly builds there were errors like "wrong file format"
# for libQtCore.so. So first check it works, and only if it does add
@@ -1253,8 +1256,13 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
set(QtAutogen_BUILD_OPTIONS -DCMAKE_BUILD_TYPE=$<CONFIGURATION>)
endif()
- find_package(Qt5Widgets QUIET NO_MODULE)
- if(Qt5Widgets_FOUND)
+ if(NOT DEFINED CMake_TEST_Qt5)
+ set(CMake_TEST_Qt5 1)
+ endif()
+ if(CMake_TEST_Qt5)
+ find_package(Qt5Widgets QUIET NO_MODULE)
+ endif()
+ if(CMake_TEST_Qt5 AND Qt5Widgets_FOUND)
add_test(NAME Qt5Autogen COMMAND ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/QtAutogen"
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=27a73f1613a6c45eba3ca0d210564df8cbdac66e
commit 27a73f1613a6c45eba3ca0d210564df8cbdac66e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 13 08:48:56 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 13 09:54:49 2017 -0500
cmake-gui: Add build option to use Qt5 windows plugin statically
This will enable builds against a static Qt5 on Windows.
diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index 9e9df78..b38797b 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -33,6 +33,12 @@ if (Qt5Widgets_FOUND)
PROPERTY COMPILE_DEFINITIONS USE_QXcbIntegrationPlugin)
endif()
+ if(CMake_QT_STATIC_QWindowsIntegrationPlugin_LIBRARIES)
+ list(APPEND CMake_QT_LIBRARIES ${CMake_QT_STATIC_QWindowsIntegrationPlugin_LIBRARIES})
+ set_property(SOURCE CMakeSetup.cxx
+ PROPERTY COMPILE_DEFINITIONS USE_QWindowsIntegrationPlugin)
+ 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.
@@ -65,7 +71,7 @@ if (Qt5Widgets_FOUND)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
DESTINATION "${CMAKE_INSTALL_PREFIX}/Resources"
${COMPONENT})
- elseif(WIN32)
+ elseif(WIN32 AND NOT CMake_QT_STATIC_QWindowsIntegrationPlugin_LIBRARIES)
install_qt5_plugin("Qt5::QWindowsIntegrationPlugin" QT_PLUGINS)
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
"[Paths]\nPlugins = ../${_qt_plugin_dir}\n")
diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx
index ca0b015..bfd43cf 100644
--- a/Source/QtDialog/CMakeSetup.cxx
+++ b/Source/QtDialog/CMakeSetup.cxx
@@ -44,6 +44,10 @@ static void cmAddPluginPath();
Q_IMPORT_PLUGIN(QXcbIntegrationPlugin);
#endif
+#if defined(USE_QWindowsIntegrationPlugin)
+Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin);
+#endif
+
int main(int argc, char** argv)
{
cmsys::Encoding::CommandLineArguments encoding_args =
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=23dd8b9e93d670a6e19e8a0278611aa147ab87e8
commit 23dd8b9e93d670a6e19e8a0278611aa147ab87e8
Author: Benito Palacios Sanchez <benito at rti.com>
AuthorDate: Thu Nov 9 17:49:36 2017 +0100
Commit: Benito Palacios Sanchez <benito at rti.com>
CommitDate: Thu Nov 9 17:49:36 2017 +0100
cmGlobalXCodeGenerator: Support XCTest for XCode 6.4
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index a85a700..6e37f78 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -3298,9 +3298,9 @@ void cmGlobalXCodeGenerator::OutputXCodeProject(
}
this->WriteXCodePBXProj(fout, root, generators);
- // Since the lowest available Xcode version for testing was 7.0,
+ // Since the lowest available Xcode version for testing was 6.4,
// I'm setting this as a limit then
- if (this->XcodeVersion >= 70) {
+ if (this->XcodeVersion >= 64) {
if (root->GetMakefile()->GetCMakeInstance()->GetIsInTryCompile() ||
root->GetMakefile()->IsOn("CMAKE_XCODE_GENERATE_SCHEME")) {
this->OutputXCodeSharedSchemes(xcodeDir);
-----------------------------------------------------------------------
Summary of changes:
Source/QtDialog/CMakeLists.txt | 8 +++++++-
Source/QtDialog/CMakeSetup.cxx | 4 ++++
Source/cmGlobalXCodeGenerator.cxx | 4 ++--
Tests/CMakeLists.txt | 16 ++++++++++++----
4 files changed, 25 insertions(+), 7 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list