[Cmake-commits] CMake branch, master, updated. v3.9.0-rc3-76-gb0835fe
Kitware Robot
kwrobot at kitware.com
Wed Jun 14 11:55:05 EDT 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 b0835fefd27dbb261397ac9fe3b9ab49a107966c (commit)
via cbc7d2435ebcdc36999dc6757dc20547e09635c6 (commit)
via bf2e4bfbaabaa5621791b35ea5da7d7e5c141d8b (commit)
via 7f68ad6612e4eded99fda9de7133e77a9eced04e (commit)
via 38e3fc4bddf6ef47828a7beb732e3d78d297bd23 (commit)
from 3c40207a108798f49132ac3974ac6331dd467093 (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=b0835fefd27dbb261397ac9fe3b9ab49a107966c
commit b0835fefd27dbb261397ac9fe3b9ab49a107966c
Merge: cbc7d24 7f68ad6
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 14 15:49:16 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Jun 14 11:49:28 2017 -0400
Merge topic 'autogen_uc'
7f68ad66 Autogen: Tests: Disable some tests on non ASCII build paths
38e3fc4b Autogen: Tests fix for utf8 paths
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !959
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cbc7d2435ebcdc36999dc6757dc20547e09635c6
commit cbc7d2435ebcdc36999dc6757dc20547e09635c6
Merge: 3c40207 bf2e4bf
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 14 15:49:01 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Jun 14 11:49:06 2017 -0400
Merge topic 'readme-supported-platforms'
bf2e4bfb README: Update list of supported platforms
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !962
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf2e4bfbaabaa5621791b35ea5da7d7e5c141d8b
commit bf2e4bfbaabaa5621791b35ea5da7d7e5c141d8b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 13 11:49:49 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jun 13 13:05:51 2017 -0400
README: Update list of supported platforms
Convert to a bullet list. Drop platforms for which we no longer have
nightly testing.
diff --git a/README.rst b/README.rst
index 4188ea0..d5acd4a 100644
--- a/README.rst
+++ b/README.rst
@@ -30,7 +30,13 @@ Building CMake
Supported Platforms
-------------------
-MS Windows, Mac OS X, Linux, FreeBSD, Solaris, HP-UX, IRIX, BeOS, QNX
+* Microsoft Windows
+* Apple macOS
+* Linux
+* FreeBSD
+* OpenBSD
+* Solaris
+* HP-UX
Other UNIX-like operating systems may work too out of the box, if not
it should not be a major problem to port CMake to this platform.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f68ad6612e4eded99fda9de7133e77a9eced04e
commit 7f68ad6612e4eded99fda9de7133e77a9eced04e
Author: Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Tue Jun 13 11:25:45 2017 +0200
Commit: Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Tue Jun 13 16:51:33 2017 +0200
Autogen: Tests: Disable some tests on non ASCII build paths
diff --git a/Tests/Qt4Targets/CMakeLists.txt b/Tests/Qt4Targets/CMakeLists.txt
index ae0a02b..2ca11e4 100644
--- a/Tests/Qt4Targets/CMakeLists.txt
+++ b/Tests/Qt4Targets/CMakeLists.txt
@@ -20,6 +20,16 @@ if (WIN32)
endif()
endif()
+# Qt4 moc does not support utf8 paths in _parameter files generated by
+# qt4_wrap_cpp and qt4_generate_moc
+# https://bugreports.qt.io/browse/QTBUG-35480
+# Do a simple check if there is are non ASCII character in the build path
+string(REGEX MATCH "[^ -~]+" NON_ASCII_BDIR ${CMAKE_CURRENT_BINARY_DIR})
+if(NON_ASCII_BDIR)
+ message(WARNING "Build path contains non ASCII characters. Skipping Qt4 test.")
+ return()
+endif()
+
qt4_generate_moc(main_gen_test.cpp
"${CMAKE_CURRENT_BINARY_DIR}/main_gen_test.moc"
TARGET Qt4GenerateMacroTest
diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index f5acce0..3c6b2b3 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -46,6 +46,20 @@ endif()
get_property(QT_COMPILE_FEATURES TARGET ${QT_QTCORE_TARGET} PROPERTY INTERFACE_COMPILE_FEATURES)
+# Qt4 moc does not support utf8 paths in _parameter files generated by
+# qtx_wrap_cpp
+# https://bugreports.qt.io/browse/QTBUG-35480
+# Do a simple check if there is are non ASCII character in the build path
+string(REGEX MATCH "[^ -~]+" NON_ASCII_BDIR ${CMAKE_CURRENT_BINARY_DIR})
+if((NOT NON_ASCII_BDIR) OR (NOT QT_TEST_VERSION STREQUAL 4))
+ set(ALLOW_WRAP_CPP TRUE)
+endif()
+# On windows qtx_wrap_cpp also fails in Qt5 when used on a path that
+# contains non ASCII characters
+if(NON_ASCII_BDIR AND WIN32)
+ set(ALLOW_WRAP_CPP FALSE)
+endif()
+
# -- Test
# RCC only
add_executable(rccOnly rccOnly.cpp rccOnlyRes.qrc)
@@ -60,10 +74,12 @@ target_link_libraries(rccEmpty ${QT_QTCORE_TARGET})
# -- Test
# UIC only
-qtx_wrap_cpp(uicOnlyMoc uicOnlySource/uiconly.h)
-add_executable(uicOnly uicOnlySource/uiconly.cpp ${uicOnlyMoc})
-set_property(TARGET uicOnly PROPERTY AUTOUIC ON)
-target_link_libraries(uicOnly ${QT_LIBRARIES})
+if(ALLOW_WRAP_CPP)
+ qtx_wrap_cpp(uicOnlyMoc uicOnlySource/uiconly.h)
+ add_executable(uicOnly uicOnlySource/uiconly.cpp ${uicOnlyMoc})
+ set_property(TARGET uicOnly PROPERTY AUTOUIC ON)
+ target_link_libraries(uicOnly ${QT_LIBRARIES})
+endif()
# -- Test
# Add not_generated_file.qrc to the source list to get the file-level
@@ -209,25 +225,27 @@ endif()
# -- Test
# Test for SKIP_AUTOMOC and SKIP_AUTOGEN on an AUTOMOC enabled target
-qtx_wrap_cpp(skipMocWrapMoc
- skipSource/qItemA.hpp
- skipSource/qItemB.hpp)
-set(skipMocSources
- skipMoc.cpp
- skipSource/qItemA.cpp
- skipSource/qItemB.cpp
- skipSource/qItemC.cpp)
-set_property(SOURCE skipSource/qItemA.cpp PROPERTY SKIP_AUTOMOC ON)
-set_property(SOURCE skipSource/qItemB.cpp PROPERTY SKIP_AUTOGEN ON)
-# AUTOMOC enabled only
-add_executable(skipMocA ${skipMocSources} ${skipMocWrapMoc})
-set_property(TARGET skipMocA PROPERTY AUTOMOC ON)
-target_link_libraries(skipMocA ${QT_LIBRARIES})
-# AUTOMOC and AUTOUIC enabled
-add_executable(skipMocB ${skipMocSources} ${skipMocWrapMoc})
-set_property(TARGET skipMocB PROPERTY AUTOMOC ON)
-set_property(TARGET skipMocB PROPERTY AUTOUIC ON)
-target_link_libraries(skipMocB ${QT_LIBRARIES})
+if(ALLOW_WRAP_CPP)
+ qtx_wrap_cpp(skipMocWrapMoc
+ skipSource/qItemA.hpp
+ skipSource/qItemB.hpp)
+ set(skipMocSources
+ skipMoc.cpp
+ skipSource/qItemA.cpp
+ skipSource/qItemB.cpp
+ skipSource/qItemC.cpp)
+ set_property(SOURCE skipSource/qItemA.cpp PROPERTY SKIP_AUTOMOC ON)
+ set_property(SOURCE skipSource/qItemB.cpp PROPERTY SKIP_AUTOGEN ON)
+ # AUTOMOC enabled only
+ add_executable(skipMocA ${skipMocSources} ${skipMocWrapMoc})
+ set_property(TARGET skipMocA PROPERTY AUTOMOC ON)
+ target_link_libraries(skipMocA ${QT_LIBRARIES})
+ # AUTOMOC and AUTOUIC enabled
+ add_executable(skipMocB ${skipMocSources} ${skipMocWrapMoc})
+ set_property(TARGET skipMocB PROPERTY AUTOMOC ON)
+ set_property(TARGET skipMocB PROPERTY AUTOUIC ON)
+ target_link_libraries(skipMocB ${QT_LIBRARIES})
+endif()
# -- Test
# Test for SKIP_AUTOUIC and SKIP_AUTOGEN on an AUTOUIC enabled target
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=38e3fc4bddf6ef47828a7beb732e3d78d297bd23
commit 38e3fc4bddf6ef47828a7beb732e3d78d297bd23
Author: Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Mon Jun 12 21:54:45 2017 +0200
Commit: Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Mon Jun 12 21:54:45 2017 +0200
Autogen: Tests fix for utf8 paths
diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index 073c5fd..f5acce0 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -100,7 +100,7 @@ if (NOT RCC_DEPENDS)
message(SEND_ERROR "Initial build of rccDepends failed. Output: ${output}")
endif()
# Get name and timestamp of the output binary
-file(STRINGS "${RCC_DEPENDS_BIN}/target.txt" targetList)
+file(STRINGS "${RCC_DEPENDS_BIN}/target.txt" targetList ENCODING UTF-8)
list(GET targetList 0 rccDependsBin)
file(TIMESTAMP "${rccDependsBin}" timeBegin "${timeformat}")
# Sleep, touch regular qrc input file, rebuild and compare timestamp
@@ -188,7 +188,7 @@ if (NOT MOC_RERUN)
message(SEND_ERROR "Initial build of mocRerun failed. Output: ${output}")
endif()
# Get name and timestamp of the output binary
-file(STRINGS "${CMAKE_CURRENT_BINARY_DIR}/mocRerun/target1.txt" target1List)
+file(STRINGS "${CMAKE_CURRENT_BINARY_DIR}/mocRerun/target1.txt" target1List ENCODING UTF-8)
list(GET target1List 0 binFile)
file(TIMESTAMP "${binFile}" timeBegin "${timeformat}")
# Change file content and rebuild
-----------------------------------------------------------------------
Summary of changes:
README.rst | 8 ++++-
Tests/Qt4Targets/CMakeLists.txt | 10 ++++++
Tests/QtAutogen/CMakeLists.txt | 68 +++++++++++++++++++++++++--------------
3 files changed, 60 insertions(+), 26 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list