[Cmake-commits] CMake branch, master, updated. v3.12.1-402-g0077c8c
Kitware Robot
kwrobot at kitware.com
Fri Aug 10 10:55:06 EDT 2018
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 0077c8c2637043b93f67ee310727542c081dc138 (commit)
via 5d995d7fdcaccc65787bffd1fa9e30e9f61581b3 (commit)
via 574666b6cb6ccfda0c638f1b08d5a227c2bd743e (commit)
via 52676e37941ee6b31139e86ca2dfb28a80c648ae (commit)
via e7fb85d00d3a550d0f05e2288e18b43dc572900b (commit)
from 292542d207473879271e4150afa76687e4a13e09 (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=0077c8c2637043b93f67ee310727542c081dc138
commit 0077c8c2637043b93f67ee310727542c081dc138
Merge: 5d995d7 52676e3
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 10 14:50:38 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Aug 10 10:50:46 2018 -0400
Merge topic 'test_MocOsMacros_fix'
52676e3794 Autogen: Tests: Use non inverting Qt version tests
e7fb85d00d Autogen: Check if we can run the MocOsMacros test
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2270
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d995d7fdcaccc65787bffd1fa9e30e9f61581b3
commit 5d995d7fdcaccc65787bffd1fa9e30e9f61581b3
Merge: 292542d 574666b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 10 14:48:42 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Aug 10 10:48:53 2018 -0400
Merge topic 'pgi-linux-ppc64le'
574666b6cb librhash: Avoid incorrect int8_t definition with PGI on Linux ppc64le
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2275
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=574666b6cb6ccfda0c638f1b08d5a227c2bd743e
commit 574666b6cb6ccfda0c638f1b08d5a227c2bd743e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 9 11:51:22 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Aug 9 11:51:22 2018 -0400
librhash: Avoid incorrect int8_t definition with PGI on Linux ppc64le
`sys/types.h` defines `int8_t` incorrectly as `char` which is unsigned.
Adjust ordering so `inttypes.h` defines it as `signed char` first.
diff --git a/Utilities/cmlibrhash/librhash/rhash.c b/Utilities/cmlibrhash/librhash/rhash.c
index ad6249b..34e1eb3 100644
--- a/Utilities/cmlibrhash/librhash/rhash.c
+++ b/Utilities/cmlibrhash/librhash/rhash.c
@@ -18,6 +18,8 @@
#define _LARGEFILE64_SOURCE
#define _FILE_OFFSET_BITS 64
+#include "ustd.h" /* Need this first within CMake. */
+
#include <string.h> /* memset() */
#include <stdlib.h> /* free() */
#include <stddef.h> /* ptrdiff_t */
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=52676e37941ee6b31139e86ca2dfb28a80c648ae
commit 52676e37941ee6b31139e86ca2dfb28a80c648ae
Author: Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Tue Aug 7 16:30:52 2018 +0200
Commit: Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Thu Aug 9 15:44:11 2018 +0200
Autogen: Tests: Use non inverting Qt version tests
diff --git a/Tests/QtAutogen/AutogenTest.cmake b/Tests/QtAutogen/AutogenTest.cmake
index 8c0a14f..3969a89 100644
--- a/Tests/QtAutogen/AutogenTest.cmake
+++ b/Tests/QtAutogen/AutogenTest.cmake
@@ -6,7 +6,7 @@ if(QT_QMAKE_EXECUTABLE)
list(APPEND CMAKE_PREFIX_PATH ${Qt_PREFIX_DIR})
endif()
-if (QT_TEST_VERSION STREQUAL 4)
+if (QT_TEST_VERSION EQUAL 4)
find_package(Qt4 REQUIRED)
include(UseQt4)
@@ -21,7 +21,7 @@ if (QT_TEST_VERSION STREQUAL 4)
qt4_generate_moc(${ARGN})
endmacro()
-elseif(QT_TEST_VERSION STREQUAL 5)
+elseif(QT_TEST_VERSION EQUAL 5)
find_package(Qt5Widgets REQUIRED)
set(QT_QTCORE_TARGET Qt5::Core)
diff --git a/Tests/QtAutogen/CommonTests.cmake b/Tests/QtAutogen/CommonTests.cmake
index a3f8f39..01ed7e9 100644
--- a/Tests/QtAutogen/CommonTests.cmake
+++ b/Tests/QtAutogen/CommonTests.cmake
@@ -12,7 +12,7 @@ if(QT_TEST_ALLOW_QT_MACROS)
endif()
ADD_AUTOGEN_TEST(UicSkipSource)
ADD_AUTOGEN_TEST(RccSkipSource)
-if(NOT QT_TEST_VERSION STREQUAL 4)
+if(QT_TEST_VERSION GREATER 4)
ADD_AUTOGEN_TEST(MocMacroName mocMacroName)
endif()
ADD_AUTOGEN_TEST(MocDepends)
@@ -23,13 +23,13 @@ endif()
if(QT_TEST_ALLOW_QT_MACROS)
ADD_AUTOGEN_TEST(MocCMP0071)
endif()
-if(NOT QT_TEST_VERSION STREQUAL 4)
+if(QT_TEST_VERSION GREATER 4)
ADD_AUTOGEN_TEST(MocOsMacros)
endif()
ADD_AUTOGEN_TEST(UicInclude uicInclude)
ADD_AUTOGEN_TEST(UicInterface QtAutoUicInterface)
ADD_AUTOGEN_TEST(ObjectLibrary someProgram)
-if(APPLE AND (NOT QT_TEST_VERSION STREQUAL 4))
+if(APPLE AND (QT_TEST_VERSION GREATER 4))
ADD_AUTOGEN_TEST(MacOsFW)
endif()
ADD_AUTOGEN_TEST(Parallel parallel)
@@ -42,7 +42,7 @@ ADD_AUTOGEN_TEST(SameName sameName)
ADD_AUTOGEN_TEST(StaticLibraryCycle slc)
# Rerun tests
ADD_AUTOGEN_TEST(RerunMocBasic)
-if(NOT QT_TEST_VERSION STREQUAL 4)
+if(QT_TEST_VERSION GREATER 4)
ADD_AUTOGEN_TEST(RerunMocPlugin)
endif()
ADD_AUTOGEN_TEST(RerunRccDepends)
diff --git a/Tests/QtAutogen/DefinesTest/CMakeLists.txt b/Tests/QtAutogen/DefinesTest/CMakeLists.txt
index de22845..3761dd8 100644
--- a/Tests/QtAutogen/DefinesTest/CMakeLists.txt
+++ b/Tests/QtAutogen/DefinesTest/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10)
project(DefinesTest)
# Qt4 only definitions test
-if(NOT QT_TEST_VERSION STREQUAL 4)
+if(NOT QT_TEST_VERSION EQUAL 4)
message(ERROR "Invalid Qt test version. This test is for Qt4 only.")
endif()
diff --git a/Tests/QtAutogen/RerunMocPlugin/MocPlugin/CMakeLists.txt b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/CMakeLists.txt
index bc0085f..ca22aeb 100644
--- a/Tests/QtAutogen/RerunMocPlugin/MocPlugin/CMakeLists.txt
+++ b/Tests/QtAutogen/RerunMocPlugin/MocPlugin/CMakeLists.txt
@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.10)
project(MocPlugin)
include("../../AutogenTest.cmake")
-if (NOT QT_TEST_VERSION STREQUAL 5)
- message(SEND_ERROR "Invalid Qt version specified.")
+if (QT_TEST_VERSION LESS 5)
+ message(SEND_ERROR "Qt 5 or higher required.")
endif()
set(CMAKE_AUTOMOC_DEPEND_FILTERS
diff --git a/Tests/QtAutogen/SameName/CMakeLists.txt b/Tests/QtAutogen/SameName/CMakeLists.txt
index c7d6e52..931e40f 100644
--- a/Tests/QtAutogen/SameName/CMakeLists.txt
+++ b/Tests/QtAutogen/SameName/CMakeLists.txt
@@ -28,7 +28,7 @@ set_target_properties(sameName PROPERTIES
)
# Set different compression levels
-if (QT_TEST_VERSION STREQUAL 4)
+if (QT_TEST_VERSION EQUAL 4)
set(rccCompress "-compress")
else()
set(rccCompress "--compress")
diff --git a/Tests/QtAutogen/TestMacros.cmake b/Tests/QtAutogen/TestMacros.cmake
index 8e4bea2..0e27188 100644
--- a/Tests/QtAutogen/TestMacros.cmake
+++ b/Tests/QtAutogen/TestMacros.cmake
@@ -50,7 +50,7 @@ if(NON_ASCII_BDIR)
# Qt4 moc does not support utf8 paths in _parameter files generated by
# qtx_wrap_cpp
# https://bugreports.qt.io/browse/QTBUG-35480
- if(QT_TEST_VERSION STREQUAL 4)
+ if(QT_TEST_VERSION EQUAL 4)
set(QT_TEST_ALLOW_QT_MACROS FALSE)
endif()
# On windows qtx_wrap_cpp also fails in Qt5 when used on a path that
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e7fb85d00d3a550d0f05e2288e18b43dc572900b
commit e7fb85d00d3a550d0f05e2288e18b43dc572900b
Author: Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Tue Aug 7 16:14:31 2018 +0200
Commit: Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Tue Aug 7 16:33:27 2018 +0200
Autogen: Check if we can run the MocOsMacros test
The MocOsMacros test requires moc to support moc_predefs.h
on some platforms (e.g. Mac). moc supports moc_predefs.h
inclusion since Qt 5.8, therefore run the MocOsMacros only if
Qt >= 5.8 and if CMAKE_CXX_COMPILER_PREDEFINES_COMMAND is
defined.
Fixes #18245
diff --git a/Tests/QtAutogen/CommonTests.cmake b/Tests/QtAutogen/CommonTests.cmake
index 55d36e6..a3f8f39 100644
--- a/Tests/QtAutogen/CommonTests.cmake
+++ b/Tests/QtAutogen/CommonTests.cmake
@@ -24,7 +24,7 @@ if(QT_TEST_ALLOW_QT_MACROS)
ADD_AUTOGEN_TEST(MocCMP0071)
endif()
if(NOT QT_TEST_VERSION STREQUAL 4)
- ADD_AUTOGEN_TEST(MocOsMacros mocOsMacros)
+ ADD_AUTOGEN_TEST(MocOsMacros)
endif()
ADD_AUTOGEN_TEST(UicInclude uicInclude)
ADD_AUTOGEN_TEST(UicInterface QtAutoUicInterface)
diff --git a/Tests/QtAutogen/MocOsMacros/CMakeLists.txt b/Tests/QtAutogen/MocOsMacros/CMakeLists.txt
index 51a0ebd..e7b670e 100644
--- a/Tests/QtAutogen/MocOsMacros/CMakeLists.txt
+++ b/Tests/QtAutogen/MocOsMacros/CMakeLists.txt
@@ -2,15 +2,31 @@ cmake_minimum_required(VERSION 3.11)
project(MocOsMacros)
include("../AutogenTest.cmake")
-# Tests if moc processes the macro Q_OS_MAC
+# Tests if moc processes Q_OS_XXX macros
-set(CMAKE_AUTOMOC True)
+message( "Qt5Core_VERSION: ${Qt5Core_VERSION}" )
+message(
+ "CMAKE_CXX_COMPILER_PREDEFINES_COMMAND: "
+ ${CMAKE_CXX_COMPILER_PREDEFINES_COMMAND} )
-add_executable(mocOsMacros
- main.cpp
- TestClass.cpp
- TestClass.hpp
+# On some platforms (e.g. MAC) Q_OS_XXX requires moc to include moc_predefs.h
+# which is supported since Qt 5.8 and requires
+# CMAKE_CXX_COMPILER_PREDEFINES_COMMAND to be defined.
+if( ( ${Qt5Core_VERSION} VERSION_GREATER_EQUAL "5.8" ) AND
+ DEFINED CMAKE_CXX_COMPILER_PREDEFINES_COMMAND
)
-target_link_libraries(mocOsMacros PRIVATE ${QT_QTCORE_TARGET})
+ message( "Test enabled!" )
+ message(
+ "CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES: "
+ ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES} )
-message ( "CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES: ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}" )
+ set(CMAKE_AUTOMOC True)
+ add_executable(mocOsMacros
+ main.cpp
+ TestClass.cpp
+ TestClass.hpp
+ )
+ target_link_libraries(mocOsMacros PRIVATE ${QT_QTCORE_TARGET})
+else()
+ message( "Test disabled!" )
+endif()
-----------------------------------------------------------------------
Summary of changes:
Tests/QtAutogen/AutogenTest.cmake | 4 +--
Tests/QtAutogen/CommonTests.cmake | 10 +++----
Tests/QtAutogen/DefinesTest/CMakeLists.txt | 2 +-
Tests/QtAutogen/MocOsMacros/CMakeLists.txt | 32 ++++++++++++++++------
.../RerunMocPlugin/MocPlugin/CMakeLists.txt | 4 +--
Tests/QtAutogen/SameName/CMakeLists.txt | 2 +-
Tests/QtAutogen/TestMacros.cmake | 2 +-
Utilities/cmlibrhash/librhash/rhash.c | 2 ++
8 files changed, 38 insertions(+), 20 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list