From kwrobot at kitware.com Wed Nov 1 00:05:28 2017 From: kwrobot at kitware.com (Kitware Robot) Date: Wed, 1 Nov 2017 00:05:28 -0400 (EDT) Subject: [Cmake-commits] CMake branch, master, updated. v3.10.0-rc3-210-ga0d00a1 Message-ID: <20171101040528.3E59EFECC0@public.kitware.com> 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 a0d00a17102d2740c1cf4b55fbf37308c7283f20 (commit) from fccbe2d30b15c8e3f389e6cf0284ff7f9daae090 (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=a0d00a17102d2740c1cf4b55fbf37308c7283f20 commit a0d00a17102d2740c1cf4b55fbf37308c7283f20 Author: Kitware Robot AuthorDate: Wed Nov 1 00:01:05 2017 -0400 Commit: Kitware Robot CommitDate: Wed Nov 1 00:01:05 2017 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 8b4adf6..0ecbd07 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 10) -set(CMake_VERSION_PATCH 20171031) +set(CMake_VERSION_PATCH 20171101) #set(CMake_VERSION_RC 1) ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From kwrobot at kitware.com Wed Nov 1 07:45:09 2017 From: kwrobot at kitware.com (Kitware Robot) Date: Wed, 1 Nov 2017 07:45:09 -0400 (EDT) Subject: [Cmake-commits] CMake branch, master, updated. v3.10.0-rc3-212-g93cd333 Message-ID: <20171101114510.07BD1FCCB4@public.kitware.com> 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 93cd33310351d6e42b5287815b98b841585ac0ca (commit) via f86879a04c4bc940b419a7944077f4b8f1e59e29 (commit) from a0d00a17102d2740c1cf4b55fbf37308c7283f20 (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=93cd33310351d6e42b5287815b98b841585ac0ca commit 93cd33310351d6e42b5287815b98b841585ac0ca Merge: a0d00a1 f86879a Author: Brad King AuthorDate: Wed Nov 1 11:40:30 2017 +0000 Commit: Kitware Robot CommitDate: Wed Nov 1 07:40:35 2017 -0400 Merge topic 'mingw-clang-c-compile-features' f86879a0 Record C compile features flags for MinGW Clang on Windows Acked-by: Kitware Robot Merge-request: !1435 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f86879a04c4bc940b419a7944077f4b8f1e59e29 commit f86879a04c4bc940b419a7944077f4b8f1e59e29 Author: Brad King AuthorDate: Wed Nov 1 06:59:53 2017 -0400 Commit: Brad King CommitDate: Wed Nov 1 07:28:38 2017 -0400 Record C compile features flags for MinGW Clang on Windows This was done for C++ by commit v3.5.0-rc1~69^2 (Record compile features for MinGW Clang on Windows, 2016-01-11). Make the same change for C. The `UNIX` condition on Clang C compiler features was already dropped by refactoring in commit v3.9.0-rc1~17^2~4 (Compilers: Port to use default cmake_record_lang_compile_features macros, 2017-05-10). Our documentation already claims support for this combination. This was simply an oversight when support was added for MinGW Clang C++. Issue: #15897 Issue: #15943 diff --git a/Modules/Compiler/Clang-C.cmake b/Modules/Compiler/Clang-C.cmake index a5f9d84..a07ae40 100644 --- a/Modules/Compiler/Clang-C.cmake +++ b/Modules/Compiler/Clang-C.cmake @@ -2,7 +2,7 @@ include(Compiler/Clang) __compiler_clang(C) cmake_policy(GET CMP0025 appleClangPolicy) -if(WIN32 OR (APPLE AND NOT appleClangPolicy STREQUAL NEW)) +if(APPLE AND NOT appleClangPolicy STREQUAL NEW) return() endif() ----------------------------------------------------------------------- Summary of changes: Modules/Compiler/Clang-C.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From kwrobot at kitware.com Wed Nov 1 08:05:09 2017 From: kwrobot at kitware.com (Kitware Robot) Date: Wed, 1 Nov 2017 08:05:09 -0400 (EDT) Subject: [Cmake-commits] CMake branch, master, updated. v3.10.0-rc3-218-gcdc9c11 Message-ID: <20171101120509.6E136FEC38@public.kitware.com> 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 cdc9c110a5bbe82d761f1a6d58b202a41b245de6 (commit) via 4857aec5d5bdee608d0e4fcf1a921de2a1c1b89c (commit) via ac1d19029119c32c67da555a892e9948b29eb067 (commit) via e4e9ce7cbe9b41dd535d5246153900cb9657c6ba (commit) via 5b9da05b7acc27ce40d27afcda0029284a0a4590 (commit) via 0987a399ec01813e16c0a2c86d481e2b8e2aab25 (commit) from 93cd33310351d6e42b5287815b98b841585ac0ca (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=cdc9c110a5bbe82d761f1a6d58b202a41b245de6 commit cdc9c110a5bbe82d761f1a6d58b202a41b245de6 Merge: 4857aec e4e9ce7 Author: Brad King AuthorDate: Wed Nov 1 12:02:11 2017 +0000 Commit: Kitware Robot CommitDate: Wed Nov 1 08:02:15 2017 -0400 Merge topic '16780-write-single-xcodeproj' e4e9ce7c Xcode: Add option to generate only topmost project file Acked-by: Kitware Robot Merge-request: !1395 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4857aec5d5bdee608d0e4fcf1a921de2a1c1b89c commit 4857aec5d5bdee608d0e4fcf1a921de2a1c1b89c Merge: ac1d190 0987a39 Author: Brad King AuthorDate: Wed Nov 1 12:00:42 2017 +0000 Commit: Kitware Robot CommitDate: Wed Nov 1 08:01:44 2017 -0400 Merge topic 'notes_timestamp' 0987a399 CTest: fix Time formatting in Notes.xml Acked-by: Kitware Robot Merge-request: !1428 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ac1d19029119c32c67da555a892e9948b29eb067 commit ac1d19029119c32c67da555a892e9948b29eb067 Merge: 93cd333 5b9da05 Author: Brad King AuthorDate: Wed Nov 1 12:00:19 2017 +0000 Commit: Kitware Robot CommitDate: Wed Nov 1 08:00:45 2017 -0400 Merge topic 'windows-embed-cmake-version' 5b9da05b Windows: Embed version information into CMake binaries Acked-by: Kitware Robot Merge-request: !1412 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e4e9ce7cbe9b41dd535d5246153900cb9657c6ba commit e4e9ce7cbe9b41dd535d5246153900cb9657c6ba Author: Gregor Jasny AuthorDate: Thu Oct 19 22:48:13 2017 +0200 Commit: Gregor Jasny CommitDate: Tue Oct 31 17:09:26 2017 +0100 Xcode: Add option to generate only topmost project file Closes #16780 diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index b37d473..0170da1 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -188,6 +188,7 @@ Variables that Change Behavior /variable/CMAKE_USER_MAKE_RULES_OVERRIDE /variable/CMAKE_WARN_DEPRECATED /variable/CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION + /variable/CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY Variables that Describe the System ================================== diff --git a/Help/release/dev/write-single-xcodeproj.rst b/Help/release/dev/write-single-xcodeproj.rst new file mode 100644 index 0000000..d5e9fef --- /dev/null +++ b/Help/release/dev/write-single-xcodeproj.rst @@ -0,0 +1,8 @@ +write-single-xcodeproj +---------------------- + +* The :generator:`Xcode` generator behavior of generating one project + file per :command:`project()` command could now be controlled with the + :variable:`CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY` variable. + This could be useful to speed up the CMake generation step for + large projects and to work-around a bug in the ``ZERO_CHECK`` logic. diff --git a/Help/variable/CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY.rst b/Help/variable/CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY.rst new file mode 100644 index 0000000..ea3e240 --- /dev/null +++ b/Help/variable/CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY.rst @@ -0,0 +1,9 @@ +CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY +------------------------------------------- + +If enabled, the :generator:`Xcode` generator will generate only a +single Xcode project file for the topmost :command:`project()` command +instead of generating one for every ``project()`` command. + +This could be useful to speed up the CMake generation step for +large projects and to work-around a bug in the ``ZERO_CHECK`` logic. diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 78943e4..d902ca3 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -388,6 +388,17 @@ void cmGlobalXCodeGenerator::Generate() std::map>::iterator it; for (it = this->ProjectMap.begin(); it != this->ProjectMap.end(); ++it) { cmLocalGenerator* root = it->second[0]; + + bool generateTopLevelProjectOnly = + root->GetMakefile()->IsOn("CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY"); + + if (generateTopLevelProjectOnly) { + cmStateSnapshot snp = root->GetStateSnapshot(); + if (snp.GetBuildsystemDirectoryParent().IsValid()) { + continue; + } + } + this->SetGenerationRoot(root); // now create the project this->OutputXCodeProject(root, it->second); diff --git a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake index 7d436b6..f730b83 100644 --- a/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake +++ b/Tests/RunCMake/XcodeProject/RunCMakeTest.cmake @@ -8,6 +8,7 @@ run_cmake(XcodeFileType) run_cmake(XcodeAttributeLocation) run_cmake(XcodeAttributeGenex) run_cmake(XcodeAttributeGenexError) +run_cmake(XcodeGenerateTopLevelProjectOnly) run_cmake(XcodeObjectNeedsEscape) run_cmake(XcodeObjectNeedsQuote) run_cmake(XcodeOptimizationFlags) diff --git a/Tests/RunCMake/XcodeProject/XcodeGenerateTopLevelProjectOnly-check.cmake b/Tests/RunCMake/XcodeProject/XcodeGenerateTopLevelProjectOnly-check.cmake new file mode 100644 index 0000000..64654af --- /dev/null +++ b/Tests/RunCMake/XcodeProject/XcodeGenerateTopLevelProjectOnly-check.cmake @@ -0,0 +1,3 @@ +if(EXISTS "${RunCMake_TEST_BINARY_DIR}/subproject/subproject.xcodeproj") + message(SEND_ERROR "Unexpected project file for subproject found.") +endif() diff --git a/Tests/RunCMake/XcodeProject/XcodeGenerateTopLevelProjectOnly.cmake b/Tests/RunCMake/XcodeProject/XcodeGenerateTopLevelProjectOnly.cmake new file mode 100644 index 0000000..7e53c49 --- /dev/null +++ b/Tests/RunCMake/XcodeProject/XcodeGenerateTopLevelProjectOnly.cmake @@ -0,0 +1,3 @@ +set(CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY TRUE) +project(XcodeGenerateTopLevelProjectOnly NONE) +add_subdirectory(subproject) diff --git a/Tests/RunCMake/XcodeProject/subproject/CMakeLists.txt b/Tests/RunCMake/XcodeProject/subproject/CMakeLists.txt new file mode 100644 index 0000000..20e12b1 --- /dev/null +++ b/Tests/RunCMake/XcodeProject/subproject/CMakeLists.txt @@ -0,0 +1 @@ +project(subproject) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5b9da05b7acc27ce40d27afcda0029284a0a4590 commit 5b9da05b7acc27ce40d27afcda0029284a0a4590 Author: Justin Goshi AuthorDate: Wed Oct 25 13:02:32 2017 -0700 Commit: Brad King CommitDate: Tue Oct 31 10:02:25 2017 -0400 Windows: Embed version information into CMake binaries diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index e1c34bf..f15dff8 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -1057,6 +1057,19 @@ endif() include (${CMake_BINARY_DIR}/Source/LocalUserOptions.cmake OPTIONAL) include (${CMake_SOURCE_DIR}/Source/LocalUserOptions.cmake OPTIONAL) +if(WIN32) + # Add Windows executable version information. + configure_file("CMakeVersion.rc.in" "CMakeVersion.rc" @ONLY) + + # We use a separate object library for this to work around a limitation of + # MinGW's windres tool with spaces in the path to the include directories. + add_library(CMakeVersion OBJECT "${CMAKE_CURRENT_BINARY_DIR}/CMakeVersion.rc") + set_property(TARGET CMakeVersion PROPERTY INCLUDE_DIRECTORIES "") + foreach(_tool ${_tools}) + target_sources(${_tool} PRIVATE $) + endforeach() +endif() + # Install tools foreach(_tool ${_tools}) diff --git a/Source/CMakeVersion.rc.in b/Source/CMakeVersion.rc.in new file mode 100644 index 0000000..f4ca3d5 --- /dev/null +++ b/Source/CMakeVersion.rc.in @@ -0,0 +1,34 @@ +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing for details. */ + +#define VER_FILEVERSION @CMake_VERSION_MAJOR@, at CMake_VERSION_MINOR@, at CMake_VERSION_PATCH@ +#define VER_FILEVERSION_STR "@CMake_VERSION_MAJOR at .@CMake_VERSION_MINOR at .@CMake_VERSION_PATCH@\0" + +#define VER_PRODUCTVERSION @CMake_VERSION_MAJOR@, at CMake_VERSION_MINOR@, at CMake_VERSION_PATCH@ +#define VER_PRODUCTVERSION_STR "@CMake_VERSION@\0" + +VS_VERSION_INFO VERSIONINFO +FILEVERSION VER_FILEVERSION +PRODUCTVERSION VER_PRODUCTVERSION +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" + BEGIN + VALUE "FileVersion", VER_FILEVERSION_STR + VALUE "ProductVersion", VER_PRODUCTVERSION_STR + END + END + + BLOCK "VarFileInfo" + BEGIN + /* The following line should only be modified for localized versions. */ + /* It consists of any number of WORD,WORD pairs, with each pair */ + /* describing a language,codepage combination supported by the file. */ + /* */ + /* For example, a file might have values "0x409,1252" indicating that it */ + /* supports English language (0x409) in the Windows ANSI codepage (1252). */ + + VALUE "Translation", 0x409, 1252 + END +END https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0987a399ec01813e16c0a2c86d481e2b8e2aab25 commit 0987a399ec01813e16c0a2c86d481e2b8e2aab25 Author: Zack Galbreath AuthorDate: Mon Oct 30 13:14:45 2017 -0400 Commit: Zack Galbreath CommitDate: Tue Oct 31 10:00:38 2017 -0400 CTest: fix Time formatting in Notes.xml Notes.xml was reporting its timestamp in E-notation. Here's an example of what this looked like: 1.50938e+09 This format is unsuitable for precisely determining when the Notes file was generated. As a result of this commit, the same field now appears as: 1509383044 diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 4ea1493..37ff901 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -12,6 +12,7 @@ #include "cmsys/String.hxx" #include "cmsys/SystemInformation.hxx" #include +#include #include #include #include @@ -1421,7 +1422,7 @@ int cmCTest::GenerateCTestNotesOutput(cmXMLWriter& xml, std::string note_time = this->CurrentTime(); xml.StartElement("Note"); xml.Attribute("Name", file); - xml.Element("Time", cmSystemTools::GetTime()); + xml.Element("Time", static_cast(cmSystemTools::GetTime())); xml.Element("DateTime", note_time); xml.StartElement("Text"); cmsys::ifstream ifs(file.c_str()); ----------------------------------------------------------------------- Summary of changes: Help/manual/cmake-variables.7.rst | 1 + Help/release/dev/write-single-xcodeproj.rst | 8 +++++ ...CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY.rst | 9 ++++++ Source/CMakeLists.txt | 13 ++++++++ Source/CMakeVersion.rc.in | 34 ++++++++++++++++++++ Source/cmCTest.cxx | 3 +- Source/cmGlobalXCodeGenerator.cxx | 11 +++++++ Tests/RunCMake/XcodeProject/RunCMakeTest.cmake | 1 + .../XcodeGenerateTopLevelProjectOnly-check.cmake | 3 ++ .../XcodeGenerateTopLevelProjectOnly.cmake | 3 ++ .../XcodeProject/subproject/CMakeLists.txt | 1 + 11 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 Help/release/dev/write-single-xcodeproj.rst create mode 100644 Help/variable/CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY.rst create mode 100644 Source/CMakeVersion.rc.in create mode 100644 Tests/RunCMake/XcodeProject/XcodeGenerateTopLevelProjectOnly-check.cmake create mode 100644 Tests/RunCMake/XcodeProject/XcodeGenerateTopLevelProjectOnly.cmake create mode 100644 Tests/RunCMake/XcodeProject/subproject/CMakeLists.txt hooks/post-receive -- CMake From kwrobot at kitware.com Wed Nov 1 08:15:04 2017 From: kwrobot at kitware.com (Kitware Robot) Date: Wed, 1 Nov 2017 08:15:04 -0400 (EDT) Subject: [Cmake-commits] CMake branch, master, updated. v3.10.0-rc3-228-ga57bad6 Message-ID: <20171101121504.E9677FC793@public.kitware.com> 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 a57bad6c3d0dbc885bb71dfe465d09a380c35960 (commit) via 1c222d85447d6f237c39d7fc3d4d970ea4fa44f1 (commit) via c693db0f62f1a8246458140418398bf76c02e7c4 (commit) via 77e758a3edab6836151d5b1e690096c4f33dbd23 (commit) via 4e46f97c84431e860aab3da78495b6c0e8c37725 (commit) via 8d1341f4ff8b8e61fc1b162c90cf5170ec57ac6f (commit) via 978c98b7bda6286d153c7b942509a92b66cb8fbc (commit) via 1df31aa92a398e0ef02e1ccccd41969a63bad29e (commit) via d3caf941e4940bb133088bea4c790a90e749f8b8 (commit) via 96d20a4de3420fca0e25a67c24e6f7eaead4420d (commit) from cdc9c110a5bbe82d761f1a6d58b202a41b245de6 (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=a57bad6c3d0dbc885bb71dfe465d09a380c35960 commit a57bad6c3d0dbc885bb71dfe465d09a380c35960 Merge: 1c222d8 8d1341f Author: Brad King AuthorDate: Wed Nov 1 08:07:25 2017 -0400 Commit: Brad King CommitDate: Wed Nov 1 08:07:25 2017 -0400 Merge branch 'release-3.10' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c222d85447d6f237c39d7fc3d4d970ea4fa44f1 commit 1c222d85447d6f237c39d7fc3d4d970ea4fa44f1 Merge: 77e758a c693db0 Author: Brad King AuthorDate: Wed Nov 1 08:07:18 2017 -0400 Commit: Brad King CommitDate: Wed Nov 1 08:07:18 2017 -0400 Merge branch 'release-3.9' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c693db0f62f1a8246458140418398bf76c02e7c4 commit c693db0f62f1a8246458140418398bf76c02e7c4 Merge: ddeabf0 978c98b Author: Brad King AuthorDate: Tue Oct 31 11:48:02 2017 -0400 Commit: Brad King CommitDate: Wed Nov 1 08:06:42 2017 -0400 Merge branch 'backport-3.9-autogen-moc-predefs-no-moc-options' into release-3.9 Merge-request: !1432 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=77e758a3edab6836151d5b1e690096c4f33dbd23 commit 77e758a3edab6836151d5b1e690096c4f33dbd23 Merge: cdc9c11 4e46f97 Author: Brad King AuthorDate: Wed Nov 1 12:05:43 2017 +0000 Commit: Kitware Robot CommitDate: Wed Nov 1 08:05:47 2017 -0400 Merge topic 'autogen-moc-predefs-no-moc-options' 4e46f97c Merge branch 'backport-3.9' into autogen-moc-predefs-no-moc-options 978c98b7 Autogen: Don't add AUTOMOC_MOC_OPTIONS to moc-predefs command d3caf941 Autogen: Tests: Set AUTOMOC_MOC_OPTIONS in a simple test 96d20a4d Autogen: Don't use AUTOMOC_MOC_OPTIONS in moc-predefs command Acked-by: Kitware Robot Acked-by: EoD Merge-request: !1432 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4e46f97c84431e860aab3da78495b6c0e8c37725 commit 4e46f97c84431e860aab3da78495b6c0e8c37725 Merge: d3caf94 978c98b Author: Brad King AuthorDate: Wed Nov 1 08:03:55 2017 -0400 Commit: Brad King CommitDate: Wed Nov 1 08:03:55 2017 -0400 Merge branch 'backport-3.9' into autogen-moc-predefs-no-moc-options https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=978c98b7bda6286d153c7b942509a92b66cb8fbc commit 978c98b7bda6286d153c7b942509a92b66cb8fbc Author: Sebastian Holtermann AuthorDate: Tue Oct 31 16:27:38 2017 +0100 Commit: Brad King CommitDate: Tue Oct 31 11:46:15 2017 -0400 Autogen: Don't add AUTOMOC_MOC_OPTIONS to moc-predefs command Issue: #17418 diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index d12d96d..c3ecb51 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -1268,9 +1268,6 @@ bool cmQtAutoGenerators::MocGenerateAll( it != this->MocDefinitions.end(); ++it) { cmd.push_back("-D" + (*it)); } - // Add options - cmd.insert(cmd.end(), this->MocOptions.begin(), - this->MocOptions.end()); // Execute command if (!this->RunCommand(cmd, output, false)) { { ----------------------------------------------------------------------- Summary of changes: Source/cmQtAutoGenerators.cxx | 10 +++++++--- Tests/QtAutogen/CMakeLists.txt | 5 +++++ 2 files changed, 12 insertions(+), 3 deletions(-) hooks/post-receive -- CMake From kwrobot at kitware.com Wed Nov 1 08:15:05 2017 From: kwrobot at kitware.com (Kitware Robot) Date: Wed, 1 Nov 2017 08:15:05 -0400 (EDT) Subject: [Cmake-commits] CMake branch, release, updated. v3.10.0-rc3-36-g8d1341f Message-ID: <20171101121505.0DD1AFC7DC@public.kitware.com> 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 8d1341f4ff8b8e61fc1b162c90cf5170ec57ac6f (commit) via f86879a04c4bc940b419a7944077f4b8f1e59e29 (commit) via 1df31aa92a398e0ef02e1ccccd41969a63bad29e (commit) via d3caf941e4940bb133088bea4c790a90e749f8b8 (commit) via 96d20a4de3420fca0e25a67c24e6f7eaead4420d (commit) from f49b6871e9f6de4948e8aa34446a1c933ca97935 (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/Clang-C.cmake | 2 +- Source/cmQtAutoGenerators.cxx | 10 +++++++--- Tests/QtAutogen/CMakeLists.txt | 5 +++++ 3 files changed, 13 insertions(+), 4 deletions(-) hooks/post-receive -- CMake From kwrobot at kitware.com Wed Nov 1 09:35:04 2017 From: kwrobot at kitware.com (Kitware Robot) Date: Wed, 1 Nov 2017 09:35:04 -0400 (EDT) Subject: [Cmake-commits] CMake branch, master, updated. v3.10.0-rc3-230-g9d742de Message-ID: <20171101133504.8CFD2FE8A3@public.kitware.com> 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 9d742defd925e63eefe37e22f61c22bdec49c044 (commit) via 45da558742bad36be518e8d95dee0d0ec3793a64 (commit) from a57bad6c3d0dbc885bb71dfe465d09a380c35960 (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=9d742defd925e63eefe37e22f61c22bdec49c044 commit 9d742defd925e63eefe37e22f61c22bdec49c044 Merge: a57bad6 45da558 Author: Brad King AuthorDate: Wed Nov 1 09:20:33 2017 -0400 Commit: Brad King CommitDate: Wed Nov 1 09:20:33 2017 -0400 Merge branch 'release-3.10' ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake From kwrobot at kitware.com Wed Nov 1 09:35:04 2017 From: kwrobot at kitware.com (Kitware Robot) Date: Wed, 1 Nov 2017 09:35:04 -0400 (EDT) Subject: [Cmake-commits] CMake branch, release, updated. v3.10.0-rc3-37-g45da558 Message-ID: <20171101133504.AE020FE8B9@public.kitware.com> 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 45da558742bad36be518e8d95dee0d0ec3793a64 (commit) from 8d1341f4ff8b8e61fc1b162c90cf5170ec57ac6f (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: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From kwrobot at kitware.com Wed Nov 1 10:15:03 2017 From: kwrobot at kitware.com (Kitware Robot) Date: Wed, 1 Nov 2017 10:15:03 -0400 (EDT) Subject: [Cmake-commits] CMake annotated tag, v3.10.0-rc4, created. v3.10.0-rc4 Message-ID: <20171101141503.26EA0FCC2A@public.kitware.com> 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 annotated tag, v3.10.0-rc4 has been created at 27558d02eb28abf7504e5eabfb2dd5d8afa7749a (tag) tagging 45da558742bad36be518e8d95dee0d0ec3793a64 (commit) replaces v3.10.0-rc3 tagged by Brad King on Wed Nov 1 09:25:35 2017 -0400 - Log ----------------------------------------------------------------- CMake 3.10.0-rc4 -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAln5y08WHGJyYWQua2lu Z0BraXR3YXJlLmNvbQAKCRAtLO8QNJIWhG9EEACEQDI4dAHahGOwPjlQUIWEK/zQ rSbdS1Q4rAMFNR2tiR269gMePihLkogJeJDOEHaWlgSQz5YhOkMbUsWsZhrWiAeK CSFjy50uaQB9k3yI/iSjDwtI6EmrHVJI4j5UhVph/RR80dHwSN5ZpyG80YzoLyQ8 6IhjrQce0J/gFJLk2GOe4HajAp1xVtz3TmesOI1VMU8ph1oxsJ1MgaCIDLA2QA6R F8N6+1Pi6miUd02n5U5h3ygxJfM+p0g/RPn3vGqDH7r+gmNoPXJU//Jqw9NltoOo 5bHOpC3ETsz0O62wj+p0F2pE8aLlDfwRTgD0EvX0gClxXYR69OjfGaBlavapunqU +wKANgTBGt03ANha+Q409NKE6Kh6gKxaeDXnYyT+tvVDt6JL8Qh3yqeWesAtDiSb 7sq/tXu5DeOoa9c+EqaMaWn1XBBN2cm39B92ODyVmZKIEbqMxSLhaa34dPzQnyVf qRl40BzUn63AX6QA6EPKvo1T24of1vDxwrdkReb3aZn/aaOxIZ4mpw7XL0kIWLp3 Fy3+C+8kvFUMld8stT0AnKWj/i3nJQHC6gDhQimM/8N6yM3EMT3lT8AKr3HtnIhR fazX+VnqsPk45uAljviE+Km05dbur290WxQMJ2Das2VBorVrXgkOQoylFI7VWSvP DbI+IpcCmCcPmRyzVQ== =YsfA -----END PGP SIGNATURE----- Brad King (23): Merge branch 'flang-remove-boundscheck' into release-3.10 Merge branch 'doc-cxx-std-msvc' into release-3.10 Merge branch 'gnuid-cmp54-fix' into release-3.10 Merge branch 'help_parse_arguments' into release-3.10 Merge branch 'FindOpenCL-more-versions' into release-3.10 Merge branch 'findmpi-core-count' into release-3.10 Merge branch 'omp-oacc-werror-return-type' into release-3.10 Clang: Use -TP flag for C++ sources with clang-cl Merge branch 'clang-cl-TP' into release-3.10 CMP0040: Clarify policy warning to match documentation Merge branch 'cmp0040-wording' into release-3.10 cmcmd: Rename loop iteration variable for clarity cmcmd: Convert lint handlers to file-static functions cmcmd: Restore support for running multiple lint tools Merge branch 'autogen-static-library-cycles' into release-3.10 Merge branch 'backport-fix-co-compile' into release-3.10 Merge branch 'cpack-rpm-dist-test-fix' into release-3.10 Merge branch 'autogen-qrc-file-name' into release-3.10 Merge branch 'autogen-change-rcc-config-suffix' into release-3.10 Merge branch 'autogen-moc-predefs-no-moc-options' into release-3.10 Record C compile features flags for MinGW Clang on Windows Merge branch 'mingw-clang-c-compile-features' into release-3.10 CMake 3.10.0-rc4 Christian Pfeiffer (5): Flang: Remove unsupported fbounds-check flag Help: Correct _STANDARD help w.r.t. MSVC GNUInstallDirs: Enable CMP0054 FindMPI: Use physical cores for MPIEXEC_MAX_NUMPROCS Find{OpenMP,OpenACC}: Fix detection with -Werror=return-type Domen Vrankar (1): CPack/RPM: DIST-MONOLITHIC-type subtest fix Henry Schreiner (1): FindOpenCL: Add detection of OpenCL 2.1 and 2.2 Sebastian Holtermann (6): Autogen: Don't add STATIC_LIBRARY cycle targets to the _autogen dependencies Autogen: Tests: Add test for STATIC_LIBRARY cycles Autogen: RCC: Append checksum suffix to wrapped file name Autogen: Make rcc output file suffix static (instead of pseudo-random) Autogen: Don't use AUTOMOC_MOC_OPTIONS in moc-predefs command Autogen: Tests: Set AUTOMOC_MOC_OPTIONS in a simple test Sylvain Joubert (1): Help: Fix cmake_parse_arguments behavior for not found arguments ----------------------------------------------------------------------- hooks/post-receive -- CMake From kwrobot at kitware.com Thu Nov 2 00:05:05 2017 From: kwrobot at kitware.com (Kitware Robot) Date: Thu, 2 Nov 2017 00:05:05 -0400 (EDT) Subject: [Cmake-commits] CMake branch, master, updated. v3.10.0-rc4-194-gd455a04 Message-ID: <20171102040506.66547FE35E@public.kitware.com> 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 d455a04c53be4e52313185c7322fc9073dc2437f (commit) from 9d742defd925e63eefe37e22f61c22bdec49c044 (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=d455a04c53be4e52313185c7322fc9073dc2437f commit d455a04c53be4e52313185c7322fc9073dc2437f Author: Kitware Robot AuthorDate: Thu Nov 2 00:01:06 2017 -0400 Commit: Kitware Robot CommitDate: Thu Nov 2 00:01:06 2017 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 0ecbd07..e730358 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 10) -set(CMake_VERSION_PATCH 20171101) +set(CMake_VERSION_PATCH 20171102) #set(CMake_VERSION_RC 1) ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From kwrobot at kitware.com Thu Nov 2 09:45:26 2017 From: kwrobot at kitware.com (Kitware Robot) Date: Thu, 2 Nov 2017 09:45:26 -0400 (EDT) Subject: [Cmake-commits] CMake branch, master, updated. v3.10.0-rc4-201-g817331a Message-ID: <20171102134526.BA729FCD60@public.kitware.com> 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 817331aae8c9f166baa7ada5e015dcb5442c0038 (commit) via 193e40daa5012b13b8de6202a89c24257be327fa (commit) via fdd1e18759070d27e85f1792d85a3aebc71c2f5a (commit) via a0ec14d36361567e374672e0d115e584548702b8 (commit) via 8eb39bf24c9394efe78c6346e6e3f2244254ac97 (commit) via 7576e9f8a30bb50a3157fe5e3ec493be8a9299bc (commit) via 7d3f33e6129232a6814af47a19a72fd500414508 (commit) from d455a04c53be4e52313185c7322fc9073dc2437f (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=817331aae8c9f166baa7ada5e015dcb5442c0038 commit 817331aae8c9f166baa7ada5e015dcb5442c0038 Merge: 193e40d a0ec14d Author: Brad King AuthorDate: Thu Nov 2 13:44:25 2017 +0000 Commit: Kitware Robot CommitDate: Thu Nov 2 09:44:41 2017 -0400 Merge topic 'deprecate-policy-old' a0ec14d3 Add deprecation warnings for policies CMP0054 and below Acked-by: Kitware Robot Reviewed-by: Ben Boeckel Merge-request: !1438 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=193e40daa5012b13b8de6202a89c24257be327fa commit 193e40daa5012b13b8de6202a89c24257be327fa Merge: fdd1e18 7576e9f Author: Brad King AuthorDate: Thu Nov 2 13:42:39 2017 +0000 Commit: Kitware Robot CommitDate: Thu Nov 2 09:43:48 2017 -0400 Merge topic 'update-kwsys' 7576e9f8 Merge branch 'upstream-KWSys' into update-kwsys 7d3f33e6 KWSys 2017-11-01 (6ffca34c) Acked-by: Kitware Robot Merge-request: !1436 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fdd1e18759070d27e85f1792d85a3aebc71c2f5a commit fdd1e18759070d27e85f1792d85a3aebc71c2f5a Merge: d455a04 8eb39bf Author: Brad King AuthorDate: Thu Nov 2 13:42:16 2017 +0000 Commit: Kitware Robot CommitDate: Thu Nov 2 09:42:47 2017 -0400 Merge topic 'doc-cmp0037-update' 8eb39bf2 Help: Document CMP0037 relaxation of test and package targets Acked-by: Kitware Robot Merge-request: !1437 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a0ec14d36361567e374672e0d115e584548702b8 commit a0ec14d36361567e374672e0d115e584548702b8 Author: Brad King AuthorDate: Wed Nov 1 10:43:25 2017 -0400 Commit: Brad King CommitDate: Wed Nov 1 11:46:53 2017 -0400 Add deprecation warnings for policies CMP0054 and below The OLD behaviors of all policies are deprecated, but only by documentation. Add an explicit deprecation diagnostic for some policies to encourage projects to port away from setting policies to OLD. diff --git a/Help/release/dev/deprecate-policy-old.rst b/Help/release/dev/deprecate-policy-old.rst new file mode 100644 index 0000000..bcfa70a --- /dev/null +++ b/Help/release/dev/deprecate-policy-old.rst @@ -0,0 +1,8 @@ +deprecate-policy-old +-------------------- + +* An explicit deprecation diagnostic was added for policies ``CMP0037`` + through ``CMP0054`` (``CMP0036`` and below were already deprecated). + The :manual:`cmake-policies(7)` manual explains that the OLD behaviors + of all policies are deprecated and that projects should port to the + NEW behaviors. diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 43c529c..9c8dae3 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -4018,7 +4018,7 @@ bool cmMakefile::SetPolicy(cmPolicies::PolicyID id, // Deprecate old policies, especially those that require a lot // of code to maintain the old behavior. - if (status == cmPolicies::OLD && id <= cmPolicies::CMP0036) { + if (status == cmPolicies::OLD && id <= cmPolicies::CMP0054) { this->IssueMessage(cmake::DEPRECATION_WARNING, cmPolicies::GetPolicyDeprecatedWarning(id)); } diff --git a/Tests/RunCMake/CMP0037/CMP0037-OLD-reserved-result.txt b/Tests/RunCMake/CMP0037/CMP0037-OLD-reserved-result.txt deleted file mode 100644 index 573541a..0000000 --- a/Tests/RunCMake/CMP0037/CMP0037-OLD-reserved-result.txt +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/Tests/RunCMake/CMP0037/CMP0037-OLD-reserved-stderr.txt b/Tests/RunCMake/CMP0037/CMP0037-OLD-reserved-stderr.txt new file mode 100644 index 0000000..de09351 --- /dev/null +++ b/Tests/RunCMake/CMP0037/CMP0037-OLD-reserved-stderr.txt @@ -0,0 +1,10 @@ +^CMake Deprecation Warning at CMP0037-OLD-reserved.cmake:2 $cmake_policy$: + The OLD behavior for policy CMP0037 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$$ diff --git a/Tests/RunCMake/CMP0037/CMP0037-OLD-space-result.txt b/Tests/RunCMake/CMP0037/CMP0037-OLD-space-result.txt deleted file mode 100644 index 573541a..0000000 --- a/Tests/RunCMake/CMP0037/CMP0037-OLD-space-result.txt +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/Tests/RunCMake/CMP0037/CMP0037-OLD-space-stderr.txt b/Tests/RunCMake/CMP0037/CMP0037-OLD-space-stderr.txt new file mode 100644 index 0000000..4d13e59 --- /dev/null +++ b/Tests/RunCMake/CMP0037/CMP0037-OLD-space-stderr.txt @@ -0,0 +1,10 @@ +^CMake Deprecation Warning at CMP0037-OLD-space.cmake:2 $cmake_policy$: + The OLD behavior for policy CMP0037 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$$ diff --git a/Tests/RunCMake/CMP0037/OLD-cond-package-stderr.txt b/Tests/RunCMake/CMP0037/OLD-cond-package-stderr.txt new file mode 100644 index 0000000..5a29a49 --- /dev/null +++ b/Tests/RunCMake/CMP0037/OLD-cond-package-stderr.txt @@ -0,0 +1,10 @@ +^CMake Deprecation Warning at OLD-cond-package.cmake:1 $cmake_policy$: + The OLD behavior for policy CMP0037 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$$ diff --git a/Tests/RunCMake/CMP0037/OLD-cond-package_source-stderr.txt b/Tests/RunCMake/CMP0037/OLD-cond-package_source-stderr.txt new file mode 100644 index 0000000..5f72e16 --- /dev/null +++ b/Tests/RunCMake/CMP0037/OLD-cond-package_source-stderr.txt @@ -0,0 +1,10 @@ +^CMake Deprecation Warning at OLD-cond-package_source.cmake:1 $cmake_policy$: + The OLD behavior for policy CMP0037 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$$ diff --git a/Tests/RunCMake/CMP0037/OLD-cond-stderr.txt b/Tests/RunCMake/CMP0037/OLD-cond-stderr.txt new file mode 100644 index 0000000..94e4575 --- /dev/null +++ b/Tests/RunCMake/CMP0037/OLD-cond-stderr.txt @@ -0,0 +1,10 @@ +^CMake Deprecation Warning at OLD-cond.cmake:1 $cmake_policy$: + The OLD behavior for policy CMP0037 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$$ diff --git a/Tests/RunCMake/CMP0037/OLD-cond-test-stderr.txt b/Tests/RunCMake/CMP0037/OLD-cond-test-stderr.txt new file mode 100644 index 0000000..81e10ce --- /dev/null +++ b/Tests/RunCMake/CMP0037/OLD-cond-test-stderr.txt @@ -0,0 +1,10 @@ +^CMake Deprecation Warning at OLD-cond-test.cmake:1 $cmake_policy$: + The OLD behavior for policy CMP0037 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$$ diff --git a/Tests/RunCMake/CMP0038/CMP0038-OLD-result.txt b/Tests/RunCMake/CMP0038/CMP0038-OLD-result.txt deleted file mode 100644 index 573541a..0000000 --- a/Tests/RunCMake/CMP0038/CMP0038-OLD-result.txt +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/Tests/RunCMake/CMP0038/CMP0038-OLD-stderr.txt b/Tests/RunCMake/CMP0038/CMP0038-OLD-stderr.txt new file mode 100644 index 0000000..c754128 --- /dev/null +++ b/Tests/RunCMake/CMP0038/CMP0038-OLD-stderr.txt @@ -0,0 +1,10 @@ +^CMake Deprecation Warning at CMP0038-OLD.cmake:2 $cmake_policy$: + The OLD behavior for policy CMP0038 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$$ diff --git a/Tests/RunCMake/CMP0039/CMP0039-OLD-result.txt b/Tests/RunCMake/CMP0039/CMP0039-OLD-result.txt deleted file mode 100644 index 573541a..0000000 --- a/Tests/RunCMake/CMP0039/CMP0039-OLD-result.txt +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/Tests/RunCMake/CMP0039/CMP0039-OLD-stderr.txt b/Tests/RunCMake/CMP0039/CMP0039-OLD-stderr.txt new file mode 100644 index 0000000..d7863fd --- /dev/null +++ b/Tests/RunCMake/CMP0039/CMP0039-OLD-stderr.txt @@ -0,0 +1,10 @@ +^CMake Deprecation Warning at CMP0039-OLD.cmake:2 $cmake_policy$: + The OLD behavior for policy CMP0039 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$$ diff --git a/Tests/RunCMake/CMP0040/CMP0040-OLD-existing-target-result.txt b/Tests/RunCMake/CMP0040/CMP0040-OLD-existing-target-result.txt deleted file mode 100644 index 573541a..0000000 --- a/Tests/RunCMake/CMP0040/CMP0040-OLD-existing-target-result.txt +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/Tests/RunCMake/CMP0040/CMP0040-OLD-existing-target-stderr.txt b/Tests/RunCMake/CMP0040/CMP0040-OLD-existing-target-stderr.txt new file mode 100644 index 0000000..f38c03d --- /dev/null +++ b/Tests/RunCMake/CMP0040/CMP0040-OLD-existing-target-stderr.txt @@ -0,0 +1,10 @@ +^CMake Deprecation Warning at CMP0040-OLD-existing-target.cmake:1 $cmake_policy$: + The OLD behavior for policy CMP0040 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$$ diff --git a/Tests/RunCMake/CMP0040/CMP0040-OLD-missing-target-result.txt b/Tests/RunCMake/CMP0040/CMP0040-OLD-missing-target-result.txt deleted file mode 100644 index 573541a..0000000 --- a/Tests/RunCMake/CMP0040/CMP0040-OLD-missing-target-result.txt +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/Tests/RunCMake/CMP0040/CMP0040-OLD-missing-target-stderr.txt b/Tests/RunCMake/CMP0040/CMP0040-OLD-missing-target-stderr.txt new file mode 100644 index 0000000..61f4f03 --- /dev/null +++ b/Tests/RunCMake/CMP0040/CMP0040-OLD-missing-target-stderr.txt @@ -0,0 +1,10 @@ +^CMake Deprecation Warning at CMP0040-OLD-missing-target.cmake:1 $cmake_policy$: + The OLD behavior for policy CMP0040 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$$ diff --git a/Tests/RunCMake/CMP0041/CMP0041-OLD-result.txt b/Tests/RunCMake/CMP0041/CMP0041-OLD-result.txt deleted file mode 100644 index 573541a..0000000 --- a/Tests/RunCMake/CMP0041/CMP0041-OLD-result.txt +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/Tests/RunCMake/CMP0041/CMP0041-OLD-stderr.txt b/Tests/RunCMake/CMP0041/CMP0041-OLD-stderr.txt new file mode 100644 index 0000000..1b736da --- /dev/null +++ b/Tests/RunCMake/CMP0041/CMP0041-OLD-stderr.txt @@ -0,0 +1,10 @@ +^CMake Deprecation Warning at CMP0041-OLD.cmake:2 $cmake_policy$: + The OLD behavior for policy CMP0041 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$$ diff --git a/Tests/RunCMake/CMP0041/CMP0041-tid-OLD-result.txt b/Tests/RunCMake/CMP0041/CMP0041-tid-OLD-result.txt deleted file mode 100644 index 573541a..0000000 --- a/Tests/RunCMake/CMP0041/CMP0041-tid-OLD-result.txt +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/Tests/RunCMake/CMP0041/CMP0041-tid-OLD-stderr.txt b/Tests/RunCMake/CMP0041/CMP0041-tid-OLD-stderr.txt new file mode 100644 index 0000000..dbc5167 --- /dev/null +++ b/Tests/RunCMake/CMP0041/CMP0041-tid-OLD-stderr.txt @@ -0,0 +1,10 @@ +^CMake Deprecation Warning at CMP0041-tid-OLD.cmake:2 $cmake_policy$: + The OLD behavior for policy CMP0041 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$$ diff --git a/Tests/RunCMake/CMP0042/CMP0042-OLD-result.txt b/Tests/RunCMake/CMP0042/CMP0042-OLD-result.txt deleted file mode 100644 index 573541a..0000000 --- a/Tests/RunCMake/CMP0042/CMP0042-OLD-result.txt +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/Tests/RunCMake/CMP0042/CMP0042-OLD-stderr.txt b/Tests/RunCMake/CMP0042/CMP0042-OLD-stderr.txt new file mode 100644 index 0000000..9d1488d --- /dev/null +++ b/Tests/RunCMake/CMP0042/CMP0042-OLD-stderr.txt @@ -0,0 +1,10 @@ +^CMake Deprecation Warning at CMP0042-OLD.cmake:2 $cmake_policy$: + The OLD behavior for policy CMP0042 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$$ diff --git a/Tests/RunCMake/CMP0043/CMP0043-OLD-result.txt b/Tests/RunCMake/CMP0043/CMP0043-OLD-result.txt deleted file mode 100644 index 573541a..0000000 --- a/Tests/RunCMake/CMP0043/CMP0043-OLD-result.txt +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/Tests/RunCMake/CMP0043/CMP0043-OLD-stderr.txt b/Tests/RunCMake/CMP0043/CMP0043-OLD-stderr.txt new file mode 100644 index 0000000..ebbb361 --- /dev/null +++ b/Tests/RunCMake/CMP0043/CMP0043-OLD-stderr.txt @@ -0,0 +1,10 @@ +^CMake Deprecation Warning at CMP0043-OLD.cmake:2 $cmake_policy$: + The OLD behavior for policy CMP0043 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$$ diff --git a/Tests/RunCMake/CMP0045/CMP0045-OLD-result.txt b/Tests/RunCMake/CMP0045/CMP0045-OLD-result.txt deleted file mode 100644 index 573541a..0000000 --- a/Tests/RunCMake/CMP0045/CMP0045-OLD-result.txt +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/Tests/RunCMake/CMP0045/CMP0045-OLD-stderr.txt b/Tests/RunCMake/CMP0045/CMP0045-OLD-stderr.txt new file mode 100644 index 0000000..0dac20f --- /dev/null +++ b/Tests/RunCMake/CMP0045/CMP0045-OLD-stderr.txt @@ -0,0 +1,10 @@ +^CMake Deprecation Warning at CMP0045-OLD.cmake:2 $cmake_policy$: + The OLD behavior for policy CMP0045 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$$ diff --git a/Tests/RunCMake/CMP0046/CMP0046-OLD-existing-dependency-stderr.txt b/Tests/RunCMake/CMP0046/CMP0046-OLD-existing-dependency-stderr.txt new file mode 100644 index 0000000..4444118 --- /dev/null +++ b/Tests/RunCMake/CMP0046/CMP0046-OLD-existing-dependency-stderr.txt @@ -0,0 +1,10 @@ +^CMake Deprecation Warning at CMP0046-OLD-existing-dependency.cmake:1 $cmake_policy$: + The OLD behavior for policy CMP0046 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$$ diff --git a/Tests/RunCMake/CMP0046/CMP0046-OLD-missing-dependency-stderr.txt b/Tests/RunCMake/CMP0046/CMP0046-OLD-missing-dependency-stderr.txt new file mode 100644 index 0000000..525954f --- /dev/null +++ b/Tests/RunCMake/CMP0046/CMP0046-OLD-missing-dependency-stderr.txt @@ -0,0 +1,10 @@ +^CMake Deprecation Warning at CMP0046-OLD-missing-dependency.cmake:1 $cmake_policy$: + The OLD behavior for policy CMP0046 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$$ diff --git a/Tests/RunCMake/CMP0049/CMP0049-OLD-result.txt b/Tests/RunCMake/CMP0049/CMP0049-OLD-result.txt deleted file mode 100644 index 573541a..0000000 --- a/Tests/RunCMake/CMP0049/CMP0049-OLD-result.txt +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/Tests/RunCMake/CMP0049/CMP0049-OLD-stderr.txt b/Tests/RunCMake/CMP0049/CMP0049-OLD-stderr.txt new file mode 100644 index 0000000..b373970 --- /dev/null +++ b/Tests/RunCMake/CMP0049/CMP0049-OLD-stderr.txt @@ -0,0 +1,10 @@ +^CMake Deprecation Warning at CMP0049-OLD.cmake:2 $cmake_policy$: + The OLD behavior for policy CMP0049 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$$ diff --git a/Tests/RunCMake/CMP0050/CMP0050-OLD-result.txt b/Tests/RunCMake/CMP0050/CMP0050-OLD-result.txt deleted file mode 100644 index 573541a..0000000 --- a/Tests/RunCMake/CMP0050/CMP0050-OLD-result.txt +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/Tests/RunCMake/CMP0050/CMP0050-OLD-stderr.txt b/Tests/RunCMake/CMP0050/CMP0050-OLD-stderr.txt new file mode 100644 index 0000000..3e7fa97 --- /dev/null +++ b/Tests/RunCMake/CMP0050/CMP0050-OLD-stderr.txt @@ -0,0 +1,10 @@ +^CMake Deprecation Warning at CMP0050-OLD.cmake:2 $cmake_policy$: + The OLD behavior for policy CMP0050 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$$ diff --git a/Tests/RunCMake/CMP0051/CMP0051-OLD-result.txt b/Tests/RunCMake/CMP0051/CMP0051-OLD-result.txt deleted file mode 100644 index 573541a..0000000 --- a/Tests/RunCMake/CMP0051/CMP0051-OLD-result.txt +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/Tests/RunCMake/CMP0051/CMP0051-OLD-stderr.txt b/Tests/RunCMake/CMP0051/CMP0051-OLD-stderr.txt index cc17f33..697265e 100644 --- a/Tests/RunCMake/CMP0051/CMP0051-OLD-stderr.txt +++ b/Tests/RunCMake/CMP0051/CMP0051-OLD-stderr.txt @@ -1 +1,12 @@ -^Sources: "empty.cpp"$ +^CMake Deprecation Warning at CMP0051-OLD.cmake:2 $cmake_policy$: + The OLD behavior for policy CMP0051 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$ ++ +Sources: "empty.cpp"$ diff --git a/Tests/RunCMake/CMP0053/CMP0053-OLD-stderr.txt b/Tests/RunCMake/CMP0053/CMP0053-OLD-stderr.txt index 836b0ff..2a0ddba 100644 --- a/Tests/RunCMake/CMP0053/CMP0053-OLD-stderr.txt +++ b/Tests/RunCMake/CMP0053/CMP0053-OLD-stderr.txt @@ -1,2 +1,13 @@ -^called +^CMake Deprecation Warning at CMP0053-OLD.cmake:1 $cmake_policy$: + The OLD behavior for policy CMP0053 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$ ++ +called --><--$ diff --git a/Tests/RunCMake/CMP0054/CMP0054-OLD-stderr.txt b/Tests/RunCMake/CMP0054/CMP0054-OLD-stderr.txt index f5a8fbe..0500280 100644 --- a/Tests/RunCMake/CMP0054/CMP0054-OLD-stderr.txt +++ b/Tests/RunCMake/CMP0054/CMP0054-OLD-stderr.txt @@ -1 +1,10 @@ -$^ +^CMake Deprecation Warning at CMP0054-OLD.cmake:1 $cmake_policy$: + The OLD behavior for policy CMP0054 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$$ diff --git a/Tests/RunCMake/CMP0054/CMP0054-keywords-OLD-stderr.txt b/Tests/RunCMake/CMP0054/CMP0054-keywords-OLD-stderr.txt index f5a8fbe..60303cd 100644 --- a/Tests/RunCMake/CMP0054/CMP0054-keywords-OLD-stderr.txt +++ b/Tests/RunCMake/CMP0054/CMP0054-keywords-OLD-stderr.txt @@ -1 +1,10 @@ -$^ +^CMake Deprecation Warning at CMP0054-keywords-OLD.cmake:1 $cmake_policy$: + The OLD behavior for policy CMP0054 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$$ diff --git a/Tests/RunCMake/CMP0054/CMP0054-policy-command-scope-stderr.txt b/Tests/RunCMake/CMP0054/CMP0054-policy-command-scope-stderr.txt index f5a8fbe..1b35472 100644 --- a/Tests/RunCMake/CMP0054/CMP0054-policy-command-scope-stderr.txt +++ b/Tests/RunCMake/CMP0054/CMP0054-policy-command-scope-stderr.txt @@ -1 +1,10 @@ -$^ +^CMake Deprecation Warning at CMP0054-policy-command-scope.cmake:25 $cmake_policy$: + The OLD behavior for policy CMP0054 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$$ diff --git a/Tests/RunCMake/CMP0054/CMP0054-policy-foreach-scope-stderr.txt b/Tests/RunCMake/CMP0054/CMP0054-policy-foreach-scope-stderr.txt index f5a8fbe..4eac90e 100644 --- a/Tests/RunCMake/CMP0054/CMP0054-policy-foreach-scope-stderr.txt +++ b/Tests/RunCMake/CMP0054/CMP0054-policy-foreach-scope-stderr.txt @@ -1 +1,54 @@ -$^ +^CMake Deprecation Warning at CMP0054-policy-foreach-scope.cmake:14 $cmake_policy$: + The OLD behavior for policy CMP0054 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$ ++ +CMake Deprecation Warning at CMP0054-policy-foreach-scope.cmake:14 $cmake_policy$: + The OLD behavior for policy CMP0054 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$ ++ +CMake Deprecation Warning at CMP0054-policy-foreach-scope.cmake:27 $cmake_policy$: + The OLD behavior for policy CMP0054 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$ ++ +CMake Deprecation Warning at CMP0054-policy-foreach-scope.cmake:48 $cmake_policy$: + The OLD behavior for policy CMP0054 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$ ++ +CMake Deprecation Warning at CMP0054-policy-foreach-scope.cmake:48 $cmake_policy$: + The OLD behavior for policy CMP0054 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$$ diff --git a/Tests/RunCMake/CMP0054/CMP0054-policy-nested-if-stderr.txt b/Tests/RunCMake/CMP0054/CMP0054-policy-nested-if-stderr.txt index f5a8fbe..a2dd62e 100644 --- a/Tests/RunCMake/CMP0054/CMP0054-policy-nested-if-stderr.txt +++ b/Tests/RunCMake/CMP0054/CMP0054-policy-nested-if-stderr.txt @@ -1 +1,10 @@ -$^ +^CMake Deprecation Warning at CMP0054-policy-nested-if.cmake:23 $cmake_policy$: + The OLD behavior for policy CMP0054 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$$ diff --git a/Tests/RunCMake/CMP0054/CMP0054-policy-while-scope-stderr.txt b/Tests/RunCMake/CMP0054/CMP0054-policy-while-scope-stderr.txt index f5a8fbe..718904d 100644 --- a/Tests/RunCMake/CMP0054/CMP0054-policy-while-scope-stderr.txt +++ b/Tests/RunCMake/CMP0054/CMP0054-policy-while-scope-stderr.txt @@ -1 +1,54 @@ -$^ +^CMake Deprecation Warning at CMP0054-policy-while-scope.cmake:16 $cmake_policy$: + The OLD behavior for policy CMP0054 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$ ++ +CMake Deprecation Warning at CMP0054-policy-while-scope.cmake:16 $cmake_policy$: + The OLD behavior for policy CMP0054 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$ ++ +CMake Deprecation Warning at CMP0054-policy-while-scope.cmake:37 $cmake_policy$: + The OLD behavior for policy CMP0054 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$ ++ +CMake Deprecation Warning at CMP0054-policy-while-scope.cmake:58 $cmake_policy$: + The OLD behavior for policy CMP0054 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$ ++ +CMake Deprecation Warning at CMP0054-policy-while-scope.cmake:58 $cmake_policy$: + The OLD behavior for policy CMP0054 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$$ diff --git a/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-OLD-stderr.txt b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-OLD-stderr.txt new file mode 100644 index 0000000..37747a1 --- /dev/null +++ b/Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-OLD-stderr.txt @@ -0,0 +1,8 @@ +^CMake Deprecation Warning at CMakeLists.txt:1 $cmake_minimum_required$: + The OLD behavior for policy CMP0052 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD.$ diff --git a/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-OLD-stderr.txt b/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-OLD-stderr.txt new file mode 100644 index 0000000..37747a1 --- /dev/null +++ b/Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-OLD-stderr.txt @@ -0,0 +1,8 @@ +^CMake Deprecation Warning at CMakeLists.txt:1 $cmake_minimum_required$: + The OLD behavior for policy CMP0052 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD.$ diff --git a/Tests/RunCMake/Syntax/CMP0053-At-OLD-stderr.txt b/Tests/RunCMake/Syntax/CMP0053-At-OLD-stderr.txt index acfa30a..0dde1bc 100644 --- a/Tests/RunCMake/Syntax/CMP0053-At-OLD-stderr.txt +++ b/Tests/RunCMake/Syntax/CMP0053-At-OLD-stderr.txt @@ -1 +1,12 @@ -^-->wrong<--$ +^CMake Deprecation Warning at CMP0053-At-OLD.cmake:1 $cmake_policy$: + The OLD behavior for policy CMP0053 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$ ++ +-->wrong<--$ diff --git a/Tests/RunCMake/project/CMP0048-OLD-stderr.txt b/Tests/RunCMake/project/CMP0048-OLD-stderr.txt new file mode 100644 index 0000000..1fa70f8 --- /dev/null +++ b/Tests/RunCMake/project/CMP0048-OLD-stderr.txt @@ -0,0 +1,10 @@ +^CMake Deprecation Warning at CMP0048-OLD.cmake:1 $cmake_policy$: + The OLD behavior for policy CMP0048 will be removed from a future version + of CMake. + + The cmake-policies$7$ manual explains that the OLD behaviors of all + policies are deprecated and that a policy should be set to OLD only under + specific short-term circumstances. Projects should be ported to the NEW + behavior and not rely on setting a policy to OLD. +Call Stack $most recent call first$: + CMakeLists.txt:3 $include$$ https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8eb39bf24c9394efe78c6346e6e3f2244254ac97 commit 8eb39bf24c9394efe78c6346e6e3f2244254ac97 Author: Brad King AuthorDate: Wed Nov 1 10:34:42 2017 -0400 Commit: Brad King CommitDate: Wed Nov 1 10:36:21 2017 -0400 Help: Document CMP0037 relaxation of test and package targets Update documentation to account for commit ae5f40696e (CMP0037: Allow test and package targets when features are not enabled, 2017-10-26). Issue: #16062 diff --git a/Help/policy/CMP0037.rst b/Help/policy/CMP0037.rst index 9f8457c..8041960 100644 --- a/Help/policy/CMP0037.rst +++ b/Help/policy/CMP0037.rst @@ -14,7 +14,12 @@ character (_), dot(.), plus(+) and minus(-). As a special case, ALIAS targets and IMPORTED targets may contain two consequtive colons. Target names reserved by one or more CMake generators are not allowed. -Among others these include "all", "help" and "test". +Among others these include "all", "clean", "help", and "install". + +Target names associated with optional features, such as "test" and "package", +may also be reserved. CMake 3.10 and below always reserve them. CMake 3.11 +and above reserve them only when the corresponding feature is enabled +(e.g. by including the :module:`CTest` or :module:`CPack` modules). The OLD behavior for this policy is to allow creating targets with reserved names or which do not match the validity pattern. https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7576e9f8a30bb50a3157fe5e3ec493be8a9299bc commit 7576e9f8a30bb50a3157fe5e3ec493be8a9299bc Merge: a57bad6 7d3f33e Author: Brad King AuthorDate: Wed Nov 1 08:38:26 2017 -0400 Commit: Brad King CommitDate: Wed Nov 1 08:38:26 2017 -0400 Merge branch 'upstream-KWSys' into update-kwsys * upstream-KWSys: KWSys 2017-11-01 (6ffca34c) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7d3f33e6129232a6814af47a19a72fd500414508 commit 7d3f33e6129232a6814af47a19a72fd500414508 Author: KWSys Upstream AuthorDate: Wed Nov 1 07:44:18 2017 -0400 Commit: Brad King CommitDate: Wed Nov 1 08:38:25 2017 -0400 KWSys 2017-11-01 (6ffca34c) Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 6ffca34c008f0aac44db0e0c2826673a0e3f6ecf (master). Upstream Shortlog ----------------- Brad King (2): 7a4cca11 Process: Refactor test compile flag addition 90886a99 Process: Fix tests under ubsan Bradley Lowekamp (1): b4507c9c Remove dead code from Configure.h.in Domen Vrankar (1): 9e0b4d1a SystemTools: set default MakeDirectory permissions mode diff --git a/CMakeLists.txt b/CMakeLists.txt index f36f9b6..e4406e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1147,17 +1147,22 @@ IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR) SET_TESTS_PROPERTIES(kwsys.testProcess-${n} PROPERTIES TIMEOUT 120) ENDFOREACH() + SET(testProcess_COMPILE_FLAGS "") # Some Apple compilers produce bad optimizations in this source. IF(APPLE AND CMAKE_C_COMPILER_ID MATCHES "^(GNU|LLVM)$") - SET_SOURCE_FILES_PROPERTIES(testProcess.c PROPERTIES COMPILE_FLAGS -O0) + STRING(APPEND testProcess_COMPILE_FLAGS " -O0") ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "XL" AND NOT (CMAKE_SYSTEM MATCHES "Linux.*ppc64le" AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS "13.1.1")) # Tell IBM XL not to warn about our test infinite loop # v13.1.1 and newer on Linux ppc64le is clang based and does not accept # the -qsuppress option - SET_PROPERTY(SOURCE testProcess.c PROPERTY COMPILE_FLAGS -qsuppress=1500-010) + STRING(APPEND testProcess_COMPILE_FLAGS " -qsuppress=1500-010") ENDIF() + IF(CMAKE_C_FLAGS MATCHES "-fsanitize=") + STRING(APPEND testProcess_COMPILE_FLAGS " -DCRASH_USING_ABORT") + ENDIF() + SET_PROPERTY(SOURCE testProcess.c PROPERTY COMPILE_FLAGS "${testProcess_COMPILE_FLAGS}") # Test SharedForward CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/testSharedForward.c.in diff --git a/Configure.h.in b/Configure.h.in index 0afcae7..224047a 100644 --- a/Configure.h.in +++ b/Configure.h.in @@ -62,9 +62,6 @@ !defined(@KWSYS_NAMESPACE at _LFS_NO_DEFINE_FILE_OFFSET_BITS) #define _FILE_OFFSET_BITS 64 #endif -#if 0 && (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS < 64) -#error "_FILE_OFFSET_BITS must be defined to at least 64" -#endif #endif #endif diff --git a/SystemTools.cxx b/SystemTools.cxx index a24a326..72babc3 100644 --- a/SystemTools.cxx +++ b/SystemTools.cxx @@ -751,15 +751,15 @@ FILE* SystemTools::Fopen(const std::string& file, const char* mode) #endif } -bool SystemTools::MakeDirectory(const char* path) +bool SystemTools::MakeDirectory(const char* path, const mode_t* mode) { if (!path) { return false; } - return SystemTools::MakeDirectory(std::string(path)); + return SystemTools::MakeDirectory(std::string(path), mode); } -bool SystemTools::MakeDirectory(const std::string& path) +bool SystemTools::MakeDirectory(const std::string& path, const mode_t* mode) { if (SystemTools::PathExists(path)) { return SystemTools::FileIsDirectory(path); @@ -774,8 +774,12 @@ bool SystemTools::MakeDirectory(const std::string& path) std::string topdir; while ((pos = dir.find('/', pos)) != std::string::npos) { topdir = dir.substr(0, pos); - Mkdir(topdir); - pos++; + + if (Mkdir(topdir) == 0 && mode != 0) { + SystemTools::SetPermissions(topdir, *mode); + } + + ++pos; } topdir = dir; if (Mkdir(topdir) != 0) { @@ -790,7 +794,10 @@ bool SystemTools::MakeDirectory(const std::string& path) ) { return false; } + } else if (mode != 0) { + SystemTools::SetPermissions(topdir, *mode); } + return true; } diff --git a/SystemTools.hxx.in b/SystemTools.hxx.in index 35bc1b1..3d109a8 100644 --- a/SystemTools.hxx.in +++ b/SystemTools.hxx.in @@ -553,13 +553,20 @@ public: */ static FILE* Fopen(const std::string& file, const char* mode); +/** + * Visual C++ does not define mode_t (note that Borland does, however). + */ +#if defined(_MSC_VER) + typedef unsigned short mode_t; +#endif + /** * Make a new directory if it is not there. This function * can make a full path even if none of the directories existed * prior to calling this function. */ - static bool MakeDirectory(const char* path); - static bool MakeDirectory(const std::string& path); + static bool MakeDirectory(const char* path, const mode_t* mode = 0); + static bool MakeDirectory(const std::string& path, const mode_t* mode = 0); /** * Copy the source file to the destination file only @@ -749,13 +756,6 @@ public: */ static long int CreationTime(const std::string& filename); -/** - * Visual C++ does not define mode_t (note that Borland does, however). - */ -#if defined(_MSC_VER) - typedef unsigned short mode_t; -#endif - /** * Get and set permissions of the file. If honor_umask is set, the umask * is queried and applied to the given permissions. Returns false if diff --git a/testProcess.c b/testProcess.c index cd817d9..4b4978d 100644 --- a/testProcess.c +++ b/testProcess.c @@ -107,6 +107,7 @@ static int test3(int argc, const char* argv[]) static int test4(int argc, const char* argv[]) { +#ifndef CRASH_USING_ABORT /* Prepare a pointer to an invalid address. Don't use null, because dereferencing null is undefined behaviour and compilers are free to do whatever they want. ex: Clang will warn at compile time, or even @@ -114,6 +115,7 @@ static int test4(int argc, const char* argv[]) 'volatile' and a slightly larger address, based on a runtime value. */ volatile int* invalidAddress = 0; invalidAddress += argc ? 1 : 2; +#endif #if defined(_WIN32) /* Avoid error diagnostic popups since we are crashing on purpose. */ @@ -128,9 +130,13 @@ static int test4(int argc, const char* argv[]) fprintf(stderr, "Output before crash on stderr from crash test.\n"); fflush(stdout); fflush(stderr); +#ifdef CRASH_USING_ABORT + abort(); +#else assert(invalidAddress); /* Quiet Clang scan-build. */ /* Provoke deliberate crash by writing to the invalid address. */ *invalidAddress = 0; +#endif fprintf(stdout, "Output after crash on stdout from crash test.\n"); fprintf(stderr, "Output after crash on stderr from crash test.\n"); return 0; @@ -149,7 +155,12 @@ static int test5(int argc, const char* argv[]) fprintf(stderr, "Output on stderr before recursive test.\n"); fflush(stdout); fflush(stderr); - r = runChild(cmd, kwsysProcess_State_Exception, kwsysProcess_Exception_Fault, + r = runChild(cmd, kwsysProcess_State_Exception, +#ifdef CRASH_USING_ABORT + kwsysProcess_Exception_Other, +#else + kwsysProcess_Exception_Fault, +#endif 1, 1, 1, 0, 15, 0, 1, 0, 0, 0); fprintf(stdout, "Output on stdout after recursive test.\n"); fprintf(stderr, "Output on stderr after recursive test.\n"); @@ -628,11 +639,16 @@ int main(int argc, const char* argv[]) kwsysProcess_State_Exception /* Process group test */ }; int exceptions[10] = { - kwsysProcess_Exception_None, kwsysProcess_Exception_None, - kwsysProcess_Exception_None, kwsysProcess_Exception_Fault, - kwsysProcess_Exception_None, kwsysProcess_Exception_None, - kwsysProcess_Exception_None, kwsysProcess_Exception_None, - kwsysProcess_Exception_None, kwsysProcess_Exception_Interrupt + kwsysProcess_Exception_None, kwsysProcess_Exception_None, + kwsysProcess_Exception_None, +#ifdef CRASH_USING_ABORT + kwsysProcess_Exception_Other, +#else + kwsysProcess_Exception_Fault, +#endif + kwsysProcess_Exception_None, kwsysProcess_Exception_None, + kwsysProcess_Exception_None, kwsysProcess_Exception_None, + kwsysProcess_Exception_None, kwsysProcess_Exception_Interrupt }; int values[10] = { 0, 123, 1, 1, 0, 0, 0, 0, 1, 1 }; int shares[10] = { 0, 0, 0, 0, 0, 0, 0, 0, 1, 1 }; ----------------------------------------------------------------------- Summary of changes: Help/policy/CMP0037.rst | 7 ++- Help/release/dev/deprecate-policy-old.rst | 8 +++ Source/cmMakefile.cxx | 2 +- Source/kwsys/CMakeLists.txt | 9 +++- Source/kwsys/Configure.h.in | 3 -- Source/kwsys/SystemTools.cxx | 17 ++++-- Source/kwsys/SystemTools.hxx.in | 18 +++---- Source/kwsys/testProcess.c | 28 +++++++--- .../CMP0037/CMP0037-OLD-reserved-result.txt | 1 - .../CMP0037/CMP0037-OLD-reserved-stderr.txt | 10 ++++ .../RunCMake/CMP0037/CMP0037-OLD-space-result.txt | 1 - .../RunCMake/CMP0037/CMP0037-OLD-space-stderr.txt | 10 ++++ Tests/RunCMake/CMP0037/OLD-cond-package-stderr.txt | 10 ++++ .../CMP0037/OLD-cond-package_source-stderr.txt | 10 ++++ Tests/RunCMake/CMP0037/OLD-cond-stderr.txt | 10 ++++ Tests/RunCMake/CMP0037/OLD-cond-test-stderr.txt | 10 ++++ Tests/RunCMake/CMP0038/CMP0038-OLD-result.txt | 1 - Tests/RunCMake/CMP0038/CMP0038-OLD-stderr.txt | 10 ++++ Tests/RunCMake/CMP0039/CMP0039-OLD-result.txt | 1 - Tests/RunCMake/CMP0039/CMP0039-OLD-stderr.txt | 10 ++++ .../CMP0040/CMP0040-OLD-existing-target-result.txt | 1 - .../CMP0040/CMP0040-OLD-existing-target-stderr.txt | 10 ++++ .../CMP0040/CMP0040-OLD-missing-target-result.txt | 1 - .../CMP0040/CMP0040-OLD-missing-target-stderr.txt | 10 ++++ Tests/RunCMake/CMP0041/CMP0041-OLD-result.txt | 1 - Tests/RunCMake/CMP0041/CMP0041-OLD-stderr.txt | 10 ++++ Tests/RunCMake/CMP0041/CMP0041-tid-OLD-result.txt | 1 - Tests/RunCMake/CMP0041/CMP0041-tid-OLD-stderr.txt | 10 ++++ Tests/RunCMake/CMP0042/CMP0042-OLD-result.txt | 1 - Tests/RunCMake/CMP0042/CMP0042-OLD-stderr.txt | 10 ++++ Tests/RunCMake/CMP0043/CMP0043-OLD-result.txt | 1 - Tests/RunCMake/CMP0043/CMP0043-OLD-stderr.txt | 10 ++++ Tests/RunCMake/CMP0045/CMP0045-OLD-result.txt | 1 - Tests/RunCMake/CMP0045/CMP0045-OLD-stderr.txt | 10 ++++ .../CMP0046-OLD-existing-dependency-stderr.txt | 10 ++++ .../CMP0046-OLD-missing-dependency-stderr.txt | 10 ++++ Tests/RunCMake/CMP0049/CMP0049-OLD-result.txt | 1 - Tests/RunCMake/CMP0049/CMP0049-OLD-stderr.txt | 10 ++++ Tests/RunCMake/CMP0050/CMP0050-OLD-result.txt | 1 - Tests/RunCMake/CMP0050/CMP0050-OLD-stderr.txt | 10 ++++ Tests/RunCMake/CMP0051/CMP0051-OLD-result.txt | 1 - Tests/RunCMake/CMP0051/CMP0051-OLD-stderr.txt | 13 ++++- Tests/RunCMake/CMP0053/CMP0053-OLD-stderr.txt | 13 ++++- Tests/RunCMake/CMP0054/CMP0054-OLD-stderr.txt | 11 +++- .../CMP0054/CMP0054-keywords-OLD-stderr.txt | 11 +++- .../CMP0054-policy-command-scope-stderr.txt | 11 +++- .../CMP0054-policy-foreach-scope-stderr.txt | 55 +++++++++++++++++++- .../CMP0054/CMP0054-policy-nested-if-stderr.txt | 11 +++- .../CMP0054/CMP0054-policy-while-scope-stderr.txt | 55 +++++++++++++++++++- .../BinInInstallPrefix-CMP0052-OLD-stderr.txt | 8 +++ .../SrcInInstallPrefix-CMP0052-OLD-stderr.txt | 8 +++ Tests/RunCMake/Syntax/CMP0053-At-OLD-stderr.txt | 13 ++++- Tests/RunCMake/project/CMP0048-OLD-stderr.txt | 10 ++++ 53 files changed, 465 insertions(+), 50 deletions(-) create mode 100644 Help/release/dev/deprecate-policy-old.rst delete mode 100644 Tests/RunCMake/CMP0037/CMP0037-OLD-reserved-result.txt create mode 100644 Tests/RunCMake/CMP0037/CMP0037-OLD-reserved-stderr.txt delete mode 100644 Tests/RunCMake/CMP0037/CMP0037-OLD-space-result.txt create mode 100644 Tests/RunCMake/CMP0037/CMP0037-OLD-space-stderr.txt create mode 100644 Tests/RunCMake/CMP0037/OLD-cond-package-stderr.txt create mode 100644 Tests/RunCMake/CMP0037/OLD-cond-package_source-stderr.txt create mode 100644 Tests/RunCMake/CMP0037/OLD-cond-stderr.txt create mode 100644 Tests/RunCMake/CMP0037/OLD-cond-test-stderr.txt delete mode 100644 Tests/RunCMake/CMP0038/CMP0038-OLD-result.txt create mode 100644 Tests/RunCMake/CMP0038/CMP0038-OLD-stderr.txt delete mode 100644 Tests/RunCMake/CMP0039/CMP0039-OLD-result.txt create mode 100644 Tests/RunCMake/CMP0039/CMP0039-OLD-stderr.txt delete mode 100644 Tests/RunCMake/CMP0040/CMP0040-OLD-existing-target-result.txt create mode 100644 Tests/RunCMake/CMP0040/CMP0040-OLD-existing-target-stderr.txt delete mode 100644 Tests/RunCMake/CMP0040/CMP0040-OLD-missing-target-result.txt create mode 100644 Tests/RunCMake/CMP0040/CMP0040-OLD-missing-target-stderr.txt delete mode 100644 Tests/RunCMake/CMP0041/CMP0041-OLD-result.txt create mode 100644 Tests/RunCMake/CMP0041/CMP0041-OLD-stderr.txt delete mode 100644 Tests/RunCMake/CMP0041/CMP0041-tid-OLD-result.txt create mode 100644 Tests/RunCMake/CMP0041/CMP0041-tid-OLD-stderr.txt delete mode 100644 Tests/RunCMake/CMP0042/CMP0042-OLD-result.txt create mode 100644 Tests/RunCMake/CMP0042/CMP0042-OLD-stderr.txt delete mode 100644 Tests/RunCMake/CMP0043/CMP0043-OLD-result.txt create mode 100644 Tests/RunCMake/CMP0043/CMP0043-OLD-stderr.txt delete mode 100644 Tests/RunCMake/CMP0045/CMP0045-OLD-result.txt create mode 100644 Tests/RunCMake/CMP0045/CMP0045-OLD-stderr.txt create mode 100644 Tests/RunCMake/CMP0046/CMP0046-OLD-existing-dependency-stderr.txt create mode 100644 Tests/RunCMake/CMP0046/CMP0046-OLD-missing-dependency-stderr.txt delete mode 100644 Tests/RunCMake/CMP0049/CMP0049-OLD-result.txt create mode 100644 Tests/RunCMake/CMP0049/CMP0049-OLD-stderr.txt delete mode 100644 Tests/RunCMake/CMP0050/CMP0050-OLD-result.txt create mode 100644 Tests/RunCMake/CMP0050/CMP0050-OLD-stderr.txt delete mode 100644 Tests/RunCMake/CMP0051/CMP0051-OLD-result.txt create mode 100644 Tests/RunCMake/IfacePaths/BinInInstallPrefix-CMP0052-OLD-stderr.txt create mode 100644 Tests/RunCMake/IfacePaths/SrcInInstallPrefix-CMP0052-OLD-stderr.txt create mode 100644 Tests/RunCMake/project/CMP0048-OLD-stderr.txt hooks/post-receive -- CMake From kwrobot at kitware.com Thu Nov 2 16:35:15 2017 From: kwrobot at kitware.com (Kitware Robot) Date: Thu, 2 Nov 2017 16:35:15 -0400 (EDT) Subject: [Cmake-commits] CMake branch, master, updated. v3.10.0-rc4-203-g1fc31f2 Message-ID: <20171102203515.8B3CBFEAAB@public.kitware.com> 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 1fc31f2f432ea8d0108e9c7d9662b05c391e84d1 (commit) via e26015347a6ae0185ae49b17efa40e6d4731ef16 (commit) from 817331aae8c9f166baa7ada5e015dcb5442c0038 (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=1fc31f2f432ea8d0108e9c7d9662b05c391e84d1 commit 1fc31f2f432ea8d0108e9c7d9662b05c391e84d1 Merge: 817331a e260153 Author: Craig Scott AuthorDate: Thu Nov 2 20:31:34 2017 +0000 Commit: Kitware Robot CommitDate: Thu Nov 2 16:32:05 2017 -0400 Merge topic 'cross_link_CheckLanguage_enable_language' e2601534 Help: enable_language now documents the CheckLanguage module Acked-by: Kitware Robot Merge-request: !1434 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e26015347a6ae0185ae49b17efa40e6d4731ef16 commit e26015347a6ae0185ae49b17efa40e6d4731ef16 Author: Robert Maynard AuthorDate: Tue Oct 31 14:18:22 2017 -0400 Commit: Robert Maynard CommitDate: Tue Oct 31 19:15:49 2017 -0400 Help: enable_language now documents the CheckLanguage module Resolves #17409 diff --git a/Help/command/enable_language.rst b/Help/command/enable_language.rst index 4445561..871ac4e 100644 --- a/Help/command/enable_language.rst +++ b/Help/command/enable_language.rst @@ -19,4 +19,5 @@ indirectly through link dependencies. It is simplest to enable all needed languages in the top-level directory of a project. The ``OPTIONAL`` keyword is a placeholder for future implementation and -does not currently work. +does not currently work. Instead you can use the :module:`CheckLanguage` +module to verify support before enabling. ----------------------------------------------------------------------- Summary of changes: Help/command/enable_language.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) hooks/post-receive -- CMake From kwrobot at kitware.com Fri Nov 3 00:05:11 2017 From: kwrobot at kitware.com (Kitware Robot) Date: Fri, 3 Nov 2017 00:05:11 -0400 (EDT) Subject: [Cmake-commits] CMake branch, master, updated. v3.10.0-rc4-204-gd802f35 Message-ID: <20171103040511.52F2BFDF29@public.kitware.com> 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 d802f357d79244ed6d1e3e796162730aabb11205 (commit) from 1fc31f2f432ea8d0108e9c7d9662b05c391e84d1 (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=d802f357d79244ed6d1e3e796162730aabb11205 commit d802f357d79244ed6d1e3e796162730aabb11205 Author: Kitware Robot AuthorDate: Fri Nov 3 00:01:12 2017 -0400 Commit: Kitware Robot CommitDate: Fri Nov 3 00:01:12 2017 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index e730358..63d6fac 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 10) -set(CMake_VERSION_PATCH 20171102) +set(CMake_VERSION_PATCH 20171103) #set(CMake_VERSION_RC 1) ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From kwrobot at kitware.com Fri Nov 3 08:55:04 2017 From: kwrobot at kitware.com (Kitware Robot) Date: Fri, 3 Nov 2017 08:55:04 -0400 (EDT) Subject: [Cmake-commits] CMake branch, master, updated. v3.10.0-rc4-206-g51e0d61 Message-ID: <20171103125504.7F39CFDF4E@public.kitware.com> 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 51e0d611f5732c40bf31662a0ba5e43cca0d40a6 (commit) via ea09ee0cc35440a2005869d4828d8894ab268a28 (commit) from d802f357d79244ed6d1e3e796162730aabb11205 (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=51e0d611f5732c40bf31662a0ba5e43cca0d40a6 commit 51e0d611f5732c40bf31662a0ba5e43cca0d40a6 Merge: d802f35 ea09ee0 Author: Brad King AuthorDate: Fri Nov 3 08:49:47 2017 -0400 Commit: Brad King CommitDate: Fri Nov 3 08:49:47 2017 -0400 Merge branch 'release-3.9' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ea09ee0cc35440a2005869d4828d8894ab268a28 commit ea09ee0cc35440a2005869d4828d8894ab268a28 Author: Brad King AuthorDate: Fri Nov 3 07:47:39 2017 -0400 Commit: Brad King CommitDate: Fri Nov 3 07:47:39 2017 -0400 CMake 3.9.5 diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index ecf5116..cf7efe0 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 9) -set(CMake_VERSION_PATCH 4) +set(CMake_VERSION_PATCH 5) #set(CMake_VERSION_RC 0) ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake From kwrobot at kitware.com Fri Nov 3 09:25:03 2017 From: kwrobot at kitware.com (Kitware Robot) Date: Fri, 3 Nov 2017 09:25:03 -0400 (EDT) Subject: [Cmake-commits] CMake annotated tag, v3.9.5, created. v3.9.5 Message-ID: <20171103132503.A252BFEAAD@public.kitware.com> 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 annotated tag, v3.9.5 has been created at f953b57ee964dd3a6a9726903e74d6ec4e4e1e78 (tag) tagging ea09ee0cc35440a2005869d4828d8894ab268a28 (commit) replaces v3.9.4 tagged by Brad King on Fri Nov 3 08:48:11 2017 -0400 - Log ----------------------------------------------------------------- CMake 3.9.5 -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAln8ZYsWHGJyYWQua2lu Z0BraXR3YXJlLmNvbQAKCRAtLO8QNJIWhBzzD/4xOPV+6FeEU0ITmxQ4jFVEv5U6 FlkGaakSONWRcd7z5oIwd7ZK+LgXGj2SxwL8jQ9BL1oIXWWQ+aCGu+Q3uBeJ+EyB p/SXK1eBF+fG2hhvOJI7MgFjd5pElWBJ8jCq7szrgxq85nuHYs+dMUof1v0NTLSV a9vgSN3d9gDiq5/sC0Bs7fAFFfymcJ57+0kB9jSOMK5B4YjtX+xLdtIGK62fecY4 pyEB8ycGTKoz6Jsgudo36QvAmKOShH9dA6rt9DH+jsv+Vg21uXKlFVKNn4L4dM9/ F/+vbk3b9DJZj/H32nF0EnDg8e3wrz9kB2ca9UIo7C6KjwJzu3zQgYDXpfRqpm5M z3gd8WA3vR18XbBauW5ZFTnIdJFdH6soqHshQc9RCEYKd1jKDPn4OkI5su8VMmHV m8BImKWshLDm5MObwQd40XVQRCSXPN2Tg/mfEO7qkpAEXtofBC1gAu3oial5PKMl UiIR1co+RA49moYkWj1BfNwfKBcJw3axiSaOrYtOVjYNq1gi+45/9qWr3C7Fz58e +OVO7tIbH+Vv40w7payl2sjtkT7wI2UQPHJGXc11B1jdoUZLvg2HlsqKNQ3TIF0V qUZoQBCZU7ah1nstfkvCDxcikSh0OKXtLVXUH7Np63JnB/bMFwDlkaH8dcWCP9Md 2tStjxLxcoD8RaNc4w== =XrjQ -----END PGP SIGNATURE----- Brad King (2): Merge branch 'backport-3.9-autogen-moc-predefs-no-moc-options' into release-3.9 CMake 3.9.5 Sebastian Holtermann (1): Autogen: Don't add AUTOMOC_MOC_OPTIONS to moc-predefs command ----------------------------------------------------------------------- hooks/post-receive -- CMake From kwrobot at kitware.com Sat Nov 4 00:05:10 2017 From: kwrobot at kitware.com (Kitware Robot) Date: Sat, 4 Nov 2017 00:05:10 -0400 (EDT) Subject: [Cmake-commits] CMake branch, master, updated. v3.10.0-rc4-207-g277994e Message-ID: <20171104040510.D8AA1FFE17@public.kitware.com> 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 277994eb43b6759dcb1f986b24aca614e5c4b9e0 (commit) from 51e0d611f5732c40bf31662a0ba5e43cca0d40a6 (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=277994eb43b6759dcb1f986b24aca614e5c4b9e0 commit 277994eb43b6759dcb1f986b24aca614e5c4b9e0 Author: Kitware Robot AuthorDate: Sat Nov 4 00:01:12 2017 -0400 Commit: Kitware Robot CommitDate: Sat Nov 4 00:01:12 2017 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 63d6fac..96e8e36 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 10) -set(CMake_VERSION_PATCH 20171103) +set(CMake_VERSION_PATCH 20171104) #set(CMake_VERSION_RC 1) ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From kwrobot at kitware.com Sun Nov 5 00:05:16 2017 From: kwrobot at kitware.com (Kitware Robot) Date: Sun, 5 Nov 2017 00:05:16 -0400 (EDT) Subject: [Cmake-commits] CMake branch, master, updated. v3.10.0-rc4-208-gc2e130e Message-ID: <20171105040519.6EF911022C4@public.kitware.com> 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 c2e130e8f4c09c20fadf67c6c12a3734261c4803 (commit) from 277994eb43b6759dcb1f986b24aca614e5c4b9e0 (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=c2e130e8f4c09c20fadf67c6c12a3734261c4803 commit c2e130e8f4c09c20fadf67c6c12a3734261c4803 Author: Kitware Robot AuthorDate: Sun Nov 5 00:01:06 2017 -0400 Commit: Kitware Robot CommitDate: Sun Nov 5 00:01:06 2017 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 96e8e36..a74c188 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 10) -set(CMake_VERSION_PATCH 20171104) +set(CMake_VERSION_PATCH 20171105) #set(CMake_VERSION_RC 1) ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From kwrobot at kitware.com Mon Nov 6 00:05:04 2017 From: kwrobot at kitware.com (Kitware Robot) Date: Mon, 6 Nov 2017 00:05:04 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.10.0-rc4-209-g3d6e45a Message-ID: <20171106050504.AE850102ADF@public.kitware.com> 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 3d6e45af611983d85b130b4f874d862f7d998013 (commit) from c2e130e8f4c09c20fadf67c6c12a3734261c4803 (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=3d6e45af611983d85b130b4f874d862f7d998013 commit 3d6e45af611983d85b130b4f874d862f7d998013 Author: Kitware Robot AuthorDate: Mon Nov 6 00:01:06 2017 -0500 Commit: Kitware Robot CommitDate: Mon Nov 6 00:01:06 2017 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index a74c188..e98e129 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 10) -set(CMake_VERSION_PATCH 20171105) +set(CMake_VERSION_PATCH 20171106) #set(CMake_VERSION_RC 1) ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From kwrobot at kitware.com Mon Nov 6 09:05:53 2017 From: kwrobot at kitware.com (Kitware Robot) Date: Mon, 6 Nov 2017 09:05:53 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.10.0-rc4-230-gb104bcf Message-ID: <20171106140553.313CE1029A8@public.kitware.com> 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 b104bcfd98add349f7624887073c79a84ae41c44 (commit) via 62d736f74ad2eaa737d37ba0b30c8a137782537b (commit) via 6a54dbe8caeaaa78a8ac78b282d80128f0201f9a (commit) via bccd442f7183de1da8e97cfd4a4be2d3b21a807c (commit) via 73db89c2c2d997f6e1992dd1eab05e54792bd164 (commit) via 2dabcebf3ce1b331c723055322b3fbe2e8ab482d (commit) via 4c626b7e43c27de0dce4b8af15290cce861f9dc8 (commit) via 4bd5af6302f0b7bafecf9ca7919287fe4d3f09e0 (commit) via 0ce082b7c823c0f88fbb329ca05d69a8f60f3851 (commit) via 36346de4809bf443ca9ca8daea2bdc1af7874b68 (commit) via bbc9c96691c06cdcff0227ad8292e2a2ea60ec00 (commit) via 701a637e4d0294ad76df7c11244c9b9b2e84716d (commit) via 777e87ae00e8920bd6bf971fb40a07e373061500 (commit) via 3048777006e1d10646e7b62f46406859dc4d0812 (commit) via 5464e23ff5e822b8a99a3cd234c54ff4632ccb98 (commit) via f61052ad390773610e14367c14fb53ad2e6b789e (commit) via 39c2feaf8c4dcb9c3a30c68a066fb70e126d7fe6 (commit) via f5d2988ea7cc60778dbaa21860aad264c7aa7a81 (commit) via 2636d86ce2f45f06bdcf4cb60c15df55838a3aa7 (commit) via d46b4ba83532d8954e473a26112288cd8e693775 (commit) via 08dca58358c95a41615150513a006379c4ee7825 (commit) from 3d6e45af611983d85b130b4f874d862f7d998013 (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=b104bcfd98add349f7624887073c79a84ae41c44 commit b104bcfd98add349f7624887073c79a84ae41c44 Merge: 62d736f 777e87a Author: Brad King AuthorDate: Mon Nov 6 14:01:52 2017 +0000 Commit: Kitware Robot CommitDate: Mon Nov 6 09:02:23 2017 -0500 Merge topic 'typos' 777e87ae Fix trivial typos in text Acked-by: Kitware Robot Merge-request: !1442 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=62d736f74ad2eaa737d37ba0b30c8a137782537b commit 62d736f74ad2eaa737d37ba0b30c8a137782537b Merge: 6a54dbe 4c626b7 Author: Brad King AuthorDate: Mon Nov 6 13:58:04 2017 +0000 Commit: Kitware Robot CommitDate: Mon Nov 6 09:01:49 2017 -0500 Merge topic 'test-contract-refactor' 4c626b7e Tests: Refactor contract test activation 4bd5af63 Tests: Factor out contract test HOME finding 0ce082b7 Tests: Drop unused contract test environment script 36346de4 Tests: Drop unused contract test bbc9c966 Tests: Honor already-set CTEST_REAL_HOME in case of repeat run Acked-by: Kitware Robot Merge-request: !1444 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a54dbe8caeaaa78a8ac78b282d80128f0201f9a commit 6a54dbe8caeaaa78a8ac78b282d80128f0201f9a Merge: bccd442 701a637 Author: Brad King AuthorDate: Mon Nov 6 13:55:19 2017 +0000 Commit: Kitware Robot CommitDate: Mon Nov 6 09:00:44 2017 -0500 Merge topic 'test-crash-ubsan' 701a637e Tests: Fix CTestTestCrash test under ubsan Acked-by: Kitware Robot Merge-request: !1443 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bccd442f7183de1da8e97cfd4a4be2d3b21a807c commit bccd442f7183de1da8e97cfd4a4be2d3b21a807c Merge: 73db89c f61052a Author: Brad King AuthorDate: Mon Nov 6 13:54:58 2017 +0000 Commit: Kitware Robot CommitDate: Mon Nov 6 08:59:36 2017 -0500 Merge topic 'bzip2-windows' f61052ad FindBZip2: Normalize slashes when legacy BZIP2_LIBRARIES is specified Acked-by: Kitware Robot Merge-request: !1439 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=73db89c2c2d997f6e1992dd1eab05e54792bd164 commit 73db89c2c2d997f6e1992dd1eab05e54792bd164 Merge: 2dabceb 39c2fea Author: Brad King AuthorDate: Mon Nov 6 13:56:33 2017 +0000 Commit: Kitware Robot CommitDate: Mon Nov 6 08:58:11 2017 -0500 Merge topic 'server-refactor' 39c2feaf misc: Added utility method to allow working with stacks f5d2988e server: Swapped to cm_thread impl 2636d86c utility: Added minimal std::thread drop-in d46b4ba8 server: Updated server tests to try various communication channels 08dca583 Tests: reworked server tests to allow other operation modes Acked-by: Kitware Robot Merge-request: !1230 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2dabcebf3ce1b331c723055322b3fbe2e8ab482d commit 2dabcebf3ce1b331c723055322b3fbe2e8ab482d Merge: 3d6e45a 3048777 Author: Brad King AuthorDate: Mon Nov 6 13:54:39 2017 +0000 Commit: Kitware Robot CommitDate: Mon Nov 6 08:55:35 2017 -0500 Merge topic 'update-kwsys' 30487770 Merge branch 'upstream-KWSys' into update-kwsys 5464e23f KWSys 2017-11-02 (54f0901a) Acked-by: Kitware Robot Merge-request: !1440 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c626b7e43c27de0dce4b8af15290cce861f9dc8 commit 4c626b7e43c27de0dce4b8af15290cce861f9dc8 Author: Brad King AuthorDate: Mon Oct 30 10:48:05 2017 -0400 Commit: Brad King CommitDate: Fri Nov 3 11:35:06 2017 -0400 Tests: Refactor contract test activation Use separate `CMake_TEST_CONTRACT_` variables for each test. Make the set of possible tests match what is in the source tree. diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index bd44b17..5a149c8 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -3388,31 +3388,30 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release set_property(TEST CMakeWizardTest PROPERTY PASS_REGULAR_EXPRESSION "The \"cmake -i\" wizard mode is no longer supported.") - # If the cache variable CMAKE_CONTRACT_PROJECTS is set - # then the dashboard will run a contract with CMake test of that - # name. For example CMAKE_CONTRACT_PROJECTS = vtk542 would run - # the vtk542 contract test. - # For each Contract test, the project should provide a directory - # with at least one CMakeLists.txt file that uses ExternalProject - # to download and configure the project. The directory should also - # contain a RunTest.cmake file that has a single set of the format: - # set(project_RUN_TEST testToRun) - # The testToRun should be a test executable that can be run to - # smoke test the build. - foreach(project ${CMAKE_CONTRACT_PROJECTS}) - include(Contracts/${project}/RunTest.cmake) - ADD_TEST_MACRO(Contracts.${project} - ${${project}_RUN_TEST}) - # Contract test timeout in seconds. - # Default to 6 hours. - if(DEFINED ${project}_TEST_TIMEOUT) - set(timeout ${${project}_TEST_TIMEOUT}) - elseif(CMAKE_CONTRACT_TEST_TIMEOUT_DEFAULT) - set(timeout ${CMAKE_CONTRACT_TEST_TIMEOUT_DEFAULT}) - else() - set(timeout 21600) + # Define a set of "contract" tests, each activated by a cache entry + # named "CMake_TEST_CONTRACT_". For each Contract test, + # the project should provide a directory with a CMakeLists.txt file + # that uses ExternalProject to download and configure the project. + # The directory should also contain a Configure.cmake file that + # sets "CMake_TEST_CONTRACT__" variables to configure + # the code below. + foreach(project + Trilinos + VTK + ) + if(CMake_TEST_CONTRACT_${project}) + include(Contracts/${project}/Configure.cmake) + ADD_TEST_MACRO(Contracts.${project} ${CMake_TEST_CONTRACT_${project}_RUN_TEST}) + # The external projects may take a long time to build. + if(DEFINED CMake_TEST_CONTRACT_${project}_TIMEOUT) + set(timeout ${CMake_TEST_CONTRACT_${project}_TIMEOUT}) + elseif(CMake_TEST_CONTRACT_DEFAULT_TIMEOUT) + set(timeout ${CMake_TEST_CONTRACT_DEFAULT_TIMEOUT}) + else() + set(timeout 21600) + endif() + set_property(TEST Contracts.${project} PROPERTY TIMEOUT "${timeout}") endif() - set_tests_properties(Contracts.${project} PROPERTIES TIMEOUT ${timeout}) endforeach() if(TEST_CompileCommandOutput) diff --git a/Tests/Contracts/Trilinos/RunTest.cmake b/Tests/Contracts/Trilinos/Configure.cmake similarity index 78% rename from Tests/Contracts/Trilinos/RunTest.cmake rename to Tests/Contracts/Trilinos/Configure.cmake index d661a4c..d62eb79 100644 --- a/Tests/Contracts/Trilinos/RunTest.cmake +++ b/Tests/Contracts/Trilinos/Configure.cmake @@ -4,4 +4,4 @@ set(dir "${CMAKE_CURRENT_BINARY_DIR}/Contracts/${project}") set(exe "${CMAKE_COMMAND}") set(args -P "${dir}/ValidateBuild.cmake") -set(Trilinos_RUN_TEST ${exe} ${args}) +set(CMake_TEST_CONTRACT_Trilinos_RUN_TEST ${exe} ${args}) diff --git a/Tests/Contracts/VTK/RunTest.cmake b/Tests/Contracts/VTK/Configure.cmake similarity index 65% rename from Tests/Contracts/VTK/RunTest.cmake rename to Tests/Contracts/VTK/Configure.cmake index 65285cf..037d75a 100644 --- a/Tests/Contracts/VTK/RunTest.cmake +++ b/Tests/Contracts/VTK/Configure.cmake @@ -1,3 +1,3 @@ set(exe "$ENV{HOME}/.cmake/Contracts/VTK/VTK-build/bin/vtkCommonCoreCxxTests") set(args otherArrays) -set(VTK_RUN_TEST ${exe} ${args}) +set(CMake_TEST_CONTRACT_VTK_RUN_TEST ${exe} ${args}) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4bd5af6302f0b7bafecf9ca7919287fe4d3f09e0 commit 4bd5af6302f0b7bafecf9ca7919287fe4d3f09e0 Author: Brad King AuthorDate: Thu Oct 26 15:43:29 2017 -0400 Commit: Brad King CommitDate: Fri Nov 3 11:35:06 2017 -0400 Tests: Factor out contract test HOME finding diff --git a/Tests/Contracts/Home.cmake b/Tests/Contracts/Home.cmake new file mode 100644 index 0000000..8b05e81 --- /dev/null +++ b/Tests/Contracts/Home.cmake @@ -0,0 +1,19 @@ +# Find a home in which to build. +if(NOT DEFINED HOME) + if(DEFINED ENV{CTEST_REAL_HOME}) + set(HOME "$ENV{CTEST_REAL_HOME}") + else() + set(HOME "$ENV{HOME}") + endif() + + if(NOT HOME AND WIN32) + # Try for USERPROFILE as HOME equivalent: + string(REPLACE "\\" "/" HOME "$ENV{USERPROFILE}") + + # But just use root of SystemDrive if USERPROFILE contains any spaces: + # (Default on XP and earlier...) + if(HOME MATCHES " ") + string(REPLACE "\\" "/" HOME "$ENV{SystemDrive}") + endif() + endif() +endif() diff --git a/Tests/Contracts/Trilinos/CMakeLists.txt b/Tests/Contracts/Trilinos/CMakeLists.txt index 8d74ca5..4d7062b 100644 --- a/Tests/Contracts/Trilinos/CMakeLists.txt +++ b/Tests/Contracts/Trilinos/CMakeLists.txt @@ -6,24 +6,7 @@ include(ExternalProject) include("${CMAKE_CURRENT_SOURCE_DIR}/LocalOverrides.cmake" OPTIONAL) include("${CMAKE_CURRENT_BINARY_DIR}/LocalOverrides.cmake" OPTIONAL) -if(NOT DEFINED HOME) - if(DEFINED ENV{CTEST_REAL_HOME}) - set(HOME "$ENV{CTEST_REAL_HOME}") - else() - set(HOME "$ENV{HOME}") - endif() - - if(NOT HOME AND WIN32) - # Try for USERPROFILE as HOME equivalent: - string(REPLACE "\\" "/" HOME "$ENV{USERPROFILE}") - - # But just use root of SystemDrive if USERPROFILE contains any spaces: - # (Default on XP and earlier...) - if(HOME MATCHES " ") - string(REPLACE "\\" "/" HOME "$ENV{SystemDrive}") - endif() - endif() -endif() +include(${CMAKE_CURRENT_SOURCE_DIR}/../Home.cmake) message(STATUS "HOME='${HOME}'") if(NOT DEFINED url) diff --git a/Tests/Contracts/VTK/CMakeLists.txt b/Tests/Contracts/VTK/CMakeLists.txt index ef19325..c946499 100644 --- a/Tests/Contracts/VTK/CMakeLists.txt +++ b/Tests/Contracts/VTK/CMakeLists.txt @@ -5,24 +5,7 @@ project(VTK) include(ExternalProject) # find "HOME". VTK will be downloaded & built within a subdirectory. -if(NOT DEFINED HOME) - if(DEFINED ENV{CTEST_REAL_HOME}) - set(HOME "$ENV{CTEST_REAL_HOME}") - else() - set(HOME "$ENV{HOME}") - endif() - - if(NOT HOME AND WIN32) - # Try for USERPROFILE as HOME equivalent: - string(REPLACE "\\" "/" HOME "$ENV{USERPROFILE}") - - # But just use root of SystemDrive if USERPROFILE contains any spaces: - # (Default on XP and earlier...) - if(HOME MATCHES " ") - string(REPLACE "\\" "/" HOME "$ENV{SystemDrive}") - endif() - endif() -endif() +include(${CMAKE_CURRENT_SOURCE_DIR}/../Home.cmake) set(base_dir "${HOME}/.cmake/Contracts/VTK") https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0ce082b7c823c0f88fbb329ca05d69a8f60f3851 commit 0ce082b7c823c0f88fbb329ca05d69a8f60f3851 Author: Brad King AuthorDate: Mon Oct 30 11:41:57 2017 -0400 Commit: Brad King CommitDate: Fri Nov 3 11:32:06 2017 -0400 Tests: Drop unused contract test environment script `Trilinos/EnvScript.cmake` has machine-specific content that has been moved to the respective machines. diff --git a/Tests/Contracts/Trilinos/EnvScript.cmake b/Tests/Contracts/Trilinos/EnvScript.cmake deleted file mode 100644 index dacb704..0000000 --- a/Tests/Contracts/Trilinos/EnvScript.cmake +++ /dev/null @@ -1,32 +0,0 @@ -# Site specific settings: -# -if(CTEST_SITE MATCHES "faraway") - set(CTEST_SITE "faraway.kitware") - set(ENV{CTEST_SITE} "${CTEST_SITE}") -endif() - -if(CTEST_SITE STREQUAL "HUT11") - set(CTEST_SITE "hut11.kitware") - set(ENV{CTEST_SITE} "${CTEST_SITE}") - - set(ENV{CLAPACK_DIR} "C:/T/clapack/b/clapack-prefix/src/clapack-build") -endif() - -if(CTEST_SITE MATCHES "qwghlm") - set(CTEST_SITE "qwghlm.kitware") - set(ENV{CTEST_SITE} "${CTEST_SITE}") - - set(ENV{PATH} "/opt/local/bin:$ENV{PATH}") - set(ENV{CC} "gcc-mp-4.3") - set(ENV{CXX} "g++-mp-4.3") - set(ENV{FC} "gfortran-mp-4.3") -endif() - -# Submit to alternate CDash server: -# -#set(ENV{CTEST_DROP_SITE} "localhost") -#set(ENV{CTEST_DROP_LOCATION} "/CDash/submit.php?project=Trilinos") - -# Limit packages built: -# -set(ENV{Trilinos_PACKAGES} "Teuchos;Kokkos") https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=36346de4809bf443ca9ca8daea2bdc1af7874b68 commit 36346de4809bf443ca9ca8daea2bdc1af7874b68 Author: Brad King AuthorDate: Mon Oct 30 10:32:52 2017 -0400 Commit: Brad King CommitDate: Fri Nov 3 11:30:26 2017 -0400 Tests: Drop unused contract test diff --git a/Tests/Contracts/cse-snapshot/CMakeLists.txt b/Tests/Contracts/cse-snapshot/CMakeLists.txt deleted file mode 100644 index 9134210..0000000 --- a/Tests/Contracts/cse-snapshot/CMakeLists.txt +++ /dev/null @@ -1,114 +0,0 @@ -cmake_minimum_required(VERSION 2.8) -project(cse-snapshot) - -include(ExternalProject) - -include("${CMAKE_CURRENT_SOURCE_DIR}/LocalOverrides.cmake" OPTIONAL) -include("${CMAKE_CURRENT_BINARY_DIR}/LocalOverrides.cmake" OPTIONAL) - -if(NOT DEFINED HOME) - if(DEFINED ENV{CTEST_REAL_HOME}) - set(HOME "$ENV{CTEST_REAL_HOME}") - else() - set(HOME "$ENV{HOME}") - endif() -endif() -message(STATUS "HOME='${HOME}'") - -if(NOT DEFINED repo) - set(repo "git://public.kitware.com/cse.git") -endif() -message(STATUS "repo='${repo}'") - -if(NOT DEFINED tag) - set(tag "cc1dcb95439a21ab1d58f444d93481598414196e") -endif() -message(STATUS "tag='${tag}'") - -string(SUBSTRING "${tag}" 0 8 shorttag) - -set(base_dir "${HOME}/.cmake/Contracts/${PROJECT_NAME}/${shorttag}") -set(binary_dir "${base_dir}/build") -set(script_dir "${base_dir}") -set(source_dir "${base_dir}/src") - -if(NOT DEFINED BUILDNAME) - set(BUILDNAME "CMakeContract-${shorttag}") -endif() -message(STATUS "BUILDNAME='${BUILDNAME}'") - -if(NOT DEFINED SITE) - site_name(SITE) -endif() -message(STATUS "SITE='${SITE}'") - -if(NOT DEFINED PROCESSOR_COUNT) - # Unknown: - set(PROCESSOR_COUNT 0) - - # Linux: - set(cpuinfo_file "/proc/cpuinfo") - if(EXISTS "${cpuinfo_file}") - file(STRINGS "${cpuinfo_file}" procs REGEX "^processor.: [0-9]+$") - list(LENGTH procs PROCESSOR_COUNT) - endif() - - # Mac: - if(APPLE) - find_program(cmd_sysctl "sysctl") - if(cmd_sysctl) - execute_process(COMMAND ${cmd_sysctl} -n hw.ncpu - OUTPUT_VARIABLE PROCESSOR_COUNT - OUTPUT_STRIP_TRAILING_WHITESPACE) - endif() - endif() - - # Windows: - if(WIN32) - set(PROCESSOR_COUNT "$ENV{NUMBER_OF_PROCESSORS}") - endif() -endif() -message(STATUS "PROCESSOR_COUNT='${PROCESSOR_COUNT}'") - -find_package(Git) -if(NOT GIT_EXECUTABLE) - message(FATAL_ERROR "error: could not find git") - # adjust PATH to find git, or set GIT_EXECUTABLE in LocalOverrides.cmake -endif() -message(STATUS "GIT_EXECUTABLE='${GIT_EXECUTABLE}'") - -configure_file( - "${CMAKE_CURRENT_SOURCE_DIR}/Dashboard.cmake.in" - "${script_dir}/Dashboard.cmake" - @ONLY) - -# Source dir for this project exists outside the CMake build tree because it -# is absolutely huge. -# -if(EXISTS "${source_dir}/.git") - # If it exists already, download is a complete no-op: - ExternalProject_Add(download-${PROJECT_NAME} - DOWNLOAD_COMMAND "" - CONFIGURE_COMMAND "" - BUILD_COMMAND "" - INSTALL_COMMAND "" - ) -else() - # If it does not yet exist, download clones the git repository: - ExternalProject_Add(download-${PROJECT_NAME} - SOURCE_DIR "${source_dir}" - GIT_REPOSITORY "${repo}" - GIT_TAG "${tag}" - CONFIGURE_COMMAND "" - BUILD_COMMAND "" - INSTALL_COMMAND "" - ) -endif() - -ExternalProject_Add(build-${PROJECT_NAME} - DOWNLOAD_COMMAND "" - CONFIGURE_COMMAND "" - BUILD_COMMAND ${CMAKE_CTEST_COMMAND} -S "${script_dir}/Dashboard.cmake" - INSTALL_COMMAND "" - DEPENDS download-${PROJECT_NAME} - ) diff --git a/Tests/Contracts/cse-snapshot/Dashboard.cmake.in b/Tests/Contracts/cse-snapshot/Dashboard.cmake.in deleted file mode 100644 index 138eb3f..0000000 --- a/Tests/Contracts/cse-snapshot/Dashboard.cmake.in +++ /dev/null @@ -1,76 +0,0 @@ -# This "ctest -S" script may be configured to drive a nightly dashboard on any -# Linux machine. -# -set(CTEST_BINARY_DIRECTORY "@binary_dir@") -set(CTEST_BUILD_NAME "@BUILDNAME@") -set(CTEST_SITE "@SITE@") -set(CTEST_SOURCE_DIRECTORY "@source_dir@") -set(PROCESSOR_COUNT "@PROCESSOR_COUNT@") - -# Assume a Linux build, with a make that supports -j. Modify this script if -# assumption is ever invalid. -# -if(PROCESSOR_COUNT) - set(CTEST_BUILD_FLAGS "-j${PROCESSOR_COUNT}") -endif() - -set(CTEST_CMAKE_GENERATOR "Unix Makefiles") -set(CTEST_NOTES_FILES "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}") - -message("Cleaning binary dir '${CTEST_BINARY_DIRECTORY}'") -ctest_empty_binary_directory("${CTEST_BINARY_DIRECTORY}") - -# Intentionally no ctest_update step in this script. This script is run as a -# "Contract" test on a CMake dashboard submission using the just-built ctest -# as the driver. The download step in the Contract CMakeLists file takes care -# of setting up the source tree before calling this ctest -S script. The idea -# is that the source tree will be the same every day, so there should not be -# an "update" step for this build. - -message("Configuring CSE in binary dir '${CTEST_BINARY_DIRECTORY}'") -set_property(GLOBAL PROPERTY SubProject "CSE-toplevel") -set_property(GLOBAL PROPERTY Label "CSE-toplevel") - -ctest_start("Experimental") - -set(CSE_TOPLEVEL_OPTIONS - -DEXTERNAL_PROJECT_DASHBOARD_BUILD:BOOL=ON - -DEXTERNAL_PROJECT_TESTS:BOOL=ON - -DCSE_INSTALL_PREFIX:PATH=${CTEST_BINARY_DIRECTORY}/built - -DCSE_SUBSET:STRING=ALL - -DCTEST_SITE:STRING=${CTEST_SITE} -) - -ctest_configure(OPTIONS "${CSE_TOPLEVEL_OPTIONS}") - -# The configure step produces a file listing the CSE packages and dependencies. -# This file also generates Project.xml and stores it in ${PROJECT_XML}. -# -set(subprojects "") -if(EXISTS "${CTEST_BINARY_DIRECTORY}/CSEBuildtimeDepends.cmake") - message("Including CSEBuildtimeDepends.cmake") - include("${CTEST_BINARY_DIRECTORY}/CSEBuildtimeDepends.cmake") - set(subprojects ${CSE_ALL_SORTED}) - message("Submitting Project.xml") - ctest_submit(FILES ${PROJECT_XML}) -endif() - -message("Submitting CSE configure results") -ctest_submit() - -if(subprojects) - message("Building by looping over subprojects...") - foreach(subproject ${subprojects}) - message("########## ${subproject} ##########") - set_property(GLOBAL PROPERTY SubProject "${subproject}") - set_property(GLOBAL PROPERTY Label "${subproject}") - ctest_build(TARGET "${subproject}" APPEND) - message("Submitting ${subproject} build results") - ctest_submit(PARTS build) - endforeach() -else() - message("Building all...") - ctest_build(APPEND) - message("Submitting build results") - ctest_submit(PARTS build) -endif() diff --git a/Tests/Contracts/cse-snapshot/RunTest.cmake b/Tests/Contracts/cse-snapshot/RunTest.cmake deleted file mode 100644 index 7eb6301..0000000 --- a/Tests/Contracts/cse-snapshot/RunTest.cmake +++ /dev/null @@ -1,3 +0,0 @@ -set(exe "$ENV{HOME}/.cmake/Contracts/cse-snapshot/510345e4/build/built/Release/git-1.6.5.2/bin/git") -set(args help clone) -set(cse-snapshot_RUN_TEST ${exe} ${args}) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bbc9c96691c06cdcff0227ad8292e2a2ea60ec00 commit bbc9c96691c06cdcff0227ad8292e2a2ea60ec00 Author: Brad King AuthorDate: Thu Nov 2 09:28:14 2017 -0400 Commit: Brad King CommitDate: Fri Nov 3 11:30:21 2017 -0400 Tests: Honor already-set CTEST_REAL_HOME in case of repeat run diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index c25fc44..bd44b17 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -31,7 +31,9 @@ if(DEFINED ENV{HOME} AND NOT CTEST_NO_TEST_HOME) set(TEST_HOME_ENV_CODE "# Fake a user home directory to avoid polluting the real one. # But provide original ENV{HOME} value in ENV{CTEST_REAL_HOME} for tests that # need access to the real HOME directory. -set(ENV{CTEST_REAL_HOME} \"\$ENV{HOME}\") +if(NOT DEFINED ENV{CTEST_REAL_HOME}) + set(ENV{CTEST_REAL_HOME} \"\$ENV{HOME}\") +endif() set(ENV{HOME} \"${TEST_HOME}\") ") endif() https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=701a637e4d0294ad76df7c11244c9b9b2e84716d commit 701a637e4d0294ad76df7c11244c9b9b2e84716d Author: Brad King AuthorDate: Fri Nov 3 11:23:33 2017 -0400 Commit: Brad King CommitDate: Fri Nov 3 11:23:33 2017 -0400 Tests: Fix CTestTestCrash test under ubsan UBsan causes our test crash to abort instead. Update our regex to tolerate this. diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index c25fc44..d2b6969 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -2830,7 +2830,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release PASS_REGULAR_EXPRESSION "Failed") else() set_tests_properties(CTestTestCrash PROPERTIES - PASS_REGULAR_EXPRESSION "(Illegal|SegFault)") + PASS_REGULAR_EXPRESSION "(Illegal|SegFault|Child aborted)") endif() configure_file( https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=777e87ae00e8920bd6bf971fb40a07e373061500 commit 777e87ae00e8920bd6bf971fb40a07e373061500 Author: luzpaz AuthorDate: Thu Nov 2 19:14:55 2017 -0400 Commit: Brad King CommitDate: Fri Nov 3 10:25:05 2017 -0400 Fix trivial typos in text Some are user facing. Found using codespell -q 3 --skip="./Utilities" -I .cmake-whitelist.txt` whereby the whitelist contained: ans dum helpfull emmited emmitted buil iff isnt nto ot pathes substract te todays upto whitespaces diff --git a/Help/command/add_subdirectory.rst b/Help/command/add_subdirectory.rst index e979253..012ded4 100644 --- a/Help/command/add_subdirectory.rst +++ b/Help/command/add_subdirectory.rst @@ -30,7 +30,7 @@ project that is useful but not necessary, such as a set of examples. Typically the subdirectory should contain its own :command:`project` command invocation so that a full build system will be generated in the subdirectory (such as a VS IDE solution file). Note that inter-target -dependencies supercede this exclusion. If a target built by the +dependencies supersede this exclusion. If a target built by the parent project depends on a target in the subdirectory, the dependee target will be included in the parent project build system to satisfy the dependency. diff --git a/Help/command/file.rst b/Help/command/file.rst index 4d4ebb4..5ce86e5 100644 --- a/Help/command/file.rst +++ b/Help/command/file.rst @@ -110,7 +110,7 @@ regular expressions, but much simpler. If ``RELATIVE`` flag is specified, the results will be returned as relative paths to the given path. The results will be ordered lexicographically. -By default ``GLOB`` lists directories - directories are omited in result if +By default ``GLOB`` lists directories - directories are omitted in result if ``LIST_DIRECTORIES`` is set to false. .. note:: diff --git a/Help/command/install.rst b/Help/command/install.rst index 58438b7..9f9ee13 100644 --- a/Help/command/install.rst +++ b/Help/command/install.rst @@ -346,7 +346,7 @@ specified that does not match that given to the targets associated with included in the export but a target to which it links is not included the behavior is unspecified. -In additon to cmake language files, the ``EXPORT_ANDROID_MK`` option maybe +In addition to cmake language files, the ``EXPORT_ANDROID_MK`` option maybe used to specifiy an export to the android ndk build system. The Android NDK supports the use of prebuilt libraries, both static and shared. This allows cmake to build the libraries of a project and make them available diff --git a/Help/dev/testing.rst b/Help/dev/testing.rst index 731930c..1b29acf 100644 --- a/Help/dev/testing.rst +++ b/Help/dev/testing.rst @@ -16,7 +16,7 @@ welcome to provide testing machines in order to help keep support for their platforms working. The `CMake Dashboard Scripts Repository`_ provides CTest scripts to drive -nightly, continous, and experimental testing of CMake. Use the following +nightly, continuous, and experimental testing of CMake. Use the following commands to set up a new integration testing client: .. code-block:: console diff --git a/Help/release/3.4.rst b/Help/release/3.4.rst index 89c5561..468627e 100644 --- a/Help/release/3.4.rst +++ b/Help/release/3.4.rst @@ -66,7 +66,7 @@ Variables Properties ---------- -* :ref:`Visual Studio Generators` learned to support additonal +* :ref:`Visual Studio Generators` learned to support additional target properties to customize projects for NVIDIA Nsight Tegra Visual Studio Edition: diff --git a/Help/release/3.6.rst b/Help/release/3.6.rst index 144537d..a542b77 100644 --- a/Help/release/3.6.rst +++ b/Help/release/3.6.rst @@ -111,7 +111,7 @@ Modules * The :module:`ExternalProject` module learned to initialize Git submodules recursively and also to initialize new submodules on updates. Use the - ``GIT_SUBMODULES`` option to restrict which submodules are initalized and + ``GIT_SUBMODULES`` option to restrict which submodules are initialized and updated. * The :module:`ExternalProject` module leared the ``DOWNLOAD_NO_EXTRACT 1`` diff --git a/Help/release/3.7.rst b/Help/release/3.7.rst index 4c51af4..d4d374b 100644 --- a/Help/release/3.7.rst +++ b/Help/release/3.7.rst @@ -237,7 +237,7 @@ CPack * The :module:`CPackIFW` module :command:`cpack_ifw_configure_component` and :command:`cpack_ifw_configure_component_group` commands gained a new - ``USER_INTERFACES`` option to add a list of additonal pages to the IFW + ``USER_INTERFACES`` option to add a list of additional pages to the IFW installer. * The :module:`CPackRPM` module learned to generate debuginfo diff --git a/Help/variable/LIBRARY_OUTPUT_PATH.rst b/Help/variable/LIBRARY_OUTPUT_PATH.rst index ba02911..bb4328f 100644 --- a/Help/variable/LIBRARY_OUTPUT_PATH.rst +++ b/Help/variable/LIBRARY_OUTPUT_PATH.rst @@ -5,5 +5,5 @@ Old library location variable. The target properties :prop_tgt:`ARCHIVE_OUTPUT_DIRECTORY`, :prop_tgt:`LIBRARY_OUTPUT_DIRECTORY`, and :prop_tgt:`RUNTIME_OUTPUT_DIRECTORY` -supercede this variable for a target if they are set. Library targets are +supersede this variable for a target if they are set. Library targets are otherwise placed in this directory. diff --git a/Modules/AndroidTestUtilities/PushToAndroidDevice.cmake b/Modules/AndroidTestUtilities/PushToAndroidDevice.cmake index 04529b1..fccff67 100644 --- a/Modules/AndroidTestUtilities/PushToAndroidDevice.cmake +++ b/Modules/AndroidTestUtilities/PushToAndroidDevice.cmake @@ -31,7 +31,7 @@ function(android_push_test_files_to_device) set(out_var ${out_var} PARENT_SCOPE) if(res_var) string(REGEX REPLACE ";" " " com "${ARGN}") - message(FATAL_ERROR "Error occured during adb command: adb ${com}\nError: ${err_var}.") + message(FATAL_ERROR "Error occurred during adb command: adb ${com}\nError: ${err_var}.") endif() endfunction() diff --git a/Modules/CMakePackageConfigHelpers.cmake b/Modules/CMakePackageConfigHelpers.cmake index 90c2a57..f5a8e59 100644 --- a/Modules/CMakePackageConfigHelpers.cmake +++ b/Modules/CMakePackageConfigHelpers.cmake @@ -154,7 +154,7 @@ # macro. # # Internally, this macro executes :command:`configure_file()` to create the -# resulting version file. Depending on the ``COMPATIBLITY``, either the file +# resulting version file. Depending on the ``COMPATIBILITY``, either the file # ``BasicConfigVersion-SameMajorVersion.cmake.in`` or # ``BasicConfigVersion-AnyNewerVersion.cmake.in`` is used. Please note that # these two files are internal to CMake and you should not call diff --git a/Modules/CPackIFW.cmake b/Modules/CPackIFW.cmake index 8d8b070..05a54a0 100644 --- a/Modules/CPackIFW.cmake +++ b/Modules/CPackIFW.cmake @@ -817,7 +817,7 @@ if(CPACK_IFW_INSTALLERBASE_EXECUTABLE AND NOT CPACK_IFW_FRAMEWORK_VERSION_FORCED endif() endif() endforeach() - # Finaly try to get version from executable path + # Finally try to get version from executable path if(NOT CPACK_IFW_FRAMEWORK_VERSION) string(REGEX MATCH "[0-9]+(\\.[0-9]+)*" CPACK_IFW_FRAMEWORK_VERSION "${CPACK_IFW_INSTALLERBASE_EXECUTABLE}") @@ -864,7 +864,7 @@ macro(_cpack_ifw_resolve_script _variable) endif() endmacro() -# Resolve full path to lisense file +# Resolve full path to license file macro(_cpack_ifw_resolve_lisenses _variable) if(${_variable}) set(_ifw_license_file FALSE) diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake index 9f77ec3..c5a27f9 100644 --- a/Modules/CPackRPM.cmake +++ b/Modules/CPackRPM.cmake @@ -545,7 +545,7 @@ # /usr/share/doc # # May be used to exclude path (directories or files) from the auto-generated -# list of paths discovered by CPack RPM. The defaut value contains a +# list of paths discovered by CPack RPM. The default value contains a # reasonable set of values if the variable is not defined by the user. If the # variable is defined by the user then CPackRPM will NOT any of the default # path. If you want to add some path to the default list then you can use @@ -782,7 +782,7 @@ # # .. note:: # -# Each source path prefix is additionaly suffixed by ``src_`` where +# Each source path prefix is additionally suffixed by ``src_`` where # index is index of the path used from :variable:`CPACK_BUILD_SOURCE_DIRS` # variable. This produces ``/src_`` # replacement path. @@ -1985,13 +1985,13 @@ function(cpack_rpm_generate_package) # CPACK_RPM_POST_INSTALL_SCRIPT_FILE (or CPACK_RPM__POST_INSTALL_SCRIPT_FILE) # CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE (or CPACK_RPM__POST_UNINSTALL_SCRIPT_FILE) # May be used to embed a post (un)installation script in the spec file. - # The refered script file(s) will be read and directly + # The referred script file(s) will be read and directly # put after the %post or %postun section # ---------------------------------------------------------------- # CPACK_RPM_PRE_INSTALL_SCRIPT_FILE (or CPACK_RPM__PRE_INSTALL_SCRIPT_FILE) # CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE (or CPACK_RPM__PRE_UNINSTALL_SCRIPT_FILE) # May be used to embed a pre (un)installation script in the spec file. - # The refered script file(s) will be read and directly + # The referred script file(s) will be read and directly # put after the %pre or %preun section foreach(RPM_SCRIPT_FILE_TYPE_ "INSTALL" "UNINSTALL") foreach(RPM_SCRIPT_FILE_TIME_ "PRE" "POST") @@ -2022,7 +2022,7 @@ function(cpack_rpm_generate_package) # CPACK_RPM_CHANGELOG_FILE # May be used to embed a changelog in the spec file. - # The refered file will be read and directly put after the %changelog section + # The referred file will be read and directly put after the %changelog section if(CPACK_RPM_CHANGELOG_FILE) if(EXISTS ${CPACK_RPM_CHANGELOG_FILE}) file(READ ${CPACK_RPM_CHANGELOG_FILE} CPACK_RPM_SPEC_CHANGELOG) @@ -2152,7 +2152,7 @@ function(cpack_rpm_generate_package) string(STRIP "${CPACK_RPM_INSTALL_FILES}" CPACK_RPM_INSTALL_FILES_LIST) # Transform endline separated - string into CMake List string(REPLACE "\n" ";" CPACK_RPM_INSTALL_FILES_LIST "${CPACK_RPM_INSTALL_FILES_LIST}") - # Remove unecessary quotes + # Remove unnecessary quotes string(REPLACE "\"" "" CPACK_RPM_INSTALL_FILES_LIST "${CPACK_RPM_INSTALL_FILES_LIST}") # Remove ABSOLUTE install file from INSTALL FILE LIST list(REMOVE_ITEM CPACK_RPM_INSTALL_FILES_LIST ${CPACK_ABSOLUTE_DESTINATION_FILES_INTERNAL}) @@ -2413,7 +2413,7 @@ ${TMP_DEBUGINFO_ADDITIONAL_SOURCES} endif() # Disable debuginfo packages - srpm generates invalid packages due to - # releasing controll to cpack to generate binary packages. + # releasing control to cpack to generate binary packages. # Note however that this doesn't prevent cpack to generate debuginfo # packages when run from srpm with --rebuild. set(TMP_RPM_DISABLE_DEBUGINFO "%define debug_package %{nil}") diff --git a/Modules/CTest.cmake b/Modules/CTest.cmake index 9370596..a08282e 100644 --- a/Modules/CTest.cmake +++ b/Modules/CTest.cmake @@ -65,7 +65,7 @@ endfunction() include(CTestUseLaunchers) if(BUILD_TESTING) - # Setup some auxilary macros + # Setup some auxiliary macros macro(SET_IF_NOT_SET var val) if(NOT DEFINED "${var}") set("${var}" "${val}") diff --git a/Modules/Compiler/IAR-FindBinUtils.cmake b/Modules/Compiler/IAR-FindBinUtils.cmake index 2b04795..b29ee81 100644 --- a/Modules/Compiler/IAR-FindBinUtils.cmake +++ b/Modules/Compiler/IAR-FindBinUtils.cmake @@ -17,7 +17,7 @@ if("${CMAKE_C_COMPILER_ARCHITECTURE_ID}" STREQUAL "ARM") find_program(CMAKE_IAR_ARCHIVE iarchive.exe HINTS ${__iar_hints} DOC "The IAR archiver") - # find auxillary tools + # find auxiliary tools find_program(CMAKE_IAR_ELFTOOL ielftool.exe HINTS ${__iar_hints} DOC "The IAR ELF Tool") find_program(CMAKE_IAR_ELFDUMP ielfdumparm.exe HINTS ${__iar_hints} diff --git a/Modules/Compiler/IAR.cmake b/Modules/Compiler/IAR.cmake index 52ebaf2..43243b9 100644 --- a/Modules/Compiler/IAR.cmake +++ b/Modules/Compiler/IAR.cmake @@ -29,7 +29,7 @@ # "Silent" Operation # # this really is different to most programs I know. -# nothing meaningfull from the operation is lost, just some redundant +# nothing meaningful from the operation is lost, just some redundant # code and data size printouts (that can be inspected with common tools). # This module is shared by multiple languages; use include blocker. diff --git a/Modules/Documentation.cmake b/Modules/Documentation.cmake index fc398e6..6e21249 100644 --- a/Modules/Documentation.cmake +++ b/Modules/Documentation.cmake @@ -40,7 +40,7 @@ if (BUILD_DOCUMENTATION) ) # - # The documentation process is controled by a batch file. + # The documentation process is controlled by a batch file. # We will probably need bash to create the custom target # diff --git a/Modules/FeatureSummary.cmake b/Modules/FeatureSummary.cmake index 1b93304..fbce235 100644 --- a/Modules/FeatureSummary.cmake +++ b/Modules/FeatureSummary.cmake @@ -493,7 +493,7 @@ endfunction() by the project when available at buildtime, but it also work without. ``RECOMMENDED`` is similar to ``OPTIONAL``, i.e. the project will build if the package is not present, but the functionality of the resulting - binaries will be severly limited. If a ``REQUIRED`` package is not + binaries will be severely limited. If a ``REQUIRED`` package is not available at buildtime, the project may not even build. This can be combined with the ``FATAL_ON_MISSING_REQUIRED_PACKAGES`` argument for ``feature_summary()``. Last, a ``RUNTIME`` package is a package which is diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake index d177e5e..8708938 100644 --- a/Modules/FindCUDA.cmake +++ b/Modules/FindCUDA.cmake @@ -581,7 +581,7 @@ mark_as_advanced( # Makefile and similar generators don't define CMAKE_CONFIGURATION_TYPES, so we # need to add another entry for the CMAKE_BUILD_TYPE. We also need to add the # standerd set of 4 build types (Debug, MinSizeRel, Release, and RelWithDebInfo) -# for completeness. We need run this loop in order to accomodate the addition +# for completeness. We need run this loop in order to accommodate the addition # of extra configuration types. Duplicate entries will be removed by # REMOVE_DUPLICATES. set(CUDA_configuration_types ${CMAKE_CONFIGURATION_TYPES} ${CMAKE_BUILD_TYPE} Debug MinSizeRel Release RelWithDebInfo) diff --git a/Modules/FindCUDA/run_nvcc.cmake b/Modules/FindCUDA/run_nvcc.cmake index f78119d..86051cf 100644 --- a/Modules/FindCUDA/run_nvcc.cmake +++ b/Modules/FindCUDA/run_nvcc.cmake @@ -181,7 +181,7 @@ cuda_execute_process( set(depends_CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS}") set(CUDA_VERSION @CUDA_VERSION@) if(CUDA_VERSION VERSION_LESS "3.0") - # Note that this will remove all occurances of -G. + # Note that this will remove all occurrences of -G. list(REMOVE_ITEM depends_CUDA_NVCC_FLAGS "-G") endif() diff --git a/Modules/FindCxxTest.cmake b/Modules/FindCxxTest.cmake index 9ba1ff3..2aa5f6f 100644 --- a/Modules/FindCxxTest.cmake +++ b/Modules/FindCxxTest.cmake @@ -145,7 +145,7 @@ # # Version 1.3 (8/19/10) (CMake 2.8.3) # Included patch by Simone Rossetto to check if either Python or Perl -# are present in the system. Whichever intepreter that is detected +# are present in the system. Whichever interpreter that is detected # is now used to run the test generator program. If both interpreters # are detected, the CXXTEST_USE_PYTHON variable is obeyed. # diff --git a/Modules/FindDCMTK.cmake b/Modules/FindDCMTK.cmake index 0d86e8e..f348d3a 100644 --- a/Modules/FindDCMTK.cmake +++ b/Modules/FindDCMTK.cmake @@ -217,7 +217,7 @@ if(EXISTS ${DCMTK_DIR}/CMakeCache.txt) if(NOT EXISTS ${EXTDCMTK_SOURCE_DIR}) message(FATAL_ERROR "DCMTK build directory references -nonexistant DCMTK source directory ${EXTDCMTK_SOURCE_DIR}") +nonexistent DCMTK source directory ${EXTDCMTK_SOURCE_DIR}") endif() endif() diff --git a/Modules/FindDevIL.cmake b/Modules/FindDevIL.cmake index f6c8e3f..e904a30 100644 --- a/Modules/FindDevIL.cmake +++ b/Modules/FindDevIL.cmake @@ -70,5 +70,5 @@ find_library(ILU_LIBRARIES FIND_PACKAGE_HANDLE_STANDARD_ARGS(DevIL DEFAULT_MSG IL_LIBRARIES ILU_LIBRARIES IL_INCLUDE_DIR) -# provide legacy variable for compatiblity +# provide legacy variable for compatibility set(IL_FOUND ${DevIL_FOUND}) diff --git a/Modules/FindFLEX.cmake b/Modules/FindFLEX.cmake index fef7fb4..3945b78 100644 --- a/Modules/FindFLEX.cmake +++ b/Modules/FindFLEX.cmake @@ -52,7 +52,7 @@ # # # -# Flex scanners oftenly use tokens defined by Bison: the code generated +# Flex scanners often use tokens defined by Bison: the code generated # by Flex depends of the header generated by Bison. This module also # defines a macro: # diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake index de20049..012ae22 100644 --- a/Modules/FindHDF5.cmake +++ b/Modules/FindHDF5.cmake @@ -479,7 +479,7 @@ if(NOT HDF5_FOUND AND NOT HDF5_NO_FIND_PACKAGE_CONFIG_FILE) #if we detect that occurrence clear the suffix if(_suffix AND NOT TARGET ${HDF5_${_lang}_TARGET}${_suffix}) if(NOT TARGET ${HDF5_${_lang}_TARGET}) - #cant find this component with or without the suffix + #can't find this component with or without the suffix #so bail out, and let the following locate HDF5 set(HDF5_FOUND FALSE) break() diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake index cebba10..96e3e21 100644 --- a/Modules/FindJNI.cmake +++ b/Modules/FindJNI.cmake @@ -25,7 +25,7 @@ # JAVA_INCLUDE_PATH2 = the include path to jni_md.h # JAVA_AWT_INCLUDE_PATH = the include path to jawt.h -# Expand {libarch} occurences to java_libarch subdirectory(-ies) and set ${_var} +# Expand {libarch} occurrences to java_libarch subdirectory(-ies) and set ${_var} macro(java_append_library_directories _var) # Determine java arch-specific library subdir # Mostly based on openjdk/jdk/make/common/shared/Platform.gmk as of openjdk @@ -46,7 +46,7 @@ macro(java_append_library_directories _var) set(_java_libarch "arm" "aarch32") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^mips") # mips* machines are bi-endian mostly so processor does not tell - # endianess of the underlying system. + # endianness of the underlying system. set(_java_libarch "${CMAKE_SYSTEM_PROCESSOR}" "mips" "mipsel" "mipseb" "mips64" "mips64el" "mipsn32" "mipsn32el") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)64le") set(_java_libarch "ppc64" "ppc64le") diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake index 7d4ed6a..c79642d 100644 --- a/Modules/FindMatlab.cmake +++ b/Modules/FindMatlab.cmake @@ -1198,7 +1198,7 @@ if(_numbers_of_matlab_roots EQUAL 0) # At this point, we have no other choice than trying to find it from PATH. - # If set by the user, this wont change + # If set by the user, this won't change find_program( _matlab_main_tmp NAMES matlab) diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake index 0187e0d..c358ff1 100644 --- a/Modules/FindOpenSSL.cmake +++ b/Modules/FindOpenSSL.cmake @@ -110,7 +110,7 @@ if(WIN32 AND NOT CYGWIN) # * MTd for static-debug # Implementation details: - # We are using the libraries located in the VC subdir instead of the parent directory eventhough : + # We are using the libraries located in the VC subdir instead of the parent directory even though : # libeay32MD.lib is identical to ../libeay32.lib, and # ssleay32MD.lib is identical to ../ssleay32.lib # enable OPENSSL_USE_STATIC_LIBS to use the static libs located in lib/VC/static diff --git a/Modules/FindTCL.cmake b/Modules/FindTCL.cmake index b6e24a3..a711493 100644 --- a/Modules/FindTCL.cmake +++ b/Modules/FindTCL.cmake @@ -26,7 +26,7 @@ # # # In an effort to remove some clutter and clear up some issues for -# people who are not necessarily Tcl/Tk gurus/developpers, some +# people who are not necessarily Tcl/Tk gurus/developers, some # variables were moved or removed. Changes compared to CMake 2.4 are: # # :: diff --git a/Modules/FindTclStub.cmake b/Modules/FindTclStub.cmake index 9711bd6..51fc029 100644 --- a/Modules/FindTclStub.cmake +++ b/Modules/FindTclStub.cmake @@ -32,7 +32,7 @@ # # # In an effort to remove some clutter and clear up some issues for -# people who are not necessarily Tcl/Tk gurus/developpers, some +# people who are not necessarily Tcl/Tk gurus/developers, some # variables were moved or removed. Changes compared to CMake 2.4 are: # # :: diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake index be84999..e08afe4 100644 --- a/Modules/FindwxWidgets.cmake +++ b/Modules/FindwxWidgets.cmake @@ -915,7 +915,7 @@ if (_wx_lib_missing) endif() unset(_wx_lib_missing) -# Check if a specfic version was requested by find_package(). +# Check if a specific version was requested by find_package(). if(wxWidgets_FOUND) find_file(_filename wx/version.h PATHS ${wxWidgets_INCLUDE_DIRS} NO_DEFAULT_PATH) dbg_msg("_filename: ${_filename}") diff --git a/Modules/FindwxWindows.cmake b/Modules/FindwxWindows.cmake index 76eb6be..054a1bf 100644 --- a/Modules/FindwxWindows.cmake +++ b/Modules/FindwxWindows.cmake @@ -390,7 +390,7 @@ if(WIN32_STYLE_FIND) if (NOT WXWINDOWS_USE_SHARED_LIBS) set(WXWINDOWS_LIBRARIES ${WXWINDOWS_LIBRARIES} - ## these ones dont seem required, in particular ctl3d32 is not neccesary (Jan Woetzel 07/2003) + ## these ones don't seem required, in particular ctl3d32 is not necessary (Jan Woetzel 07/2003) # ctl3d32 debug ${WXWINDOWS_STATIC_DEBUG_LIBRARY_ZLIB} optimized ${WXWINDOWS_STATIC_LIBRARY_ZLIB} debug ${WXWINDOWS_STATIC_DEBUG_LIBRARY_REGEX} optimized ${WXWINDOWS_STATIC_LIBRARY_REGEX} @@ -546,7 +546,7 @@ if(WIN32_STYLE_FIND) endif() - ## not neccessary in wxWindows 2.4.1 and 2.6.2 + ## not necessary in wxWindows 2.4.1 and 2.6.2 ## but it may fix a previous bug, see ## http://lists.wxwindows.org/cgi-bin/ezmlm-cgi?8:mss:37574:200305:mpdioeneabobmgjenoap option(WXWINDOWS_SET_DEFINITIONS "Set additional defines for wxWindows" OFF) diff --git a/Modules/ITKCompatibility.cmake b/Modules/ITKCompatibility.cmake index fef0653..7d211b6 100644 --- a/Modules/ITKCompatibility.cmake +++ b/Modules/ITKCompatibility.cmake @@ -2,6 +2,6 @@ # file Copyright.txt or https://cmake.org/licensing for details. -# work around an old bug in ITK prior to verison 3.0 +# work around an old bug in ITK prior to version 3.0 set(TIFF_RIGHT_VERSION 1) diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake index 0478918..aee4028 100644 --- a/Modules/Qt4Macros.cmake +++ b/Modules/Qt4Macros.cmake @@ -151,7 +151,7 @@ macro (QT4_GENERATE_MOC infile outfile ) set(moc_target ${ARGV3}) endif() QT4_CREATE_MOC_COMMAND(${abs_infile} ${_outfile} "${moc_flags}" "" "${moc_target}") - set_source_files_properties(${outfile} PROPERTIES SKIP_AUTOMOC TRUE) # dont run automoc on this file + set_source_files_properties(${outfile} PROPERTIES SKIP_AUTOMOC TRUE) # don't run automoc on this file endmacro () diff --git a/Modules/SquishTestScript.cmake b/Modules/SquishTestScript.cmake index cfdfaec..c0e1bea 100644 --- a/Modules/SquishTestScript.cmake +++ b/Modules/SquishTestScript.cmake @@ -34,7 +34,7 @@ message(STATUS "squish_settingsgroup='${squish_settingsgroup}'") message(STATUS "squish_pre_command='${squish_pre_command}'") message(STATUS "squish_post_command='${squish_post_command}'") -# parse enviornment variables +# parse environment variables foreach(i ${squish_env_vars}) message(STATUS "parsing env var key/value pair ${i}") string(REGEX MATCH "([^=]*)=(.*)" squish_env_name ${i}) diff --git a/Modules/UseEcos.cmake b/Modules/UseEcos.cmake index 942bc38..700bfe6 100644 --- a/Modules/UseEcos.cmake +++ b/Modules/UseEcos.cmake @@ -181,7 +181,7 @@ macro(ECOS_ADD_EXECUTABLE _exe_NAME ) #the executable depends on ecos target.ld ECOS_ADD_TARGET_LIB(${ARGN}) -# when using nmake makefiles, the custom buildtype supresses the default cl.exe flags +# when using nmake makefiles, the custom buildtype suppresses the default cl.exe flags # and the rules for creating objects are adjusted for gcc set(CMAKE_BUILD_TYPE CUSTOM_ECOS_BUILD) set(CMAKE_C_COMPILE_OBJECT " -o