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 a550e2d6e48798d342a5ba7436013c6aa6ce5151 (commit)
via 06dab0f0e5dcef89a0d03c4fd395a13a99056ea4 (commit)
from 5ae15061c36f45551d0308a5ff916067970705ff (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=a550e2d6e48798d342a5ba7436013c6aa6ce5151
commit a550e2d6e48798d342a5ba7436013c6aa6ce5151
Merge: 5ae1506 06dab0f
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Apr 11 14:12:16 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Thu Apr 11 10:13:47 2019 -0400
Merge topic 'test-autogen-GAT-generator'
06dab0f0e5 Tests: Fix Qt*Autogen.GlobalAutogenTarget to use matching
generator
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3210
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=06dab0f0e5dcef89a0d03c4fd395a13a99056ea4
commit 06dab0f0e5dcef89a0d03c4fd395a13a99056ea4
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Apr 10 09:58:46 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Apr 10 10:01:19 2019 -0400
Tests: Fix Qt*Autogen.GlobalAutogenTarget to use matching generator
Build the GAT project with the same generator as the rest of the test.
This was accidentally left out of commit 8c8731b422 (Autogen: Add test
for CMAKE_GLOBAL_AUTOGEN/RCC_TARGET, 2018-11-11, v3.14.0-rc1~396^2~2).
diff --git a/Tests/QtAutogen/GlobalAutogenTarget/CMakeLists.txt
b/Tests/QtAutogen/GlobalAutogenTarget/CMakeLists.txt
index cff7022..81fd8db 100644
--- a/Tests/QtAutogen/GlobalAutogenTarget/CMakeLists.txt
+++ b/Tests/QtAutogen/GlobalAutogenTarget/CMakeLists.txt
@@ -69,6 +69,9 @@ file(MAKE_DIRECTORY ${GAT_BDIR})
message("___ Configuring GAT project ___")
execute_process(
COMMAND "${CMAKE_COMMAND}" "${GAT_SDIR}"
+ -G "${CMAKE_GENERATOR}"
+ -A "${CMAKE_GENERATOR_PLATFORM}"
+ -T "${CMAKE_GENERATOR_TOOLSET}"
"-DQT_TEST_VERSION=${QT_TEST_VERSION}"
"-DCMAKE_AUTOGEN_VERBOSE=${CMAKE_AUTOGEN_VERBOSE}"
"-DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}"
-----------------------------------------------------------------------
Summary of changes:
Tests/QtAutogen/GlobalAutogenTarget/CMakeLists.txt | 3 +++
1 file changed, 3 insertions(+)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
