[Cmake-commits] CMake branch, master, updated. v3.14.0-rc1-89-g49a53ca
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 49a53cac87fe3a303a2794ccdd7c1b5cecd2d016 (commit)
via ec13bd523006151b4e0d2b9afc19562e5f05de38 (commit)
via ded4bc136e5b120b2d047dc9b8eb6f7446043d08 (commit)
via f3999a21c85e6caf19feef7c90afce3969d9102a (commit)
from 5b3683ec8a23d8cecb27f3cd2e3a649ae6ad5999 (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=49a53cac87fe3a303a2794ccdd7c1b5cecd2d016
commit 49a53cac87fe3a303a2794ccdd7c1b5cecd2d016
Merge: 5b3683e ec13bd5
Author: Brad King
AuthorDate: Thu Feb 14 15:11:40 2019 +
Commit: Kitware Robot
CommitDate: Thu Feb 14 10:11:54 2019 -0500
Merge topic 'update-kwsys'
ec13bd5230 Tests: Disable test that builds KWSys if not also building CMake
ded4bc136e Merge branch 'upstream-KWSys' into update-kwsys
f3999a21c8 KWSys 2019-02-12 (44676809)
Acked-by: Kitware Robot
Merge-request: !2953
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ec13bd523006151b4e0d2b9afc19562e5f05de38
commit ec13bd523006151b4e0d2b9afc19562e5f05de38
Author: Brad King
AuthorDate: Wed Feb 13 08:07:54 2019 -0500
Commit: Brad King
CommitDate: Wed Feb 13 08:10:35 2019 -0500
Tests: Disable test that builds KWSys if not also building CMake
If `CMake_TEST_EXTERNAL_CMAKE` is enabled then the compiler with which
we are driving tests may not be able to compile CMake, so do not try
to compile KWSys with it either.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 40e53a2..3245f3e 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -3272,12 +3272,14 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
--output-log "${CMake_BINARY_DIR}/Tests/CTestTest/testOutput.log"
)
-configure_file("${CMake_SOURCE_DIR}/Tests/CTestTest2/test.cmake.in"
- "${CMake_BINARY_DIR}/Tests/CTestTest2/test.cmake" @ONLY ESCAPE_QUOTES)
-add_test(CTestTest2 ${CMAKE_CTEST_COMMAND}
- -S "${CMake_BINARY_DIR}/Tests/CTestTest2/test.cmake" -V
- --output-log "${CMake_BINARY_DIR}/Tests/CTestTest2/testOutput.log"
- )
+if(NOT CMake_TEST_EXTERNAL_CMAKE)
+ configure_file("${CMake_SOURCE_DIR}/Tests/CTestTest2/test.cmake.in"
+"${CMake_BINARY_DIR}/Tests/CTestTest2/test.cmake" @ONLY ESCAPE_QUOTES)
+ add_test(CTestTest2 ${CMAKE_CTEST_COMMAND}
+-S "${CMake_BINARY_DIR}/Tests/CTestTest2/test.cmake" -V
+--output-log "${CMake_BINARY_DIR}/Tests/CTestTest2/testOutput.log"
+)
+endif()
if("${CMAKE_GENERATOR}" MATCHES "Makefiles" OR "${CMAKE_GENERATOR}"
MATCHES "Ninja")
configure_file("${CMake_SOURCE_DIR}/Tests/CTestTestLaunchers/test.cmake.in"
@@ -3309,11 +3311,13 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
PROPERTIES TIMEOUT ${CMAKE_LONG_TEST_TIMEOUT})
endif ()
-get_test_property(CTestTest2 TIMEOUT PREVIOUS_TIMEOUT)
-if ("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
- set_tests_properties ( CTestTest2
-PROPERTIES TIMEOUT ${CMAKE_LONG_TEST_TIMEOUT})
-endif ()
+if(NOT CMake_TEST_EXTERNAL_CMAKE)
+ get_test_property(CTestTest2 TIMEOUT PREVIOUS_TIMEOUT)
+ if("${PREVIOUS_TIMEOUT}" MATCHES NOTFOUND)
+set_tests_properties ( CTestTest2
+ PROPERTIES TIMEOUT ${CMAKE_LONG_TEST_TIMEOUT})
+ endif()
+endif()
endif ()
if(CMake_TEST_EXTERNAL_CMAKE)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ded4bc136e5b120b2d047dc9b8eb6f7446043d08
commit ded4bc136e5b120b2d047dc9b8eb6f7446043d08
Merge: 9d2ab63 f3999a2
Author: Brad King
AuthorDate: Tue Feb 12 08:35:12 2019 -0500
Commit: Brad King
CommitDate: Tue Feb 12 08:35:12 2019 -0500
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2019-02-12 (44676809)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f3999a21c85e6caf19feef7c90afce3969d9102a
commit f3999a21c85e6caf19feef7c90afce3969d9102a
Author: KWSys Upstream
AuthorDate: Tue Feb 12 08:34:34 2019 -0500
Commit: Brad King
CommitDate: Tue Feb 12 08:35:11 2019 -0500
KWSys 2019-02-12 (44676809)
Code extracted from:
https://gitlab.kitware.com/utils/kwsys.git
at commit 4467680959f82b755462a8530ef5d0dbd928d2d4 (master).
Upstream Shortlog
-
Albert Astals Cid (1):
7d50c26d Delete some default constructors and assignment operators
Artur Ryt (1):
01089e4c Prefer back/data over dereferencing rbegin/begin iterator
diff --git a
[Cmake-commits] CMake branch, master, updated. v3.14.0-rc1-96-g50ba2f0
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 50ba2f019baa3e5487a975cb72059f1fc178f9d0 (commit)
via fd74eba1402d66a4d6a1af3442cf219d02f7cbc8 (commit)
via 76a5ac210050e0c1ccdce8ce89a0c77579e30187 (commit)
via 6fc33829443ea3ef2dc8cc71c0a98b635bec6179 (commit)
via 2ad14ef4ea57c19f6cb4ed365e99a30be81eefe7 (commit)
via 557b2d6e65038640d5016413e612e48691cff0d8 (commit)
via 017598a4443c19185dc245f3f0fcfceff9b98463 (commit)
from 49a53cac87fe3a303a2794ccdd7c1b5cecd2d016 (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=50ba2f019baa3e5487a975cb72059f1fc178f9d0
commit 50ba2f019baa3e5487a975cb72059f1fc178f9d0
Merge: fd74eba 6fc3382
Author: Brad King
AuthorDate: Thu Feb 14 15:14:11 2019 +
Commit: Kitware Robot
CommitDate: Thu Feb 14 10:14:47 2019 -0500
Merge topic 'fix-legacy-implicit-includes'
6fc3382944 Update logic for sysroot in detected implicit include directories
2ad14ef4ea cmAlgorithms: Add cmHasPrefix to match existing cmHasSuffix
557b2d6e65 Fix regression in -I/usr/include exclusion logic
017598a444 macOS: Fix addition of /usr/include to default implicit
include dirs
Acked-by: Kitware Robot
Merge-request: !2957
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd74eba1402d66a4d6a1af3442cf219d02f7cbc8
commit fd74eba1402d66a4d6a1af3442cf219d02f7cbc8
Merge: 49a53ca 76a5ac2
Author: Brad King
AuthorDate: Thu Feb 14 15:14:02 2019 +
Commit: Kitware Robot
CommitDate: Thu Feb 14 10:14:08 2019 -0500
Merge topic 'fix-pointer-truncation'
76a5ac2100 cmListFileLexer: Add missing include to avoid possible pointer
truncation
Acked-by: Kitware Robot
Merge-request: !2956
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=76a5ac210050e0c1ccdce8ce89a0c77579e30187
commit 76a5ac210050e0c1ccdce8ce89a0c77579e30187
Author: Zsolt Parragi
AuthorDate: Tue Feb 12 21:01:18 2019 +0100
Commit: Brad King
CommitDate: Wed Feb 13 10:22:59 2019 -0500
cmListFileLexer: Add missing include to avoid possible pointer truncation
The `cmsys/Enconding.h` include had a typo in its surrounding ifdef,
possibly causing a missing function declaration (`cmsysEncoding_DupToWide`).
As this is C code, this resulted in the code compiling, but with a truncated
return value, possibly causing crashes.
diff --git a/Source/LexerParser/cmListFileLexer.c
b/Source/LexerParser/cmListFileLexer.c
index c726415..15dcda0 100644
--- a/Source/LexerParser/cmListFileLexer.c
+++ b/Source/LexerParser/cmListFileLexer.c
@@ -766,7 +766,7 @@ Modify cmListFileLexer.c:
/* IWYU pragma: no_forward_declare yyguts_t */
-#ifdef WIN32
+#ifdef _WIN32
#include "cmsys/Encoding.h"
#endif
diff --git a/Source/LexerParser/cmListFileLexer.in.l
b/Source/LexerParser/cmListFileLexer.in.l
index 6a6fb5f..fdf14d2 100644
--- a/Source/LexerParser/cmListFileLexer.in.l
+++ b/Source/LexerParser/cmListFileLexer.in.l
@@ -18,7 +18,7 @@ Modify cmListFileLexer.c:
/* IWYU pragma: no_forward_declare yyguts_t */
-#ifdef WIN32
+#ifdef _WIN32
#include "cmsys/Encoding.h"
#endif
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6fc33829443ea3ef2dc8cc71c0a98b635bec6179
commit 6fc33829443ea3ef2dc8cc71c0a98b635bec6179
Author: Brad King
AuthorDate: Wed Feb 13 09:27:24 2019 -0500
Commit: Brad King
CommitDate: Wed Feb 13 10:03:56 2019 -0500
Update logic for sysroot in detected implicit include directories
Since commit 5990ecb741 (Compute implicit include directories from
compiler output, 2018-12-07, v3.14.0-rc1~108^2) the values of the
`CMAKE__IMPLICIT_INCLUDE_DIRECTORIES` variables are computed from
a real compiler invocation. In this case the paths under the sysroot
should already have the sysroot prefix so we should no longer have to
add the sysroot prefix. However, it is also possible for project code
to add its own paths to `CMAKE__IMPLICIT_INCLUDE_DIRECTORIES`
without the sysroot prefix and expect the historical addition of the
sysroot prefix to be preserved.
Try to account for both cases by conditionally adding the sysroot prefix
on implicit include directories that do not already have it.
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index b1115ea..8090e00 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -935,6 +935,7 @@ std::vector>
cmLocalGenerator::GetIncludeDirectoriesImplicit(
} else {
rootPath = this->Makefile->GetSafeDefinition("CMAKE_SYSROOT");
}
+cmSy
[Cmake-commits] CMake branch, master, updated. v3.14.0-rc1-100-g0069825
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 0069825f50c83b8144374150dd682d48c84f6874 (commit)
via d80ecba5c27ec249dc85c3a3559db822ef320d05 (commit)
via 72057d9c1582f4b6dec66cd0675860c4c335636e (commit)
via 7ae329e2ed84f62165cb11794ad85c6c43dbd7dc (commit)
from 50ba2f019baa3e5487a975cb72059f1fc178f9d0 (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=0069825f50c83b8144374150dd682d48c84f6874
commit 0069825f50c83b8144374150dd682d48c84f6874
Merge: 50ba2f0 d80ecba
Author: Brad King
AuthorDate: Thu Feb 14 15:25:08 2019 +
Commit: Kitware Robot
CommitDate: Thu Feb 14 10:25:15 2019 -0500
Merge topic 'fortran-submodule-names'
d80ecba5c2 Fortran: Fix submodule file names across compilers
72057d9c15 Fortran: Thread compiler id through to internal Fortran parser
7ae329e2ed Fortran: Factor out .mod and .smod file name construction
Acked-by: Kitware Robot
Acked-by: Michael Hirsch, Ph.D.
Merge-request: !2958
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d80ecba5c27ec249dc85c3a3559db822ef320d05
commit d80ecba5c27ec249dc85c3a3559db822ef320d05
Author: Brad King
AuthorDate: Wed Feb 13 14:08:34 2019 -0500
Commit: Brad King
CommitDate: Thu Feb 14 10:23:02 2019 -0500
Fortran: Fix submodule file names across compilers
The naming convention for submodule files varies across compilers. Add
a table to the compiler information modules and thread the information
through to the Fortran module dependency parser. Fill out the table for
compiler ids known to support Fortran submodules.
Fixes: #18746
diff --git a/Modules/Compiler/Flang-Fortran.cmake
b/Modules/Compiler/Flang-Fortran.cmake
index d522739..f0e61d8 100644
--- a/Modules/Compiler/Flang-Fortran.cmake
+++ b/Modules/Compiler/Flang-Fortran.cmake
@@ -1,6 +1,9 @@
include(Compiler/Clang)
__compiler_clang(Fortran)
+set(CMAKE_Fortran_SUBMODULE_SEP "-")
+set(CMAKE_Fortran_SUBMODULE_EXT ".mod")
+
set(CMAKE_Fortran_PREPROCESS_SOURCE
" -cpp-E >
")
diff --git a/Modules/Compiler/GNU-Fortran.cmake
b/Modules/Compiler/GNU-Fortran.cmake
index c333d50..6413769 100644
--- a/Modules/Compiler/GNU-Fortran.cmake
+++ b/Modules/Compiler/GNU-Fortran.cmake
@@ -1,6 +1,9 @@
include(Compiler/GNU)
__compiler_gnu(Fortran)
+set(CMAKE_Fortran_SUBMODULE_SEP "@")
+set(CMAKE_Fortran_SUBMODULE_EXT ".smod")
+
set(CMAKE_Fortran_PREPROCESS_SOURCE
" -cpp-E -o
")
diff --git a/Modules/Compiler/Intel-Fortran.cmake
b/Modules/Compiler/Intel-Fortran.cmake
index a132055..5275ddf 100644
--- a/Modules/Compiler/Intel-Fortran.cmake
+++ b/Modules/Compiler/Intel-Fortran.cmake
@@ -1,6 +1,9 @@
include(Compiler/Intel)
__compiler_intel(Fortran)
+set(CMAKE_Fortran_SUBMODULE_SEP "@")
+set(CMAKE_Fortran_SUBMODULE_EXT ".smod")
+
set(CMAKE_Fortran_MODDIR_FLAG "-module ")
set(CMAKE_Fortran_FORMAT_FIXED_FLAG "-fixed")
set(CMAKE_Fortran_FORMAT_FREE_FLAG "-free")
diff --git a/Modules/Compiler/PGI-Fortran.cmake
b/Modules/Compiler/PGI-Fortran.cmake
index a183c33..3daf798 100644
--- a/Modules/Compiler/PGI-Fortran.cmake
+++ b/Modules/Compiler/PGI-Fortran.cmake
@@ -1,6 +1,9 @@
include(Compiler/PGI)
__compiler_pgi(Fortran)
+set(CMAKE_Fortran_SUBMODULE_SEP "-")
+set(CMAKE_Fortran_SUBMODULE_EXT ".mod")
+
set(CMAKE_Fortran_PREPROCESS_SOURCE
" -Mpreprocess-E
> ")
diff --git a/Modules/Compiler/XL-Fortran.cmake
b/Modules/Compiler/XL-Fortran.cmake
index 6bab6f6..c4fb097 100644
--- a/Modules/Compiler/XL-Fortran.cmake
+++ b/Modules/Compiler/XL-Fortran.cmake
@@ -1,6 +1,9 @@
include(Compiler/XL)
__compiler_xl(Fortran)
+set(CMAKE_Fortran_SUBMODULE_SEP "_")
+set(CMAKE_Fortran_SUBMODULE_EXT ".smod")
+
set(CMAKE_Fortran_FORMAT_FIXED_FLAG "-qfixed") # [=]
set(CMAKE_Fortran_FORMAT_FREE_FLAG "-qfree") # [=f90|ibm]
diff --git a/Source/cmDependsFortran.cxx b/Source/cmDependsFortran.cxx
index fe69d14..3f036a9 100644
--- a/Source/cmDependsFortran.cxx
+++ b/Source/cmDependsFortran.cxx
@@ -96,6 +96,8 @@ cmDependsFortran::cmDependsFortran(cmLocalGenerator* lg)
}
this->CompilerId = mf->GetSafeDefinition("CMAKE_Fortran_COMPILER_ID");
+ this->SModSep = mf->GetSafeDefinition("CMAKE_Fortran_SUBMODULE_SEP");
+ this->SModExt = mf->GetSafeDefinition("CMAKE_Fortran_SUBMODULE_EXT");
}
cmDependsFortran::~cmDependsFortran()
@@ -120,6 +122,8 @@ bool cmDependsFortran::WriteDependencies(const
std::set& sources,
cmFortranCompiler fc;
fc.Id = this->CompilerId;
+ fc.SModSep = this->SModSep;
+ fc.SModExt = this->SModExt;
bool okay = true;
for (std::strin
[Cmake-commits] CMake branch, master, updated. v3.14.0-rc1-104-ge3353a0
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 e3353a0175fb27bc2967c3df78b8be1c0615b21d (commit) via 2f51f281a8c9684c25cf97499a4382e1b5ae68b9 (commit) via 9f351b93ab7684940ad2da14fd6800f11f09355f (commit) via 30783addc12d82081575f5a7577d7b4953cbd55c (commit) from 0069825f50c83b8144374150dd682d48c84f6874 (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=e3353a0175fb27bc2967c3df78b8be1c0615b21d commit e3353a0175fb27bc2967c3df78b8be1c0615b21d Merge: 0069825 2f51f28 Author: Brad King AuthorDate: Thu Feb 14 10:35:22 2019 -0500 Commit: Brad King CommitDate: Thu Feb 14 10:35:22 2019 -0500 Merge branch 'release-3.14' --- Summary of changes: hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.14.0-rc1-29-g2f51f28
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, release has been updated via 2f51f281a8c9684c25cf97499a4382e1b5ae68b9 (commit) via d80ecba5c27ec249dc85c3a3559db822ef320d05 (commit) via 72057d9c1582f4b6dec66cd0675860c4c335636e (commit) via 7ae329e2ed84f62165cb11794ad85c6c43dbd7dc (commit) via 9f351b93ab7684940ad2da14fd6800f11f09355f (commit) via 76a5ac210050e0c1ccdce8ce89a0c77579e30187 (commit) via 30783addc12d82081575f5a7577d7b4953cbd55c (commit) via 6fc33829443ea3ef2dc8cc71c0a98b635bec6179 (commit) via 2ad14ef4ea57c19f6cb4ed365e99a30be81eefe7 (commit) via 557b2d6e65038640d5016413e612e48691cff0d8 (commit) via 017598a4443c19185dc245f3f0fcfceff9b98463 (commit) from 1c4570e22eb7fcf312426e4e1fb0db0c2a3d5d33 (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 - --- Summary of changes: Modules/Compiler/Flang-Fortran.cmake | 3 +++ Modules/Compiler/GNU-Fortran.cmake | 3 +++ Modules/Compiler/Intel-Fortran.cmake | 3 +++ Modules/Compiler/PGI-Fortran.cmake | 3 +++ Modules/Compiler/XL-Fortran.cmake| 3 +++ Modules/Platform/Darwin.cmake| 2 +- Modules/Platform/UnixPaths.cmake | 5 - Source/LexerParser/cmListFileLexer.c | 2 +- Source/LexerParser/cmListFileLexer.in.l | 2 +- Source/cmAlgorithms.h| 8 Source/cmDependsFortran.cxx | 11 ++- Source/cmDependsFortran.h| 4 Source/cmFortranParser.h | 16 +++- Source/cmFortranParserImpl.cxx | 29 + Source/cmGlobalNinjaGenerator.cxx| 12 +++- Source/cmLocalGenerator.cxx | 28 +--- Source/cmLocalUnixMakefileGenerator3.cxx | 11 +++ Source/cmNinjaTargetGenerator.cxx| 4 18 files changed, 123 insertions(+), 26 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.14.0-rc1-109-g8c4de81
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 8c4de819449bbb1710b1cc2440357757e5cb757c (commit)
via a40864ae53ad22c369596699cc1bb791f65dc360 (commit)
via 724359489e03c1c890bea4bc6ba71ca353b048b9 (commit)
via 6ed4ae4bad3bf3e226e0c8009f9b4057707cfc21 (commit)
via fedbd16f352a8202d30332228ca586a69b513c89 (commit)
from e3353a0175fb27bc2967c3df78b8be1c0615b21d (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=8c4de819449bbb1710b1cc2440357757e5cb757c
commit 8c4de819449bbb1710b1cc2440357757e5cb757c
Merge: e3353a0 a40864a
Author: Brad King
AuthorDate: Thu Feb 14 16:01:34 2019 +
Commit: Kitware Robot
CommitDate: Thu Feb 14 11:01:42 2019 -0500
Merge topic 'autogen_refactor_rerun_tests'
a40864ae53 Autogen: Refactor RerunRccDepends test with fixed timestamp
comparison
724359489e Autogen: Refactor RerunRccConfigChange test
6ed4ae4bad Autogen: Refactor RerunMocBasic test with fixed timestamp
comparison
fedbd16f35 Autogen: Refactor RerunMocPlugin test with fixed timestamp
comparison
Acked-by: Kitware Robot
Merge-request: !2959
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a40864ae53ad22c369596699cc1bb791f65dc360
commit a40864ae53ad22c369596699cc1bb791f65dc360
Author: Sebastian Holtermann
AuthorDate: Wed Feb 13 21:08:49 2019 +0100
Commit: Sebastian Holtermann
CommitDate: Wed Feb 13 23:01:46 2019 +0100
Autogen: Refactor RerunRccDepends test with fixed timestamp comparison
This refactors and simplifies the QtAutogen.RerunRccDepends test.
Repetitive task are packed into macros.
By using version strings to store file timestamps, timestamp comparison
becomes more reliable. Test status and error messages are improved.
diff --git a/Tests/QtAutogen/RerunRccDepends/CMakeLists.txt
b/Tests/QtAutogen/RerunRccDepends/CMakeLists.txt
index 80c5cf0..1301550 100644
--- a/Tests/QtAutogen/RerunRccDepends/CMakeLists.txt
+++ b/Tests/QtAutogen/RerunRccDepends/CMakeLists.txt
@@ -3,19 +3,63 @@ project(RerunRccDepends)
include("../AutogenCoreTest.cmake")
# Tests rcc rebuilding when a resource file changes
+# When a .qrc or a file listed in a .qrc file changes,
+# the target must be rebuilt
# Dummy executable to generate a clean target
add_executable(dummy dummy.cpp)
-# When a .qrc or a file listed in a .qrc file changes,
-# the target must be rebuilt
-set(timeformat "%Y%j%H%M%S")
+# Utility variables
+set(timeformat "%Y.%j.%H.%M%S")
set(rccDepSD "${CMAKE_CURRENT_SOURCE_DIR}/RccDepends")
set(rccDepBD "${CMAKE_CURRENT_BINARY_DIR}/RccDepends")
-# Initial build
+# Utility macros
+macro(sleep)
+ message(STATUS "Sleeping for a few seconds.")
+ execute_process(COMMAND "${CMAKE_COMMAND}" -E sleep 1)
+endmacro()
+
+macro(acquire_timestamps When)
+ file(TIMESTAMP "${rccDepBinPlain}" rdPlain${When} "${timeformat}")
+ file(TIMESTAMP "${rccDepBinGenerated}" rdGenerated${When} "${timeformat}")
+endmacro()
+
+macro(rebuild buildName)
+ message(STATUS "Starting build ${buildName} of rccDepends.")
+ execute_process(
+COMMAND "${CMAKE_COMMAND}" --build .
+WORKING_DIRECTORY "${rccDepBD}"
+RESULT_VARIABLE result)
+ if (result)
+message(FATAL_ERROR "Build ${buildName} of rccDepends failed.")
+ else()
+message(STATUS "Build ${buildName} of rccDepends finished.")
+ endif()
+endmacro()
+
+macro(require_change type)
+ if (rd${type}After VERSION_GREATER rd${type}Before)
+message(STATUS "As expected the ${type} .qrc file ${rccDepBin${type}}
changed.")
+ else()
+message(SEND_ERROR "Unexpectedly the ${type} .qrc file ${rccDepBin${type}}
did not change!\nTimestamp pre: ${rd${type}Before}\nTimestamp aft:
${rd${type}After}\n")
+ endif()
+endmacro()
+
+macro(require_change_not type)
+ if (rd${type}After VERSION_GREATER rd${type}Before)
+message(SEND_ERROR "Unexpectedly the ${type} .qrc file ${rccDepBin${type}}
changed!\nTimestamp pre: ${rd${type}Before}\nTimestamp aft:
${rd${type}After}\n")
+ else()
+message(STATUS "As expected the ${type} .qrc file ${rccDepBin${type}} did
not change.")
+ endif()
+endmacro()
+
+
+# Initial configuration
configure_file(${rccDepSD}/resPlainA.qrc.in ${rccDepBD}/resPlain.qrc COPYONLY)
configure_file(${rccDepSD}/resGenA.qrc.in ${rccDepBD}/resGen.qrc.in COPYONLY)
+
+# Initial build
try_compile(RCC_DEPENDS
"${rccDepBD}"
"${rccDepSD}"
@@ -26,113 +70,84 @@ try_compile(RCC_DEPENDS
OUTPUT_VARIABLE output
)
if (NOT RCC_DEPENDS)
- message(SEND_ERROR "Initial build of rccDepends failed. Output: ${output}")
+ message(FATAL_ERROR "Ini
[Cmake-commits] CMake branch, master, updated. v3.14.0-rc1-110-ga2a903f
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 a2a903fe42f6ef54665135cac54b75d50bcd696c (commit) from 8c4de819449bbb1710b1cc2440357757e5cb757c (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=a2a903fe42f6ef54665135cac54b75d50bcd696c commit a2a903fe42f6ef54665135cac54b75d50bcd696c Author: Kitware Robot AuthorDate: Fri Feb 15 00:01:08 2019 -0500 Commit: Kitware Robot CommitDate: Fri Feb 15 00:01:08 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 8330dc8..e69ceb9 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 14) -set(CMake_VERSION_PATCH 20190214) +set(CMake_VERSION_PATCH 20190215) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
