[Cmake-commits] CMake branch, next, updated. v3.7.0-rc3-942-g998cbca
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake". The branch, next has been updated via 998cbca769bb7cedf28bd1d77c51b0de63f1913c (commit) via 0cd654c8e23b19311bae876ada4ad5b432c1ad1b (commit) from 2c62af2d4bc7c5f1d66869b49da138f76586c155 (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=998cbca769bb7cedf28bd1d77c51b0de63f1913c commit 998cbca769bb7cedf28bd1d77c51b0de63f1913c Merge: 2c62af2 0cd654c Author: Daniel PfeiferAuthorDate: Sat Nov 5 19:12:03 2016 -0400 Commit: CMake Topic Stage CommitDate: Sat Nov 5 19:12:03 2016 -0400 Merge topic 'clang-tidy' into next 0cd654c8 cmGeneratorTarget: Correctly set FortranModuleDirectoryCreated https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0cd654c8e23b19311bae876ada4ad5b432c1ad1b commit 0cd654c8e23b19311bae876ada4ad5b432c1ad1b Author: Daniel Pfeifer AuthorDate: Sun Nov 6 00:11:03 2016 +0100 Commit: Daniel Pfeifer CommitDate: Sun Nov 6 00:11:03 2016 +0100 cmGeneratorTarget: Correctly set FortranModuleDirectoryCreated diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index ca3e373..f5db7f6 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -3947,6 +3947,7 @@ std::string cmGeneratorTarget::GetFortranModuleDirectory( if (!this->FortranModuleDirectoryCreated) { this->FortranModuleDirectory = this->CreateFortranModuleDirectory(working_dir); +this->FortranModuleDirectoryCreated = true; } return this->FortranModuleDirectory; --- Summary of changes: Source/cmGeneratorTarget.cxx |1 + 1 file changed, 1 insertion(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc3-940-g2c62af2
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake". The branch, next has been updated via 2c62af2d4bc7c5f1d66869b49da138f76586c155 (commit) via bac93dcf192d8680cd72570682d6593da9818088 (commit) via 1e994985d83b09d71b4928a61a75d1cf3861aaec (commit) via 5ae3966d75593b05a9658af8d2fdd47c2bf48a4d (commit) via 443180fb9915eefe0b232875505632ffb9fabb95 (commit) from 6dacf55a79b849ccefb468166d012686b1ed3a18 (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=2c62af2d4bc7c5f1d66869b49da138f76586c155 commit 2c62af2d4bc7c5f1d66869b49da138f76586c155 Merge: 6dacf55 bac93dc Author: Daniel PfeiferAuthorDate: Sat Nov 5 18:56:12 2016 -0400 Commit: CMake Topic Stage CommitDate: Sat Nov 5 18:56:12 2016 -0400 Merge topic 'clang-tidy' into next bac93dcf cmGeneratorTarget: Don't assing a bool to a string 1e994985 cmGlobalNinjaGenerator: Suppress clang-tidy warning 5ae3966d cmCTestSubmitHandler: Remove redundant c_str() 443180fb cmCPluginAPI: Fix clang-tidy findings https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bac93dcf192d8680cd72570682d6593da9818088 commit bac93dcf192d8680cd72570682d6593da9818088 Author: Daniel Pfeifer AuthorDate: Sat Nov 5 23:54:57 2016 +0100 Commit: Daniel Pfeifer CommitDate: Sat Nov 5 23:54:57 2016 +0100 cmGeneratorTarget: Don't assing a bool to a string diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index ca056c0..ca3e373 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -3945,7 +3945,6 @@ std::string cmGeneratorTarget::GetFortranModuleDirectory( std::string const& working_dir) const { if (!this->FortranModuleDirectoryCreated) { -this->FortranModuleDirectory = true; this->FortranModuleDirectory = this->CreateFortranModuleDirectory(working_dir); } https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e994985d83b09d71b4928a61a75d1cf3861aaec commit 1e994985d83b09d71b4928a61a75d1cf3861aaec Author: Daniel Pfeifer AuthorDate: Sat Nov 5 23:51:30 2016 +0100 Commit: Daniel Pfeifer CommitDate: Sat Nov 5 23:51:30 2016 +0100 cmGlobalNinjaGenerator: Suppress clang-tidy warning diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 830ab7f..22de7c4 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -130,7 +130,7 @@ std::string cmGlobalNinjaGenerator::EncodeLiteral(const std::string& lit) std::string cmGlobalNinjaGenerator::EncodePath(const std::string& path) { - std::string result = path; + std::string result = path; // NOLINT(clang-tidy) #ifdef _WIN32 if (this->IsGCCOnWindows()) std::replace(result.begin(), result.end(), '\\', '/'); @@ -283,7 +283,7 @@ void cmGlobalNinjaGenerator::WriteCustomCommandBuild( bool restat, const cmNinjaDeps& outputs, const cmNinjaDeps& deps, const cmNinjaDeps& orderOnly) { - std::string cmd = command; + std::string cmd = command; // NOLINT(clang-tidy) #ifdef _WIN32 if (cmd.empty()) // TODO Shouldn't an empty command be handled by ninja? https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ae3966d75593b05a9658af8d2fdd47c2bf48a4d commit 5ae3966d75593b05a9658af8d2fdd47c2bf48a4d Author: Daniel Pfeifer AuthorDate: Sat Nov 5 23:46:24 2016 +0100 Commit: Daniel Pfeifer CommitDate: Sat Nov 5 23:46:24 2016 +0100 cmCTestSubmitHandler: Remove redundant c_str() diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx index d21471d..d10f7ad 100644 --- a/Source/CTest/cmCTestSubmitHandler.cxx +++ b/Source/CTest/cmCTestSubmitHandler.cxx @@ -926,7 +926,7 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC( return false; } size_t fileSize = static_cast(st.st_size); -FILE* fp = cmsys::SystemTools::Fopen(local_file.c_str(), "rb"); +FILE* fp = cmsys::SystemTools::Fopen(local_file, "rb"); if (!fp) { cmCTestLog(this->CTest, ERROR_MESSAGE, " Cannot open file: " << local_file << std::endl); https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=443180fb9915eefe0b232875505632ffb9fabb95 commit 443180fb9915eefe0b232875505632ffb9fabb95 Author: Daniel Pfeifer AuthorDate: Sat Nov 5 23:44:29 2016 +0100 Commit: Daniel Pfeifer CommitDate: Sat Nov 5 23:44:29 2016 +0100 cmCPluginAPI: Fix clang-tidy findings diff --git
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc3-935-g6dacf55
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake". The branch, next has been updated via 6dacf55a79b849ccefb468166d012686b1ed3a18 (commit) via 0ee7b4132a7ef9c2eca46a7268a718132fa31cb2 (commit) from 166cd2c80d14149698a3b9f39d2973defaa8af8f (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=6dacf55a79b849ccefb468166d012686b1ed3a18 commit 6dacf55a79b849ccefb468166d012686b1ed3a18 Merge: 166cd2c 0ee7b41 Author: Daniel PfeiferAuthorDate: Sat Nov 5 18:32:37 2016 -0400 Commit: CMake Topic Stage CommitDate: Sat Nov 5 18:32:37 2016 -0400 Merge topic 'include-what-you-use' into next 0ee7b413 Fixup! Fix several include-what-you-use findings https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0ee7b4132a7ef9c2eca46a7268a718132fa31cb2 commit 0ee7b4132a7ef9c2eca46a7268a718132fa31cb2 Author: Daniel Pfeifer AuthorDate: Sat Nov 5 23:32:21 2016 +0100 Commit: Daniel Pfeifer CommitDate: Sat Nov 5 23:32:21 2016 +0100 Fixup! Fix several include-what-you-use findings diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx index 9038469..5e03c39 100644 --- a/Source/QtDialog/CMakeSetup.cxx +++ b/Source/QtDialog/CMakeSetup.cxx @@ -5,6 +5,7 @@ #include "CMakeSetupDialog.h" #include "cmAlgorithms.h" #include "cmDocumentation.h" +#include "cmDocumentationEntry.h" #include "cmVersion.h" #include "cmake.h" #include @@ -17,6 +18,7 @@ #include #include #include +#include #include "cmSystemTools.h" // IWYU pragma: keep --- Summary of changes: Source/QtDialog/CMakeSetup.cxx |2 ++ 1 file changed, 2 insertions(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc3-933-g166cd2c
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake". The branch, next has been updated via 166cd2c80d14149698a3b9f39d2973defaa8af8f (commit) via 7e58067e3820cb79780adb0847bc90fb081e8206 (commit) from 838fd5c3ecc961323affd2a890ff3421edc82f08 (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=166cd2c80d14149698a3b9f39d2973defaa8af8f commit 166cd2c80d14149698a3b9f39d2973defaa8af8f Merge: 838fd5c 7e58067 Author: Daniel PfeiferAuthorDate: Sat Nov 5 18:15:41 2016 -0400 Commit: CMake Topic Stage CommitDate: Sat Nov 5 18:15:41 2016 -0400 Merge topic 'include-what-you-use' into next 7e58067e Fix several include-what-you-use findings diff --cc Source/cmGlobalGenerator.cxx index 42e9df1,2d0767f..fa447ff --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@@ -33,20 -44,10 +44,10 @@@ #include "cmVersion.h" #include "cmake.h" - #include - #include - #include - #include - #include - #include - #include - #include - #include - #if defined(CMAKE_BUILD_WITH_CMAKE) +#include "cmCryptoHash.h" #include #include -#include #endif class cmInstalledFile; https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7e58067e3820cb79780adb0847bc90fb081e8206 commit 7e58067e3820cb79780adb0847bc90fb081e8206 Author: Daniel Pfeifer AuthorDate: Sat Nov 5 21:40:14 2016 +0100 Commit: Daniel Pfeifer CommitDate: Sat Nov 5 23:04:23 2016 +0100 Fix several include-what-you-use findings diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx index 7ee0f75..08ea4ee 100644 --- a/Source/CTest/cmCTestScriptHandler.cxx +++ b/Source/CTest/cmCTestScriptHandler.cxx @@ -22,6 +22,7 @@ #include "cmGlobalGenerator.h" #include "cmMakefile.h" #include "cmState.h" +#include "cmStateDirectory.h" #include "cmStateTypes.h" #include "cmSystemTools.h" #include "cmake.h" diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h index aa55379..22f69fa 100644 --- a/Source/cmAlgorithms.h +++ b/Source/cmAlgorithms.h @@ -3,9 +3,17 @@ #ifndef cmAlgorithms_h #define cmAlgorithms_h -#include - -#include "cmStandardIncludes.h" +#include // IWYU pragma: keep + +#include +#include +#include +#include +#include +#include +#include +#include +#include inline bool cmHasLiteralPrefixImpl(const std::string& str1, const char* str2, size_t N) diff --git a/Source/cmCMakeMinimumRequired.cxx b/Source/cmCMakeMinimumRequired.cxx index 655c42a..942688c 100644 --- a/Source/cmCMakeMinimumRequired.cxx +++ b/Source/cmCMakeMinimumRequired.cxx @@ -2,9 +2,15 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCMakeMinimumRequired.h" +#include +#include + #include "cmMakefile.h" #include "cmSystemTools.h" #include "cmVersion.h" +#include "cmake.h" + +class cmExecutionStatus; // cmCMakeMinimumRequired bool cmCMakeMinimumRequired::InitialPass(std::vector const& args, diff --git a/Source/cmCMakeMinimumRequired.h b/Source/cmCMakeMinimumRequired.h index 3acedd2..08a5c38 100644 --- a/Source/cmCMakeMinimumRequired.h +++ b/Source/cmCMakeMinimumRequired.h @@ -3,8 +3,14 @@ #ifndef cmCMakeMinimumRequired_h #define cmCMakeMinimumRequired_h +#include +#include +#include + #include "cmCommand.h" +class cmExecutionStatus; + /** \class cmCMakeMinimumRequired * \brief cmake_minimum_required command * diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 024260c..010fc4e 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -2,6 +2,27 @@ file Copyright.txt or https://cmake.org/licensing for details. */ #include "cmCTest.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "cmAlgorithms.h" #include "cmCTestBuildAndTestHandler.h" #include "cmCTestBuildHandler.h" @@ -21,35 +42,15 @@ #include "cmGlobalGenerator.h" #include "cmMakefile.h" #include "cmState.h" +#include "cmStateSnapshot.h" #include "cmStateTypes.h" #include "cmSystemTools.h" #include "cmVersion.h" #include "cmVersionConfig.h" #include "cmXMLWriter.h" +#include "cm_auto_ptr.hxx" #include "cmake.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #if
[Cmake-commits] CMake branch, next, updated. v3.7.0-rc3-931-g838fd5c
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake". The branch, next has been updated via 838fd5c3ecc961323affd2a890ff3421edc82f08 (commit) via b34c045736384fc3ba8574b33211bd75082bc07b (commit) via cd0423300bea21a5c0747a6aeaefbae24c10ecd8 (commit) via 228280d8334f2bcac346e5f0d3ea802af7f22862 (commit) via d8e83ab979b0ccfc4887dbf48c088a72dffb2e96 (commit) via f52bcc2ac1b3dddeca2320d8320a9406101c732d (commit) from 996e95b07cd311e88c77d245d5f532d1b6c7fbd4 (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=838fd5c3ecc961323affd2a890ff3421edc82f08 commit 838fd5c3ecc961323affd2a890ff3421edc82f08 Merge: 996e95b b34c045 Author: Domen VrankarAuthorDate: Sat Nov 5 07:00:35 2016 -0400 Commit: CMake Topic Stage CommitDate: Sat Nov 5 07:00:35 2016 -0400 Merge topic 'cpack-rpm-omit-unsupported-tags' into next b34c0457 Release text for omitting unsupported tags topic cd042330 CPack/RPM test for Suggests tag 228280d8 CPack/RPM prevent special tags from being removed d8e83ab9 CPack/RPM omit unsupported tags f52bcc2a CMake Nightly Date Stamp https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b34c045736384fc3ba8574b33211bd75082bc07b commit b34c045736384fc3ba8574b33211bd75082bc07b Author: Domen Vrankar AuthorDate: Sat Nov 5 11:52:30 2016 +0100 Commit: Domen Vrankar CommitDate: Sat Nov 5 11:53:30 2016 +0100 Release text for omitting unsupported tags topic diff --git a/Help/release/dev/cpack-rpm-omit-unsupported-tags.rst b/Help/release/dev/cpack-rpm-omit-unsupported-tags.rst new file mode 100644 index 000..abcb7a6 --- /dev/null +++ b/Help/release/dev/cpack-rpm-omit-unsupported-tags.rst @@ -0,0 +1,8 @@ +cpack-rpm-omit-unsupported-tags +--- + +* The :module:`CPackRPM` module learned to omit + tags that are not supported by provided + rpmbuild tool. If unsupported tags are set + they are ignored and a developer warning is + printed out. https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cd0423300bea21a5c0747a6aeaefbae24c10ecd8 commit cd0423300bea21a5c0747a6aeaefbae24c10ecd8 Author: Alexander Adam AuthorDate: Sat Nov 5 11:36:12 2016 +0100 Commit: Domen Vrankar CommitDate: Sat Nov 5 11:44:32 2016 +0100 CPack/RPM test for Suggests tag Suggests tag was not present in older versions of rpmbuild so we test that the rpm package is always generated either with Suggests tag present or skipped if not supported. diff --git a/Tests/RunCMake/CPack/RPM/RPM_SUGGESTS-ExpectedFiles.cmake b/Tests/RunCMake/CPack/RPM/RPM_SUGGESTS-ExpectedFiles.cmake new file mode 100644 index 000..02ebb44 --- /dev/null +++ b/Tests/RunCMake/CPack/RPM/RPM_SUGGESTS-ExpectedFiles.cmake @@ -0,0 +1,5 @@ +set(whitespaces_ "[\t\n\r ]*") + +set(EXPECTED_FILES_COUNT "1") +set(EXPECTED_FILE_1 "rpm_suggests*.rpm") +set(EXPECTED_FILE_CONTENT_1 "^/usr/foo${whitespaces_}/usr/foo/CMakeLists.txt$") diff --git a/Tests/RunCMake/CPack/RPM/RPM_SUGGESTS-VerifyResult.cmake b/Tests/RunCMake/CPack/RPM/RPM_SUGGESTS-VerifyResult.cmake new file mode 100644 index 000..32cc6d1 --- /dev/null +++ b/Tests/RunCMake/CPack/RPM/RPM_SUGGESTS-VerifyResult.cmake @@ -0,0 +1,31 @@ +execute_process(COMMAND ${RPMBUILD_EXECUTABLE} --querytags +OUTPUT_VARIABLE RPMBUILD_CAPS +RESULT_VARIABLE RPMBUILD_CAPS_RESULT) + +if(NOT RPMBUILD_CAPS_RESULT) + string(REPLACE "\n" ";" RPMBUILD_CAPS "${RPMBUILD_CAPS}") + cmake_policy(PUSH) +cmake_policy(SET CMP0057 NEW) +if(SUGGESTS IN_LIST RPMBUILD_CAPS) + set(should_contain_suggests_tag_ true) +endif() + cmake_policy(POP) +endif() + +# Only verify that suggests tag is present only if that tag is supported. +# If it is not supported the rpm package was corretly generated by ignoring +# that tag and that was already checked by expected files test. +if(should_contain_suggests_tag_) + execute_process(COMMAND ${RPM_EXECUTABLE} -q --suggests -p "${FOUND_FILE_1}" + WORKING_DIRECTORY "${CPACK_TEMPORARY_DIRECTORY}" + RESULT_VARIABLE rpm_result_ + OUTPUT_VARIABLE rpm_output_ + ERROR_VARIABLE error_variable_ + OUTPUT_STRIP_TRAILING_WHITESPACE) + + if(rpm_result_ OR NOT rpm_output_ STREQUAL "libsuggested") +message(FATAL_ERROR "RPM_SUGGESTED package error: no suggested packages" +" (result: '${rpm_result_}'; output: '${rpm_output_}';" +"