[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-598-g539150d
Brad King
brad.king at kitware.com
Mon Feb 27 09:28:03 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, next has been updated
via 539150dd10ab582f5bc2d95dffe82b40cf4cd597 (commit)
via 48b56504bf2c9be2151cc507aaf5d59e50f456ae (commit)
from eedc69b8a1f119f40fa48d7ed950974ea7140fd4 (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=539150dd10ab582f5bc2d95dffe82b40cf4cd597
commit 539150dd10ab582f5bc2d95dffe82b40cf4cd597
Merge: eedc69b 48b5650
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 27 09:28:02 2017 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 27 09:28:02 2017 -0500
Merge topic 'autogen_json_fix' into next
48b56504 Autogen: Fix for Q_PLUGIN_METADATA change detection test
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=48b56504bf2c9be2151cc507aaf5d59e50f456ae
commit 48b56504bf2c9be2151cc507aaf5d59e50f456ae
Author: Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Fri Feb 24 18:27:41 2017 +0100
Commit: Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Sun Feb 26 19:05:56 2017 +0100
Autogen: Fix for Q_PLUGIN_METADATA change detection test
diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index 257c187..dc631c6 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -232,55 +232,56 @@ if (NOT QT_TEST_VERSION STREQUAL 4)
endif()
set(timeformat "%Y%j%H%M%S")
- set(mocPluginBinDir "${CMAKE_CURRENT_BINARY_DIR}/mocPlugin")
- find_library(style_a_file "PluginStyleA" "${mocPluginBinDir}")
- find_library(style_b_file "PluginStyleB" "${mocPluginBinDir}")
- find_library(style_c_file "PluginStyleC" "${mocPluginBinDir}")
- find_library(style_d_file "PluginStyleD" "${mocPluginBinDir}")
-
- file(TIMESTAMP "${style_a_file}" style_a_before "${timeformat}")
- file(TIMESTAMP "${style_b_file}" style_b_before "${timeformat}")
- file(TIMESTAMP "${style_c_file}" style_c_before "${timeformat}")
- file(TIMESTAMP "${style_d_file}" style_d_before "${timeformat}")
-
- # Ensure that the timestamp will change and touch the json files
+ set(mocPlugSrcDir "${CMAKE_CURRENT_SOURCE_DIR}/mocPlugin")
+ set(mocPlugBinDir "${CMAKE_CURRENT_BINARY_DIR}/mocPlugin")
+ find_library(plAFile "PlugA" PATHS "${mocPlugBinDir}" NO_DEFAULT_PATH)
+ find_library(plBFile "PlugB" PATHS "${mocPlugBinDir}" NO_DEFAULT_PATH)
+ find_library(plCFile "PlugC" PATHS "${mocPlugBinDir}" NO_DEFAULT_PATH)
+ find_library(plDFile "PlugD" PATHS "${mocPlugBinDir}" NO_DEFAULT_PATH)
+
+ file(TIMESTAMP "${plAFile}" plABefore "${timeformat}")
+ file(TIMESTAMP "${plBFile}" plBBefore "${timeformat}")
+ file(TIMESTAMP "${plCFile}" plCBefore "${timeformat}")
+ file(TIMESTAMP "${plDFile}" plDBefore "${timeformat}")
+
+ # Ensure that the timestamp will change and change the json files
execute_process(COMMAND "${CMAKE_COMMAND}" -E sleep 1)
- execute_process(COMMAND "${CMAKE_COMMAND}" -E touch "${mocPluginBinDir}/jsonFiles/StyleC.json")
- execute_process(COMMAND "${CMAKE_COMMAND}" -E touch "${mocPluginBinDir}/jsonFiles/sub/StyleD.json")
- execute_process(COMMAND "${CMAKE_COMMAND}" --build . WORKING_DIRECTORY "${mocPluginBinDir}")
+ configure_file("${mocPlugSrcDir}/jsonIn/StyleD.json" "${mocPlugBinDir}/jsonFiles/StyleC.json")
+ configure_file("${mocPlugSrcDir}/jsonIn/StyleC.json" "${mocPlugBinDir}/jsonFiles/sub/StyleD.json")
+ execute_process(COMMAND "${CMAKE_COMMAND}" --build . WORKING_DIRECTORY "${mocPlugBinDir}")
- file(TIMESTAMP "${style_a_file}" style_a_after "${timeformat}")
- file(TIMESTAMP "${style_b_file}" style_b_after "${timeformat}")
- file(TIMESTAMP "${style_c_file}" style_c_after "${timeformat}")
- file(TIMESTAMP "${style_d_file}" style_d_after "${timeformat}")
+ file(TIMESTAMP "${plAFile}" plAAfter "${timeformat}")
+ file(TIMESTAMP "${plBFile}" plBAfter "${timeformat}")
+ file(TIMESTAMP "${plCFile}" plCAfter "${timeformat}")
+ file(TIMESTAMP "${plDFile}" plDAfter "${timeformat}")
- if (style_a_after GREATER style_a_before)
- message(SEND_ERROR "file (${style_a_file}) should not have changed!")
+ if (plAAfter GREATER plABefore)
+ message(SEND_ERROR "file (${plAFile}) should not have changed!")
endif()
- if (style_b_after GREATER style_b_before)
- message(SEND_ERROR "file (${style_b_file}) should not have changed!")
+ if (plBAfter GREATER plBBefore)
+ message(SEND_ERROR "file (${plBFile}) should not have changed!")
endif()
- if (NOT style_c_after GREATER style_c_before)
- message(SEND_ERROR "file (${style_c_file}) should have changed!")
+ if (NOT plCAfter GREATER plCBefore)
+ message(SEND_ERROR "file (${plCFile}) should have changed!")
endif()
- if (NOT style_d_after GREATER style_d_before)
- message(SEND_ERROR "file (${style_d_file}) should have changed!")
+ if (NOT plDAfter GREATER plDBefore)
+ message(SEND_ERROR "file (${plDFile}) should have changed!")
endif()
# Test custom macro
- file(TIMESTAMP "${style_c_file}" style_c_before "${timeformat}")
- file(TIMESTAMP "${style_d_file}" style_d_before "${timeformat}")
+ file(TIMESTAMP "${plCFile}" plCBefore "${timeformat}")
+ file(TIMESTAMP "${plDFile}" plDBefore "${timeformat}")
execute_process(COMMAND "${CMAKE_COMMAND}" -E sleep 1)
- execute_process(COMMAND "${CMAKE_COMMAND}" -E touch "${mocPluginBinDir}/jsonFiles/StyleC_Custom.json")
- execute_process(COMMAND "${CMAKE_COMMAND}" -E touch "${mocPluginBinDir}/jsonFiles/sub/StyleD_Custom.json")
- execute_process(COMMAND "${CMAKE_COMMAND}" --build . WORKING_DIRECTORY "${mocPluginBinDir}")
- file(TIMESTAMP "${style_c_file}" style_c_after "${timeformat}")
- file(TIMESTAMP "${style_d_file}" style_d_after "${timeformat}")
- if (NOT style_c_after GREATER style_c_before)
- message(SEND_ERROR "file (${style_c_file}) should have changed!")
+ configure_file("${mocPlugSrcDir}/jsonIn/StyleD.json" "${mocPlugBinDir}/jsonFiles/StyleC_Custom.json")
+ configure_file("${mocPlugSrcDir}/jsonIn/StyleC.json" "${mocPlugBinDir}/jsonFiles/sub/StyleD_Custom.json")
+ execute_process(COMMAND "${CMAKE_COMMAND}" --build . WORKING_DIRECTORY "${mocPlugBinDir}")
+ file(TIMESTAMP "${plCFile}" plCAfter "${timeformat}")
+ file(TIMESTAMP "${plDFile}" plDAfter "${timeformat}")
+ if (NOT plCAfter GREATER plCBefore)
+ message(SEND_ERROR "file (${plCFile}) should have changed!")
endif()
- if (NOT style_d_after GREATER style_d_before)
- message(SEND_ERROR "file (${style_d_file}) should have changed!")
+ if (NOT plDAfter GREATER plDBefore)
+ message(SEND_ERROR "file (${plDFile}) should have changed!")
endif()
endif()
diff --git a/Tests/QtAutogen/mocPlugin/CMakeLists.txt b/Tests/QtAutogen/mocPlugin/CMakeLists.txt
index b72b05d..4843c21 100644
--- a/Tests/QtAutogen/mocPlugin/CMakeLists.txt
+++ b/Tests/QtAutogen/mocPlugin/CMakeLists.txt
@@ -25,8 +25,8 @@ set(CMAKE_AUTOMOC TRUE)
include_directories("${CMAKE_CURRENT_BINARY_DIR}/jsonFiles")
link_libraries(Qt5::Widgets)
-add_library(PluginStyleA MODULE StyleA.cpp)
-add_library(PluginStyleB MODULE StyleB.cpp)
-add_library(PluginStyleC MODULE StyleC.cpp)
-add_library(PluginStyleD MODULE StyleD.cpp)
-add_library(PluginStyleE MODULE StyleE.cpp)
+add_library(PlugA STATIC StyleA.cpp)
+add_library(PlugB STATIC StyleB.cpp)
+add_library(PlugC STATIC StyleC.cpp)
+add_library(PlugD STATIC StyleD.cpp)
+add_library(PlugE STATIC StyleE.cpp)
diff --git a/Tests/QtAutogen/mocPlugin/jsonIn/StyleC.json b/Tests/QtAutogen/mocPlugin/jsonIn/StyleC.json
index bf17580..119aaa4 100644
--- a/Tests/QtAutogen/mocPlugin/jsonIn/StyleC.json
+++ b/Tests/QtAutogen/mocPlugin/jsonIn/StyleC.json
@@ -1 +1 @@
-{ "Keys": [ "Rocket", "StarbusterC" ] }
+{ "Keys": [ "Boat", "Ship" ] }
diff --git a/Tests/QtAutogen/mocPlugin/jsonIn/StyleD.json b/Tests/QtAutogen/mocPlugin/jsonIn/StyleD.json
index f7fcc19..732c547 100644
--- a/Tests/QtAutogen/mocPlugin/jsonIn/StyleD.json
+++ b/Tests/QtAutogen/mocPlugin/jsonIn/StyleD.json
@@ -1 +1 @@
-{ "Keys": [ "Rocket", "StarbusterD" ] }
+{ "Keys": [ "Bike", "Car" ] }
-----------------------------------------------------------------------
Summary of changes:
Tests/QtAutogen/CMakeLists.txt | 77 +++++++++++++-------------
Tests/QtAutogen/mocPlugin/CMakeLists.txt | 10 ++--
Tests/QtAutogen/mocPlugin/jsonIn/StyleC.json | 2 +-
Tests/QtAutogen/mocPlugin/jsonIn/StyleD.json | 2 +-
4 files changed, 46 insertions(+), 45 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list