From kwrobot at kitware.com Mon Feb 1 00:01:06 2016 From: kwrobot at kitware.com (Kitware Robot) Date: Mon, 1 Feb 2016 00:01:06 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.4.3-916-ge18d0df Message-ID: <20160201050106.75D78E4CDB@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 e18d0df5ed7170b9cc4eafa9f73c6605cc9b4107 (commit) from 13b4ef24e1abd69b4fd8eec55772670a85bd5aa8 (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=e18d0df5ed7170b9cc4eafa9f73c6605cc9b4107 commit e18d0df5ed7170b9cc4eafa9f73c6605cc9b4107 Author: Kitware Robot AuthorDate: Mon Feb 1 00:01:03 2016 -0500 Commit: Kitware Robot CommitDate: Mon Feb 1 00:01:03 2016 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 7e713e4..e147247 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 4) -set(CMake_VERSION_PATCH 20160131) +set(CMake_VERSION_PATCH 20160201) #set(CMake_VERSION_RC 1) ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Mon Feb 1 10:33:56 2016 From: brad.king at kitware.com (Brad King) Date: Mon, 1 Feb 2016 10:33:56 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.4.3-2117-g4ca6b8b Message-ID: <20160201153356.82FB0E4FDB@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, next has been updated via 4ca6b8b949f0fc01122407f5dfc1ab080f7d06a3 (commit) via 6ffc4323670f3671f262b3e9f035f1ea3f714986 (commit) from 991d04a395868caa7a33a0ddac9333641ec3295b (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=4ca6b8b949f0fc01122407f5dfc1ab080f7d06a3 commit 4ca6b8b949f0fc01122407f5dfc1ab080f7d06a3 Merge: 991d04a 6ffc432 Author: Brad King AuthorDate: Mon Feb 1 10:33:55 2016 -0500 Commit: CMake Topic Stage CommitDate: Mon Feb 1 10:33:55 2016 -0500 Merge topic 'fix-CMAKE_MATCH-self-match' into next 6ffc4323 cmConditionEvaluator: Fix matching of `CMAKE_MATCH_*` values (#15944) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6ffc4323670f3671f262b3e9f035f1ea3f714986 commit 6ffc4323670f3671f262b3e9f035f1ea3f714986 Author: Brad King AuthorDate: Mon Feb 1 09:49:08 2016 -0500 Commit: Brad King CommitDate: Mon Feb 1 10:05:10 2016 -0500 cmConditionEvaluator: Fix matching of `CMAKE_MATCH_*` values (#15944) While evaluating `if(MATCHES)` we get a `const char*` pointer to the string to be matched. On code like if(CMAKE_MATCH_COUNT MATCHES "Y") the string to be matched may be owned by our own result variables. We must move the value to our own buffer before clearing them. Otherwise we risk reading freed storage. diff --git a/Source/cmConditionEvaluator.cxx b/Source/cmConditionEvaluator.cxx index 5330acd..6a0ebec 100644 --- a/Source/cmConditionEvaluator.cxx +++ b/Source/cmConditionEvaluator.cxx @@ -12,6 +12,7 @@ #include "cmConditionEvaluator.h" #include "cmOutputConverter.h" +#include "cmAlgorithms.h" cmConditionEvaluator::cmConditionEvaluator(cmMakefile& makefile, const cmListFileContext &context, @@ -578,6 +579,7 @@ bool cmConditionEvaluator::HandleLevel2(cmArgumentList &newArgs, cmake::MessageType &status) { int reducible; + std::string def_buf; const char *def; const char *def2; do @@ -594,6 +596,14 @@ bool cmConditionEvaluator::HandleLevel2(cmArgumentList &newArgs, IsKeyword("MATCHES", *argP1)) { def = this->GetVariableOrString(*arg); + if (def != arg->c_str() // yes, we compare the pointer value + && cmHasLiteralPrefix(arg->GetValue(), "CMAKE_MATCH_")) + { + // The string to match is owned by our match result variables. + // Move it to our own buffer before clearing them. + def_buf = def; + def = def_buf.c_str(); + } const char* rex = argP2->c_str(); this->Makefile.ClearMatches(); cmsys::RegularExpression regEntry; diff --git a/Tests/RunCMake/if/MatchesSelf.cmake b/Tests/RunCMake/if/MatchesSelf.cmake new file mode 100644 index 0000000..3131ac4 --- /dev/null +++ b/Tests/RunCMake/if/MatchesSelf.cmake @@ -0,0 +1,4 @@ +foreach(n 0 1 2 3 4 5 6 7 8 9 COUNT) + if(CMAKE_MATCH_${n} MATCHES "x") + endif() +endforeach() diff --git a/Tests/RunCMake/if/RunCMakeTest.cmake b/Tests/RunCMake/if/RunCMakeTest.cmake index 3f4d2a2..077d00a 100644 --- a/Tests/RunCMake/if/RunCMakeTest.cmake +++ b/Tests/RunCMake/if/RunCMakeTest.cmake @@ -5,5 +5,7 @@ run_cmake(IsDirectory) run_cmake(IsDirectoryLong) run_cmake(elseif-message) +run_cmake(MatchesSelf) + run_cmake(TestNameThatExists) run_cmake(TestNameThatDoesNotExist) ----------------------------------------------------------------------- Summary of changes: Source/cmConditionEvaluator.cxx | 10 ++++++++++ Tests/RunCMake/if/MatchesSelf.cmake | 4 ++++ Tests/RunCMake/if/RunCMakeTest.cmake | 2 ++ 3 files changed, 16 insertions(+) create mode 100644 Tests/RunCMake/if/MatchesSelf.cmake hooks/post-receive -- CMake From brad.king at kitware.com Mon Feb 1 10:37:42 2016 From: brad.king at kitware.com (Brad King) Date: Mon, 1 Feb 2016 10:37:42 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.4.3-2123-ga753016 Message-ID: <20160201153742.C7068E5058@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, next has been updated via a753016ca89b2ff5841cc90850c4a74f193d6977 (commit) via 6f83db1cc10beca21b088bfe8d623f6256eb3d0b (commit) via 13b4ef24e1abd69b4fd8eec55772670a85bd5aa8 (commit) via f270404a3d3cb11a9c57253e5f2a0a45f1595231 (commit) via 76a51dfab8b0ebeadb377862758fdddd555cb10c (commit) via 5335d275527d4f58e4f2992d307c1c62cd94dd3c (commit) from 4ca6b8b949f0fc01122407f5dfc1ab080f7d06a3 (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=a753016ca89b2ff5841cc90850c4a74f193d6977 commit a753016ca89b2ff5841cc90850c4a74f193d6977 Merge: 4ca6b8b 6f83db1 Author: Brad King AuthorDate: Mon Feb 1 10:37:42 2016 -0500 Commit: CMake Topic Stage CommitDate: Mon Feb 1 10:37:42 2016 -0500 Merge topic 'doc-cmake-developer-typo' into next 6f83db1c Help: Fix typo in `cmake-developer(7)` manual 13b4ef24 CMake Nightly Date Stamp f270404a CMake Nightly Date Stamp 76a51dfa CMake Nightly Date Stamp 5335d275 CMake Nightly Date Stamp https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6f83db1cc10beca21b088bfe8d623f6256eb3d0b commit 6f83db1cc10beca21b088bfe8d623f6256eb3d0b Author: Prayag Verma AuthorDate: Mon Feb 1 00:33:56 2016 +0530 Commit: Brad King CommitDate: Mon Feb 1 10:36:25 2016 -0500 Help: Fix typo in `cmake-developer(7)` manual Fix spelling mistake `sytem` => `system`. diff --git a/Help/manual/cmake-developer.7.rst b/Help/manual/cmake-developer.7.rst index a335384..7bfdcad 100644 --- a/Help/manual/cmake-developer.7.rst +++ b/Help/manual/cmake-developer.7.rst @@ -718,7 +718,7 @@ same consideration applies to macros, functions and imported targets. If False, do not try to use the relevant CMake wrapping command. ``Xxx_Yy_FOUND`` - If False, optional Yy part of Xxx sytem is not available. + If False, optional Yy part of Xxx system is not available. ``Xxx_FOUND`` Set to false, or undefined, if we haven't found, or don't want to use ----------------------------------------------------------------------- Summary of changes: Help/manual/cmake-developer.7.rst | 2 +- Source/CMakeVersion.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Mon Feb 1 10:43:53 2016 From: brad.king at kitware.com (Brad King) Date: Mon, 1 Feb 2016 10:43:53 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.4.3-923-gc022b6f Message-ID: <20160201154353.E2871E3DC2@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 c022b6f6862c67885401d24c438acac457c64f31 (commit) via d257d68138a00758910bbca3dd77dcfcc04e65cc (commit) via 4d53e0a75e3ccddf14f556e88302573f14aa8830 (commit) via 8c615af4dfaaec38dfb7f42ec951485644c2e24b (commit) via 63c5808f9328797ef225c0d81d60b0fa39ac7d3b (commit) via a336e438e2dc45ffffcd656cfc81507f94e0cec5 (commit) via 88968265e24bc294b4055d7db8a1f9ffbaf73698 (commit) from e18d0df5ed7170b9cc4eafa9f73c6605cc9b4107 (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=c022b6f6862c67885401d24c438acac457c64f31 commit c022b6f6862c67885401d24c438acac457c64f31 Merge: e18d0df d257d68 Author: Brad King AuthorDate: Mon Feb 1 10:43:51 2016 -0500 Commit: CMake Topic Stage CommitDate: Mon Feb 1 10:43:51 2016 -0500 Merge topic 'clarify-add_custom_command-TARGET-scope' d257d681 add_custom_command: Clarify error when TARGET is out of scope (#15681) 4d53e0a7 Help: Clarify `add_custom_command(TARGET)` scope (#15681) 8c615af4 Help: Clarify policy `CMP0040` documentation (#15681) 63c5808f Help: Clarify scope of `if(TARGET)` expression a336e438 Help: Improve markup in `if` command documentation 88968265 Help: Improve markup in `get_target_property` documentation ----------------------------------------------------------------------- Summary of changes: Help/command/add_custom_command.rst | 7 +++++-- Help/command/get_target_property.rst | 2 +- Help/command/if.rst | 9 +++++---- Help/policy/CMP0040.rst | 19 +++++++++++-------- Source/cmMakefile.cxx | 19 ++++++++++++++++++- .../CMP0040/CMP0040-NEW-missing-target-stderr.txt | 2 +- .../CMP0040/CMP0040-WARN-missing-target-stderr.txt | 2 +- .../RunCMake/add_custom_command/RunCMakeTest.cmake | 2 ++ .../TargetImported-result.txt} | 0 .../add_custom_command/TargetImported-stderr.txt | 4 ++++ .../add_custom_command/TargetImported.cmake | 2 ++ .../TargetNotInDir-result.txt} | 0 .../add_custom_command/TargetNotInDir-stderr.txt | 4 ++++ .../add_custom_command/TargetNotInDir.cmake | 2 ++ .../TargetNotInDir/CMakeLists.txt | 1 + 15 files changed, 57 insertions(+), 18 deletions(-) copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => add_custom_command/TargetImported-result.txt} (100%) create mode 100644 Tests/RunCMake/add_custom_command/TargetImported-stderr.txt create mode 100644 Tests/RunCMake/add_custom_command/TargetImported.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => add_custom_command/TargetNotInDir-result.txt} (100%) create mode 100644 Tests/RunCMake/add_custom_command/TargetNotInDir-stderr.txt create mode 100644 Tests/RunCMake/add_custom_command/TargetNotInDir.cmake create mode 100644 Tests/RunCMake/add_custom_command/TargetNotInDir/CMakeLists.txt hooks/post-receive -- CMake From brad.king at kitware.com Mon Feb 1 10:43:56 2016 From: brad.king at kitware.com (Brad King) Date: Mon, 1 Feb 2016 10:43:56 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.4.3-926-g5ee96fc Message-ID: <20160201154356.8BCF7E3E55@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 5ee96fc2724e2264d7ba804586da2f0bc759929d (commit) via fa78ee97ff30cc066a620cacdfe4144852947dc4 (commit) via facfb52c9fe36c172c4aa21b40c5886efa28e0ae (commit) from c022b6f6862c67885401d24c438acac457c64f31 (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=5ee96fc2724e2264d7ba804586da2f0bc759929d commit 5ee96fc2724e2264d7ba804586da2f0bc759929d Merge: c022b6f fa78ee9 Author: Brad King AuthorDate: Mon Feb 1 10:43:54 2016 -0500 Commit: CMake Topic Stage CommitDate: Mon Feb 1 10:43:54 2016 -0500 Merge topic 'FindGit-updates' fa78ee97 FindGit: Improve documentation formatting facfb52c FindGit: Document Git_FOUND, unset internal var ----------------------------------------------------------------------- Summary of changes: Modules/FindGit.cmake | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Mon Feb 1 10:43:59 2016 From: brad.king at kitware.com (Brad King) Date: Mon, 1 Feb 2016 10:43:59 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.4.3-928-gadc3d12 Message-ID: <20160201154359.58139E3E00@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 adc3d1244bf373fca10cc15a45e34ac7aac34961 (commit) via 6f83db1cc10beca21b088bfe8d623f6256eb3d0b (commit) from 5ee96fc2724e2264d7ba804586da2f0bc759929d (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=adc3d1244bf373fca10cc15a45e34ac7aac34961 commit adc3d1244bf373fca10cc15a45e34ac7aac34961 Merge: 5ee96fc 6f83db1 Author: Brad King AuthorDate: Mon Feb 1 10:43:57 2016 -0500 Commit: CMake Topic Stage CommitDate: Mon Feb 1 10:43:57 2016 -0500 Merge topic 'doc-cmake-developer-typo' 6f83db1c Help: Fix typo in `cmake-developer(7)` manual ----------------------------------------------------------------------- Summary of changes: Help/manual/cmake-developer.7.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Mon Feb 1 10:44:16 2016 From: brad.king at kitware.com (Brad King) Date: Mon, 1 Feb 2016 10:44:16 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.4.3-2128-gec2d350 Message-ID: <20160201154416.7DFADE3EB9@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, next has been updated via ec2d350795a55ffb5ab1d3b048f62f5db19cd0f4 (commit) via adc3d1244bf373fca10cc15a45e34ac7aac34961 (commit) via 5ee96fc2724e2264d7ba804586da2f0bc759929d (commit) via c022b6f6862c67885401d24c438acac457c64f31 (commit) via e18d0df5ed7170b9cc4eafa9f73c6605cc9b4107 (commit) from a753016ca89b2ff5841cc90850c4a74f193d6977 (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=ec2d350795a55ffb5ab1d3b048f62f5db19cd0f4 commit ec2d350795a55ffb5ab1d3b048f62f5db19cd0f4 Merge: a753016 adc3d12 Author: Brad King AuthorDate: Mon Feb 1 10:44:08 2016 -0500 Commit: Brad King CommitDate: Mon Feb 1 10:44:08 2016 -0500 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Mon Feb 1 10:48:07 2016 From: brad.king at kitware.com (Brad King) Date: Mon, 1 Feb 2016 10:48:07 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.4.3-2130-g3ca3770 Message-ID: <20160201154808.2F973E48E7@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, next has been updated via 3ca37701c2e37fb18268e4def57c3ca91862f892 (commit) via ccb2d5c07f32fb6bd96128527a36a00868e905fa (commit) from ec2d350795a55ffb5ab1d3b048f62f5db19cd0f4 (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=3ca37701c2e37fb18268e4def57c3ca91862f892 commit 3ca37701c2e37fb18268e4def57c3ca91862f892 Merge: ec2d350 ccb2d5c Author: Brad King AuthorDate: Mon Feb 1 10:48:07 2016 -0500 Commit: CMake Topic Stage CommitDate: Mon Feb 1 10:48:07 2016 -0500 Merge topic 'remove-stray-semicolon' into next ccb2d5c0 cmAlgorithms.h: remove superfluous semicolon after method https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ccb2d5c07f32fb6bd96128527a36a00868e905fa commit ccb2d5c07f32fb6bd96128527a36a00868e905fa Author: Christoph Gr?ninger AuthorDate: Fri Jan 29 22:16:03 2016 +0100 Commit: Brad King CommitDate: Mon Feb 1 10:47:25 2016 -0500 cmAlgorithms.h: remove superfluous semicolon after method diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h index 54617f3..bb65ea5 100644 --- a/Source/cmAlgorithms.h +++ b/Source/cmAlgorithms.h @@ -230,7 +230,7 @@ template std::string cmJoin(Range const& r, std::string delimiter) { return cmJoin(r, delimiter.c_str()); -}; +} template typename Range::const_iterator cmRemoveN(Range& r, size_t n) ----------------------------------------------------------------------- Summary of changes: Source/cmAlgorithms.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Mon Feb 1 13:42:59 2016 From: brad.king at kitware.com (Brad King) Date: Mon, 1 Feb 2016 13:42:59 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.4.3-2133-g812d9a2 Message-ID: <20160201184303.9B92BE3982@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, next has been updated via 812d9a224af1be364d763b4d907a222f1d44dec0 (commit) via ad701d9f013b5a40d6f241f334340d78c1083c1a (commit) via 377a12b2d239c531b324d31759aa05450ee8d622 (commit) from 3ca37701c2e37fb18268e4def57c3ca91862f892 (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=812d9a224af1be364d763b4d907a222f1d44dec0 commit 812d9a224af1be364d763b4d907a222f1d44dec0 Merge: 3ca3770 ad701d9 Author: Brad King AuthorDate: Mon Feb 1 13:42:58 2016 -0500 Commit: CMake Topic Stage CommitDate: Mon Feb 1 13:42:58 2016 -0500 Merge topic 'doc-3.5-relnotes' into next ad701d9f Help: Organize and revise 3.5 release notes 377a12b2 Help: Consolidate 3.5 release notes https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ad701d9f013b5a40d6f241f334340d78c1083c1a commit ad701d9f013b5a40d6f241f334340d78c1083c1a Author: Brad King AuthorDate: Mon Feb 1 13:38:00 2016 -0500 Commit: Brad King CommitDate: Mon Feb 1 13:38:36 2016 -0500 Help: Organize and revise 3.5 release notes Add section headers similar to the 3.4 release notes and move each individual bullet into an appropriate section. Revise a few bullets. diff --git a/Help/release/3.5.rst b/Help/release/3.5.rst index 3b46678..3d1e3b4 100644 --- a/Help/release/3.5.rst +++ b/Help/release/3.5.rst @@ -7,86 +7,65 @@ CMake 3.5 Release Notes Changes made since CMake 3.4 include the following. -* Support was added for the ARM Compiler (arm.com) with compiler id ``ARMCC``. - -* A new platform file for cross-compiling in the Cray Linux Environment to - target compute nodes was added. See - :ref:`Cross Compiling for the Cray Linux Environment ` - for usage details. - -* The :module:`CPackDMG` module learned new variable to specify AppleScript - file run to customize appearance of ``DragNDrop`` installer folder, - including background image setting using supplied PNG or multi-resolution - TIFF file. See the :variable:`CPACK_DMG_DS_STORE_SETUP_SCRIPT` and - :variable:`CPACK_DMG_BACKGROUND_IMAGE` variables. +New Features +============ -* The :manual:`cmake(1)` ``-E copy`` and ``-E copy_if_different`` command-line - tools learned to support copying multiple input files to a directory. +GUI +--- -* The :manual:`cmake(1)` ``-E copy_directory`` command-line - tool learned to support copying multiple input directories to a directory. - -* The :manual:`cmake(1)` ``-E make_directory`` command-line - tool learned to support copying multiple input directories to a directory. - -* The :manual:`cmake(1)` ``-E time`` command now properly passes arguments - with spaces or special characters through to the child process. This - may break scripts that worked around the bug with their own extra - quoting or escaping. +* The :manual:`cmake-gui(1)` gained options to control warnings about + deprecated functionality. * The :manual:`cmake-gui(1)` learned an option to set the toolset to be used with VS IDE and Xcode generators, much like the existing ``-T`` option to :manual:`cmake(1)`. -* The :command:`cmake_parse_arguments` command is now implemented natively. - The :module:`CMakeParseArguments` module remains as an empty placeholder - for compatibility. +* The :manual:`cmake-gui(1)` gained a Regular Expression Explorer which + may be used to create and evaluate regular expressions in real-time. + The explorer window is available via the ``Tools`` menu. -* The :variable:`CMAKE_WARN_DEPRECATED` variable can now be set using the - ``-Wdeprecated`` and ``-Wno-deprecated`` :manual:`cmake(1)` options. +Command-Line +------------ * The ``-Wdev`` and ``-Wno-dev`` :manual:`cmake(1)` options now also enable and suppress the deprecated warnings output by default. -* Warnings about deprecated functionality are now enabled by default. - They may be suppressed with ``-Wno-deprecated`` or by setting the - :variable:`CMAKE_WARN_DEPRECATED` variable to false. - -* Warnings about deprecated functionality can now be controlled in the - :manual:`cmake-gui(1)` application. - * The suppression of developer warnings as errors can now be controlled with the new ``-Werror=dev`` and ``-Wno-error=dev`` :manual:`cmake(1)` options. +* The :manual:`cmake(1)` ``-E`` command-line tools ``copy``, + ``copy_if_different``, ``copy_directory``, and ``make_directory`` + learned to support multiple input files or directories. + +Commands +-------- + +* The :command:`cmake_parse_arguments` command is now implemented natively. + The :module:`CMakeParseArguments` module remains as an empty placeholder + for compatibility. + +* The :command:`install(DIRECTORY)` command learned to support + :manual:`generator expressions ` + in the list of directories. + +Variables +--------- + * The :variable:`CMAKE_ERROR_DEPRECATED` variable can now be set using the ``-Werror=deprecated`` and ``-Wno-error=deprecated`` :manual:`cmake(1)` options. -* The :module:`CPackDeb` module learned to set optional config - file ``Source`` field - monolithic and per-component variable. - See :variable:`CPACK_DEBIAN_PACKAGE_SOURCE`. - -* The :module:`CPackDeb` module learned to set Package, Section - and Priority control fields per-component. - See :variable:`CPACK_DEBIAN__PACKAGE_SECTION` - and :variable:`CPACK_DEBIAN__PACKAGE_PRIORITY`. - -* The :module:`CPack DragNDrop generator ` learned to add - multi-lingual SLAs to a DMG which is presented to the user when they try to - mount the DMG. See the :variable:`CPACK_DMG_SLA_LANGUAGES` and - :variable:`CPACK_DMG_SLA_DIR` variables for details. +* The :variable:`CMAKE_WARN_DEPRECATED` variable can now be set using the + ``-Wdeprecated`` and ``-Wno-deprecated`` :manual:`cmake(1)` options. -* The :module:`CPackNSIS` module learned new variables to add bitmaps to the - installer. See the :variable:`CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP` - and :variable:`CPACK_NSIS_MUI_UNWELCOMEFINISHPAGE_BITMAP` variables. +Properties +---------- -* The :module:`CPackRPM` module learned to set Name and Group - control fields per-component. - See :variable:`CPACK_RPM__PACKAGE_NAME` - and :variable:`CPACK_RPM__PACKAGE_GROUP`. +* The :prop_tgt:`VS_GLOBAL_` target property is now implemented + for VS 2010 and above. Previously it worked only in VS 2008 and below. -* The :module:`CMakeForceCompiler` module and its macros are now deprecated. - See module documentation for an explanation. +Modules +------- * The :module:`ExternalProject` module learned a new ``GIT_REMOTE_NAME`` option to control the ``git clone --origin`` value. @@ -105,11 +84,6 @@ Changes made since CMake 3.4 include the following. targets instead of the paths to the libraries. Moreover it now sets a new ``GTK2_TARGETS`` variable containing all the targets imported. -* Starting with sigc++ 2.5.1, c++11 must be enabled in order to use - sigc++. The GTK2::sigc++ imported target will automatically enable the - required build flags in order to build with the version found on the - system. - * The :module:`FindOpenMP` module learned to support Clang. * The :module:`FindOpenSSL` module gained a new @@ -125,29 +99,84 @@ Changes made since CMake 3.4 include the following. * The :module:`FindXercesC` module now provides imported targets. -* The :command:`install(DIRECTORY)` command learned to support - :manual:`generator expressions ` - in the list of directories. +Platforms +--------- + +* Support was added for the ARM Compiler (arm.com) with compiler id ``ARMCC``. + +* A new platform file for cross-compiling in the Cray Linux Environment to + target compute nodes was added. See + :ref:`Cross Compiling for the Cray Linux Environment ` + for usage details. + +* The :manual:`Compile Features ` functionality + is now aware of features supported by Clang compilers on Windows (MinGW). * When building for embedded Apple platforms like iOS CMake learned to build and install combined targets which contain both a device and a simulator build. This behavior can be enabled by setting the :prop_tgt:`IOS_INSTALL_COMBINED` target property. -* The :manual:`Compile Features ` functionality - is now aware of features supported by Clang compilers on Windows (MinGW). +CPack +----- + +* The :module:`CPackDMG` module learned new variable to specify AppleScript + file run to customize appearance of ``DragNDrop`` installer folder, + including background image setting using supplied PNG or multi-resolution + TIFF file. See the :variable:`CPACK_DMG_DS_STORE_SETUP_SCRIPT` and + :variable:`CPACK_DMG_BACKGROUND_IMAGE` variables. -* The Qt base CMake GUI got a Regular Expression Explorer which could be used to - create and evaluate regular expressions in real-time. The explorer window - is available via the ``Tools`` menu. +* The :module:`CPackDeb` module learned to set the optional config + file ``Source`` field using a monolithic or per-component variable. + See :variable:`CPACK_DEBIAN_PACKAGE_SOURCE`. -* The precompiled Windows binary provided on ``cmake.org`` is now a - ``.msi`` package instead of an installer executable. One may need - to manually uninstall CMake versions lower than 3.5 before installing - the new package. +* The :module:`CPackDeb` module learned to set Package, Section + and Priority control fields per-component. + See variables :variable:`CPACK_DEBIAN__PACKAGE_SECTION` and + :variable:`CPACK_DEBIAN__PACKAGE_PRIORITY`. + +* The :module:`CPack DragNDrop generator ` learned to add + multi-lingual SLAs to a DMG which is presented to the user when they try to + mount the DMG. See the :variable:`CPACK_DMG_SLA_LANGUAGES` and + :variable:`CPACK_DMG_SLA_DIR` variables for details. + +* The :module:`CPackNSIS` module learned new variables to add bitmaps to the + installer. See the :variable:`CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP` + and :variable:`CPACK_NSIS_MUI_UNWELCOMEFINISHPAGE_BITMAP` variables. + +* The :module:`CPackRPM` module learned to set Name and Group + control fields per-component. + See :variable:`CPACK_RPM__PACKAGE_NAME` + and :variable:`CPACK_RPM__PACKAGE_GROUP`. + +Other +----- + +* Warnings about deprecated functionality are now enabled by default. + They may be suppressed with ``-Wno-deprecated`` or by setting the + :variable:`CMAKE_WARN_DEPRECATED` variable to false. + +Deprecated and Removed Features +=============================== + +* The :module:`CMakeForceCompiler` module and its macros are now deprecated. + See module documentation for an explanation. + +* The :manual:`cmake(1)` ``-E time`` command now properly passes arguments + with spaces or special characters through to the child process. This + may break scripts that worked around the bug with their own extra + quoting or escaping. + +Other Changes +============= * The :generator:`Visual Studio 14 2015` generator learned to map the ``/debug:fastlink`` linker flag to the ``.vcxproj`` file property. -* The :prop_tgt:`VS_GLOBAL_` target property is now implemented - for VS 2010 and above. Previously it worked only in VS 2008 and below. +* The :module:`FindGTK2` module now configures the ``GTK2::sigc++`` imported + target to enable c++11 on its dependents when using sigc++ 2.5.1 or higher. + +* The precompiled Windows binary provided on ``cmake.org`` is now a + ``.msi`` package instead of an installer executable. One may need + to manually uninstall CMake versions lower than 3.5 before installing + the new package. https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=377a12b2d239c531b324d31759aa05450ee8d622 commit 377a12b2d239c531b324d31759aa05450ee8d622 Author: Brad King AuthorDate: Mon Feb 1 12:47:27 2016 -0500 Commit: Brad King CommitDate: Mon Feb 1 12:50:43 2016 -0500 Help: Consolidate 3.5 release notes Move all development release notes into a new version-specific document: tail -q -n +3 Help/release/dev/* > Help/release/3.5.rst git rm -- Help/release/dev/* except the sample topic: git checkout HEAD -- Help/release/dev/0-sample-topic.rst Reference the new document from the release notes index document. Add a title and intro sentence to the new document by hand. diff --git a/Help/release/3.5.rst b/Help/release/3.5.rst new file mode 100644 index 0000000..3b46678 --- /dev/null +++ b/Help/release/3.5.rst @@ -0,0 +1,153 @@ +CMake 3.5 Release Notes +*********************** + +.. only:: html + + .. contents:: + +Changes made since CMake 3.4 include the following. + +* Support was added for the ARM Compiler (arm.com) with compiler id ``ARMCC``. + +* A new platform file for cross-compiling in the Cray Linux Environment to + target compute nodes was added. See + :ref:`Cross Compiling for the Cray Linux Environment ` + for usage details. + +* The :module:`CPackDMG` module learned new variable to specify AppleScript + file run to customize appearance of ``DragNDrop`` installer folder, + including background image setting using supplied PNG or multi-resolution + TIFF file. See the :variable:`CPACK_DMG_DS_STORE_SETUP_SCRIPT` and + :variable:`CPACK_DMG_BACKGROUND_IMAGE` variables. + +* The :manual:`cmake(1)` ``-E copy`` and ``-E copy_if_different`` command-line + tools learned to support copying multiple input files to a directory. + +* The :manual:`cmake(1)` ``-E copy_directory`` command-line + tool learned to support copying multiple input directories to a directory. + +* The :manual:`cmake(1)` ``-E make_directory`` command-line + tool learned to support copying multiple input directories to a directory. + +* The :manual:`cmake(1)` ``-E time`` command now properly passes arguments + with spaces or special characters through to the child process. This + may break scripts that worked around the bug with their own extra + quoting or escaping. + +* The :manual:`cmake-gui(1)` learned an option to set the toolset + to be used with VS IDE and Xcode generators, much like the + existing ``-T`` option to :manual:`cmake(1)`. + +* The :command:`cmake_parse_arguments` command is now implemented natively. + The :module:`CMakeParseArguments` module remains as an empty placeholder + for compatibility. + +* The :variable:`CMAKE_WARN_DEPRECATED` variable can now be set using the + ``-Wdeprecated`` and ``-Wno-deprecated`` :manual:`cmake(1)` options. + +* The ``-Wdev`` and ``-Wno-dev`` :manual:`cmake(1)` options now also enable + and suppress the deprecated warnings output by default. + +* Warnings about deprecated functionality are now enabled by default. + They may be suppressed with ``-Wno-deprecated`` or by setting the + :variable:`CMAKE_WARN_DEPRECATED` variable to false. + +* Warnings about deprecated functionality can now be controlled in the + :manual:`cmake-gui(1)` application. + +* The suppression of developer warnings as errors can now be controlled with + the new ``-Werror=dev`` and ``-Wno-error=dev`` :manual:`cmake(1)` options. + +* The :variable:`CMAKE_ERROR_DEPRECATED` variable can now be set using the + ``-Werror=deprecated`` and ``-Wno-error=deprecated`` :manual:`cmake(1)` + options. + +* The :module:`CPackDeb` module learned to set optional config + file ``Source`` field - monolithic and per-component variable. + See :variable:`CPACK_DEBIAN_PACKAGE_SOURCE`. + +* The :module:`CPackDeb` module learned to set Package, Section + and Priority control fields per-component. + See :variable:`CPACK_DEBIAN__PACKAGE_SECTION` + and :variable:`CPACK_DEBIAN__PACKAGE_PRIORITY`. + +* The :module:`CPack DragNDrop generator ` learned to add + multi-lingual SLAs to a DMG which is presented to the user when they try to + mount the DMG. See the :variable:`CPACK_DMG_SLA_LANGUAGES` and + :variable:`CPACK_DMG_SLA_DIR` variables for details. + +* The :module:`CPackNSIS` module learned new variables to add bitmaps to the + installer. See the :variable:`CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP` + and :variable:`CPACK_NSIS_MUI_UNWELCOMEFINISHPAGE_BITMAP` variables. + +* The :module:`CPackRPM` module learned to set Name and Group + control fields per-component. + See :variable:`CPACK_RPM__PACKAGE_NAME` + and :variable:`CPACK_RPM__PACKAGE_GROUP`. + +* The :module:`CMakeForceCompiler` module and its macros are now deprecated. + See module documentation for an explanation. + +* The :module:`ExternalProject` module learned a new ``GIT_REMOTE_NAME`` + option to control the ``git clone --origin`` value. + +* The :module:`FindBoost` module now provides imported targets + such as ``Boost::boost`` and ``Boost::filesystem``. + +* The :module:`FindFLEX` module ``FLEX_TARGET`` macro learned a + new ``DEFINES_FILE`` option to specify a custom output header + to be generated. + +* The :module:`FindGTest` module now provides imported targets. + +* The :module:`FindGTK2` module, when ``GTK2_USE_IMPORTED_TARGETS`` is + enabled, now sets ``GTK2_LIBRARIES`` to contain the list of imported + targets instead of the paths to the libraries. Moreover it now sets + a new ``GTK2_TARGETS`` variable containing all the targets imported. + +* Starting with sigc++ 2.5.1, c++11 must be enabled in order to use + sigc++. The GTK2::sigc++ imported target will automatically enable the + required build flags in order to build with the version found on the + system. + +* The :module:`FindOpenMP` module learned to support Clang. + +* The :module:`FindOpenSSL` module gained a new + ``OPENSSL_MSVC_STATIC_RT`` option to search for libraries using + the MSVC static runtime. + +* The :module:`FindPNG` module now provides imported targets. + +* The :module:`FindTIFF` module now provides imported targets. + +* A :module:`FindXalanC` module was introduced to find the + Apache Xalan-C++ XSL transform processing library. + +* The :module:`FindXercesC` module now provides imported targets. + +* The :command:`install(DIRECTORY)` command learned to support + :manual:`generator expressions ` + in the list of directories. + +* When building for embedded Apple platforms like iOS CMake learned to build and + install combined targets which contain both a device and a simulator build. + This behavior can be enabled by setting the :prop_tgt:`IOS_INSTALL_COMBINED` + target property. + +* The :manual:`Compile Features ` functionality + is now aware of features supported by Clang compilers on Windows (MinGW). + +* The Qt base CMake GUI got a Regular Expression Explorer which could be used to + create and evaluate regular expressions in real-time. The explorer window + is available via the ``Tools`` menu. + +* The precompiled Windows binary provided on ``cmake.org`` is now a + ``.msi`` package instead of an installer executable. One may need + to manually uninstall CMake versions lower than 3.5 before installing + the new package. + +* The :generator:`Visual Studio 14 2015` generator learned to map the + ``/debug:fastlink`` linker flag to the ``.vcxproj`` file property. + +* The :prop_tgt:`VS_GLOBAL_` target property is now implemented + for VS 2010 and above. Previously it worked only in VS 2008 and below. diff --git a/Help/release/dev/CMakeParseArguments-native-impl.rst b/Help/release/dev/CMakeParseArguments-native-impl.rst deleted file mode 100644 index 114a099..0000000 --- a/Help/release/dev/CMakeParseArguments-native-impl.rst +++ /dev/null @@ -1,6 +0,0 @@ -CMakeParseArguments-native-impl -------------------------------- - -* The :command:`cmake_parse_arguments` command is now implemented natively. - The :module:`CMakeParseArguments` module remains as an empty placeholder - for compatibility. diff --git a/Help/release/dev/ExternalProject-git-clone-o.rst b/Help/release/dev/ExternalProject-git-clone-o.rst deleted file mode 100644 index c9ff3e1..0000000 --- a/Help/release/dev/ExternalProject-git-clone-o.rst +++ /dev/null @@ -1,5 +0,0 @@ -ExternalProject-git-clone-o ---------------------------- - -* The :module:`ExternalProject` module learned a new ``GIT_REMOTE_NAME`` - option to control the ``git clone --origin`` value. diff --git a/Help/release/dev/FindBoost-imported-targets.rst b/Help/release/dev/FindBoost-imported-targets.rst deleted file mode 100644 index 1129ded..0000000 --- a/Help/release/dev/FindBoost-imported-targets.rst +++ /dev/null @@ -1,5 +0,0 @@ -FindBoost-imported-targets --------------------------- - -* The :module:`FindBoost` module now provides imported targets - such as ``Boost::boost`` and ``Boost::filesystem``. diff --git a/Help/release/dev/FindFLEX-DEFINES_FILE.rst b/Help/release/dev/FindFLEX-DEFINES_FILE.rst deleted file mode 100644 index 95133aa..0000000 --- a/Help/release/dev/FindFLEX-DEFINES_FILE.rst +++ /dev/null @@ -1,6 +0,0 @@ -FindFLEX-DEFINES_FILE ---------------------- - -* The :module:`FindFLEX` module ``FLEX_TARGET`` macro learned a - new ``DEFINES_FILE`` option to specify a custom output header - to be generated. diff --git a/Help/release/dev/FindGTK2_GTK2_TARGETS.rst b/Help/release/dev/FindGTK2_GTK2_TARGETS.rst deleted file mode 100644 index 76e3657..0000000 --- a/Help/release/dev/FindGTK2_GTK2_TARGETS.rst +++ /dev/null @@ -1,7 +0,0 @@ -FindGTK2_GTK2_TARGETS ---------------------- - -* The :module:`FindGTK2` module, when ``GTK2_USE_IMPORTED_TARGETS`` is - enabled, now sets ``GTK2_LIBRARIES`` to contain the list of imported - targets instead of the paths to the libraries. Moreover it now sets - a new ``GTK2_TARGETS`` variable containing all the targets imported. diff --git a/Help/release/dev/FindGTK2_sigc++_c++11.rst b/Help/release/dev/FindGTK2_sigc++_c++11.rst deleted file mode 100644 index 2ba1459..0000000 --- a/Help/release/dev/FindGTK2_sigc++_c++11.rst +++ /dev/null @@ -1,7 +0,0 @@ -FindGTK2_sigc++_c++11 ---------------------- - -* Starting with sigc++ 2.5.1, c++11 must be enabled in order to use - sigc++. The GTK2::sigc++ imported target will automatically enable the - required build flags in order to build with the version found on the - system. diff --git a/Help/release/dev/FindGTest-imported-targets.rst b/Help/release/dev/FindGTest-imported-targets.rst deleted file mode 100644 index 3cb98da..0000000 --- a/Help/release/dev/FindGTest-imported-targets.rst +++ /dev/null @@ -1,4 +0,0 @@ -FindGTest-imported-targets --------------------------- - -* The :module:`FindGTest` module now provides imported targets. diff --git a/Help/release/dev/FindOpenMP-clang.rst b/Help/release/dev/FindOpenMP-clang.rst deleted file mode 100644 index 44c805c..0000000 --- a/Help/release/dev/FindOpenMP-clang.rst +++ /dev/null @@ -1,4 +0,0 @@ -FindOpenMP-clang ----------------- - -* The :module:`FindOpenMP` module learned to support Clang. diff --git a/Help/release/dev/FindOpenSSL-msvc-static-rt.rst b/Help/release/dev/FindOpenSSL-msvc-static-rt.rst deleted file mode 100644 index 6e0ee27..0000000 --- a/Help/release/dev/FindOpenSSL-msvc-static-rt.rst +++ /dev/null @@ -1,6 +0,0 @@ -FindOpenSSL-msvc-static-rt --------------------------- - -* The :module:`FindOpenSSL` module gained a new - ``OPENSSL_MSVC_STATIC_RT`` option to search for libraries using - the MSVC static runtime. diff --git a/Help/release/dev/FindPNG-imported-targets.rst b/Help/release/dev/FindPNG-imported-targets.rst deleted file mode 100644 index e0d0ab1..0000000 --- a/Help/release/dev/FindPNG-imported-targets.rst +++ /dev/null @@ -1,4 +0,0 @@ -FindPNG-imported-targets ------------------------- - -* The :module:`FindPNG` module now provides imported targets. diff --git a/Help/release/dev/FindTIFF-imported-targets.rst b/Help/release/dev/FindTIFF-imported-targets.rst deleted file mode 100644 index f8bbc14..0000000 --- a/Help/release/dev/FindTIFF-imported-targets.rst +++ /dev/null @@ -1,4 +0,0 @@ -FindTIFF-imported-targets -------------------------- - -* The :module:`FindTIFF` module now provides imported targets. diff --git a/Help/release/dev/FindXalanC.rst b/Help/release/dev/FindXalanC.rst deleted file mode 100644 index 5369774..0000000 --- a/Help/release/dev/FindXalanC.rst +++ /dev/null @@ -1,5 +0,0 @@ -FindXalanC ----------- - -* A :module:`FindXalanC` module was introduced to find the - Apache Xalan-C++ XSL transform processing library. diff --git a/Help/release/dev/FindXercesC-imported-targets.rst b/Help/release/dev/FindXercesC-imported-targets.rst deleted file mode 100644 index 69cec5c..0000000 --- a/Help/release/dev/FindXercesC-imported-targets.rst +++ /dev/null @@ -1,4 +0,0 @@ -FindXercesC-imported-targets ----------------------------- - -* The :module:`FindXercesC` module now provides imported targets. diff --git a/Help/release/dev/add-armcc-toolchain.rst b/Help/release/dev/add-armcc-toolchain.rst deleted file mode 100644 index 2cf6414..0000000 --- a/Help/release/dev/add-armcc-toolchain.rst +++ /dev/null @@ -1,4 +0,0 @@ -add-armcc-toolchain -------------------- - -* Support was added for the ARM Compiler (arm.com) with compiler id ``ARMCC``. diff --git a/Help/release/dev/add-cray-linux-platform.rst b/Help/release/dev/add-cray-linux-platform.rst deleted file mode 100644 index 7000382..0000000 --- a/Help/release/dev/add-cray-linux-platform.rst +++ /dev/null @@ -1,7 +0,0 @@ -add-cray-linux-platform ------------------------ - -* A new platform file for cross-compiling in the Cray Linux Environment to - target compute nodes was added. See - :ref:`Cross Compiling for the Cray Linux Environment ` - for usage details. diff --git a/Help/release/dev/better-looking-mac-packages.rst b/Help/release/dev/better-looking-mac-packages.rst deleted file mode 100644 index ef1b8e8..0000000 --- a/Help/release/dev/better-looking-mac-packages.rst +++ /dev/null @@ -1,8 +0,0 @@ -better-looking-mac-packages ---------------------------- - -* The :module:`CPackDMG` module learned new variable to specify AppleScript - file run to customize appearance of ``DragNDrop`` installer folder, - including background image setting using supplied PNG or multi-resolution - TIFF file. See the :variable:`CPACK_DMG_DS_STORE_SETUP_SCRIPT` and - :variable:`CPACK_DMG_BACKGROUND_IMAGE` variables. diff --git a/Help/release/dev/cmake-E-multiple-inputs.rst b/Help/release/dev/cmake-E-multiple-inputs.rst deleted file mode 100644 index 480261d..0000000 --- a/Help/release/dev/cmake-E-multiple-inputs.rst +++ /dev/null @@ -1,11 +0,0 @@ -cmake-E-multiple-inputs ------------------------ - -* The :manual:`cmake(1)` ``-E copy`` and ``-E copy_if_different`` command-line - tools learned to support copying multiple input files to a directory. - -* The :manual:`cmake(1)` ``-E copy_directory`` command-line - tool learned to support copying multiple input directories to a directory. - -* The :manual:`cmake(1)` ``-E make_directory`` command-line - tool learned to support copying multiple input directories to a directory. diff --git a/Help/release/dev/cmake-E-time-quoting.rst b/Help/release/dev/cmake-E-time-quoting.rst deleted file mode 100644 index 23b17c5..0000000 --- a/Help/release/dev/cmake-E-time-quoting.rst +++ /dev/null @@ -1,7 +0,0 @@ -cmake-E-time-quoting --------------------- - -* The :manual:`cmake(1)` ``-E time`` command now properly passes arguments - with spaces or special characters through to the child process. This - may break scripts that worked around the bug with their own extra - quoting or escaping. diff --git a/Help/release/dev/cmake-W-options.rst b/Help/release/dev/cmake-W-options.rst deleted file mode 100644 index c055f96..0000000 --- a/Help/release/dev/cmake-W-options.rst +++ /dev/null @@ -1,22 +0,0 @@ -cmake-W-options ---------------- - -* The :variable:`CMAKE_WARN_DEPRECATED` variable can now be set using the - ``-Wdeprecated`` and ``-Wno-deprecated`` :manual:`cmake(1)` options. - -* The ``-Wdev`` and ``-Wno-dev`` :manual:`cmake(1)` options now also enable - and suppress the deprecated warnings output by default. - -* Warnings about deprecated functionality are now enabled by default. - They may be suppressed with ``-Wno-deprecated`` or by setting the - :variable:`CMAKE_WARN_DEPRECATED` variable to false. - -* Warnings about deprecated functionality can now be controlled in the - :manual:`cmake-gui(1)` application. - -* The suppression of developer warnings as errors can now be controlled with - the new ``-Werror=dev`` and ``-Wno-error=dev`` :manual:`cmake(1)` options. - -* The :variable:`CMAKE_ERROR_DEPRECATED` variable can now be set using the - ``-Werror=deprecated`` and ``-Wno-error=deprecated`` :manual:`cmake(1)` - options. diff --git a/Help/release/dev/cmake-gui-select-toolset.rst b/Help/release/dev/cmake-gui-select-toolset.rst deleted file mode 100644 index 5186f91..0000000 --- a/Help/release/dev/cmake-gui-select-toolset.rst +++ /dev/null @@ -1,6 +0,0 @@ -cmake-gui-select-toolset ------------------------- - -* The :manual:`cmake-gui(1)` learned an option to set the toolset - to be used with VS IDE and Xcode generators, much like the - existing ``-T`` option to :manual:`cmake(1)`. diff --git a/Help/release/dev/cpack-deb-config-file-source-field.rst b/Help/release/dev/cpack-deb-config-file-source-field.rst deleted file mode 100644 index bbc2aa6..0000000 --- a/Help/release/dev/cpack-deb-config-file-source-field.rst +++ /dev/null @@ -1,6 +0,0 @@ -cpack-deb-config-file-source-field ----------------------------------- - -* The :module:`CPackDeb` module learned to set optional config - file ``Source`` field - monolithic and per-component variable. - See :variable:`CPACK_DEBIAN_PACKAGE_SOURCE`. diff --git a/Help/release/dev/cpack-deb-new-component-vars.rst b/Help/release/dev/cpack-deb-new-component-vars.rst deleted file mode 100644 index e30afdb..0000000 --- a/Help/release/dev/cpack-deb-new-component-vars.rst +++ /dev/null @@ -1,7 +0,0 @@ -cpack-deb-new-component-vars ----------------------------- - -* The :module:`CPackDeb` module learned to set Package, Section - and Priority control fields per-component. - See :variable:`CPACK_DEBIAN__PACKAGE_SECTION` - and :variable:`CPACK_DEBIAN__PACKAGE_PRIORITY`. diff --git a/Help/release/dev/cpack-dmg-multilanguage-sla.rst b/Help/release/dev/cpack-dmg-multilanguage-sla.rst deleted file mode 100644 index 9e28fa2..0000000 --- a/Help/release/dev/cpack-dmg-multilanguage-sla.rst +++ /dev/null @@ -1,7 +0,0 @@ -cpack-dmg-multilanguage-sla ---------------------------- - -* The :module:`CPack DragNDrop generator ` learned to add - multi-lingual SLAs to a DMG which is presented to the user when they try to - mount the DMG. See the :variable:`CPACK_DMG_SLA_LANGUAGES` and - :variable:`CPACK_DMG_SLA_DIR` variables for details. diff --git a/Help/release/dev/cpack-nsis-bitmap.rst b/Help/release/dev/cpack-nsis-bitmap.rst deleted file mode 100644 index c5ccfb5..0000000 --- a/Help/release/dev/cpack-nsis-bitmap.rst +++ /dev/null @@ -1,6 +0,0 @@ -cpack-nsis-bitmap ------------------ - -* The :module:`CPackNSIS` module learned new variables to add bitmaps to the - installer. See the :variable:`CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP` - and :variable:`CPACK_NSIS_MUI_UNWELCOMEFINISHPAGE_BITMAP` variables. diff --git a/Help/release/dev/cpack-rpm-percomponent-group-and-name.rst b/Help/release/dev/cpack-rpm-percomponent-group-and-name.rst deleted file mode 100644 index 146f8ac..0000000 --- a/Help/release/dev/cpack-rpm-percomponent-group-and-name.rst +++ /dev/null @@ -1,7 +0,0 @@ -cpack-rpm-percomponent-group-and-name -------------------------------------- - -* The :module:`CPackRPM` module learned to set Name and Group - control fields per-component. - See :variable:`CPACK_RPM__PACKAGE_NAME` - and :variable:`CPACK_RPM__PACKAGE_GROUP`. diff --git a/Help/release/dev/deprecate-CMakeForceCompiler.rst b/Help/release/dev/deprecate-CMakeForceCompiler.rst deleted file mode 100644 index dc6e817..0000000 --- a/Help/release/dev/deprecate-CMakeForceCompiler.rst +++ /dev/null @@ -1,5 +0,0 @@ -deprecate-CMakeForceCompiler ----------------------------- - -* The :module:`CMakeForceCompiler` module and its macros are now deprecated. - See module documentation for an explanation. diff --git a/Help/release/dev/install-DIRECTORY-genex.rst b/Help/release/dev/install-DIRECTORY-genex.rst deleted file mode 100644 index e48f19b..0000000 --- a/Help/release/dev/install-DIRECTORY-genex.rst +++ /dev/null @@ -1,6 +0,0 @@ -install-DIRECTORY-genex ------------------------ - -* The :command:`install(DIRECTORY)` command learned to support - :manual:`generator expressions ` - in the list of directories. diff --git a/Help/release/dev/ios-universal.rst b/Help/release/dev/ios-universal.rst deleted file mode 100644 index f96abed..0000000 --- a/Help/release/dev/ios-universal.rst +++ /dev/null @@ -1,7 +0,0 @@ -ios-universal -------------- - -* When building for embedded Apple platforms like iOS CMake learned to build and - install combined targets which contain both a device and a simulator build. - This behavior can be enabled by setting the :prop_tgt:`IOS_INSTALL_COMBINED` - target property. diff --git a/Help/release/dev/mingw-clang-compile-features.rst b/Help/release/dev/mingw-clang-compile-features.rst deleted file mode 100644 index 5b1fb96..0000000 --- a/Help/release/dev/mingw-clang-compile-features.rst +++ /dev/null @@ -1,5 +0,0 @@ -mingw-clang-compile-features ----------------------------- - -* The :manual:`Compile Features ` functionality - is now aware of features supported by Clang compilers on Windows (MinGW). diff --git a/Help/release/dev/regex-explorer.rst b/Help/release/dev/regex-explorer.rst deleted file mode 100644 index 2147816..0000000 --- a/Help/release/dev/regex-explorer.rst +++ /dev/null @@ -1,6 +0,0 @@ -regex-explorer --------------- - -* The Qt base CMake GUI got a Regular Expression Explorer which could be used to - create and evaluate regular expressions in real-time. The explorer window - is available via the ``Tools`` menu. diff --git a/Help/release/dev/release-windows.rst b/Help/release/dev/release-windows.rst deleted file mode 100644 index cc9f2d5..0000000 --- a/Help/release/dev/release-windows.rst +++ /dev/null @@ -1,7 +0,0 @@ -release-windows ---------------- - -* The precompiled Windows binary provided on ``cmake.org`` is now a - ``.msi`` package instead of an installer executable. One may need - to manually uninstall CMake versions lower than 3.5 before installing - the new package. diff --git a/Help/release/dev/vs-debug-fastlink.rst b/Help/release/dev/vs-debug-fastlink.rst deleted file mode 100644 index c2e0599..0000000 --- a/Help/release/dev/vs-debug-fastlink.rst +++ /dev/null @@ -1,5 +0,0 @@ -vs-debug-fastlink ------------------ - -* The :generator:`Visual Studio 14 2015` generator learned to map the - ``/debug:fastlink`` linker flag to the ``.vcxproj`` file property. diff --git a/Help/release/dev/vs-global-properties.rst b/Help/release/dev/vs-global-properties.rst deleted file mode 100644 index cae49b7..0000000 --- a/Help/release/dev/vs-global-properties.rst +++ /dev/null @@ -1,5 +0,0 @@ -vs-global-properties --------------------- - -* The :prop_tgt:`VS_GLOBAL_` target property is now implemented - for VS 2010 and above. Previously it worked only in VS 2008 and below. diff --git a/Help/release/index.rst b/Help/release/index.rst index 752acbd..7ecf910 100644 --- a/Help/release/index.rst +++ b/Help/release/index.rst @@ -13,6 +13,7 @@ Releases .. toctree:: :maxdepth: 1 + 3.5 <3.5> 3.4 <3.4> 3.3 <3.3> 3.2 <3.2> ----------------------------------------------------------------------- Summary of changes: Help/release/3.5.rst | 182 ++++++++++++++++++++ .../dev/CMakeParseArguments-native-impl.rst | 6 - Help/release/dev/ExternalProject-git-clone-o.rst | 5 - Help/release/dev/FindBoost-imported-targets.rst | 5 - Help/release/dev/FindFLEX-DEFINES_FILE.rst | 6 - Help/release/dev/FindGTK2_GTK2_TARGETS.rst | 7 - Help/release/dev/FindGTK2_sigc++_c++11.rst | 7 - Help/release/dev/FindGTest-imported-targets.rst | 4 - Help/release/dev/FindOpenMP-clang.rst | 4 - Help/release/dev/FindOpenSSL-msvc-static-rt.rst | 6 - Help/release/dev/FindPNG-imported-targets.rst | 4 - Help/release/dev/FindTIFF-imported-targets.rst | 4 - Help/release/dev/FindXalanC.rst | 5 - Help/release/dev/FindXercesC-imported-targets.rst | 4 - Help/release/dev/add-armcc-toolchain.rst | 4 - Help/release/dev/add-cray-linux-platform.rst | 7 - Help/release/dev/better-looking-mac-packages.rst | 8 - Help/release/dev/cmake-E-multiple-inputs.rst | 11 -- Help/release/dev/cmake-E-time-quoting.rst | 7 - Help/release/dev/cmake-W-options.rst | 22 --- Help/release/dev/cmake-gui-select-toolset.rst | 6 - .../dev/cpack-deb-config-file-source-field.rst | 6 - Help/release/dev/cpack-deb-new-component-vars.rst | 7 - Help/release/dev/cpack-dmg-multilanguage-sla.rst | 7 - Help/release/dev/cpack-nsis-bitmap.rst | 6 - .../dev/cpack-rpm-percomponent-group-and-name.rst | 7 - Help/release/dev/deprecate-CMakeForceCompiler.rst | 5 - Help/release/dev/install-DIRECTORY-genex.rst | 6 - Help/release/dev/ios-universal.rst | 7 - Help/release/dev/mingw-clang-compile-features.rst | 5 - Help/release/dev/regex-explorer.rst | 6 - Help/release/dev/release-windows.rst | 7 - Help/release/dev/vs-debug-fastlink.rst | 5 - Help/release/dev/vs-global-properties.rst | 5 - Help/release/index.rst | 1 + 35 files changed, 183 insertions(+), 211 deletions(-) create mode 100644 Help/release/3.5.rst delete mode 100644 Help/release/dev/CMakeParseArguments-native-impl.rst delete mode 100644 Help/release/dev/ExternalProject-git-clone-o.rst delete mode 100644 Help/release/dev/FindBoost-imported-targets.rst delete mode 100644 Help/release/dev/FindFLEX-DEFINES_FILE.rst delete mode 100644 Help/release/dev/FindGTK2_GTK2_TARGETS.rst delete mode 100644 Help/release/dev/FindGTK2_sigc++_c++11.rst delete mode 100644 Help/release/dev/FindGTest-imported-targets.rst delete mode 100644 Help/release/dev/FindOpenMP-clang.rst delete mode 100644 Help/release/dev/FindOpenSSL-msvc-static-rt.rst delete mode 100644 Help/release/dev/FindPNG-imported-targets.rst delete mode 100644 Help/release/dev/FindTIFF-imported-targets.rst delete mode 100644 Help/release/dev/FindXalanC.rst delete mode 100644 Help/release/dev/FindXercesC-imported-targets.rst delete mode 100644 Help/release/dev/add-armcc-toolchain.rst delete mode 100644 Help/release/dev/add-cray-linux-platform.rst delete mode 100644 Help/release/dev/better-looking-mac-packages.rst delete mode 100644 Help/release/dev/cmake-E-multiple-inputs.rst delete mode 100644 Help/release/dev/cmake-E-time-quoting.rst delete mode 100644 Help/release/dev/cmake-W-options.rst delete mode 100644 Help/release/dev/cmake-gui-select-toolset.rst delete mode 100644 Help/release/dev/cpack-deb-config-file-source-field.rst delete mode 100644 Help/release/dev/cpack-deb-new-component-vars.rst delete mode 100644 Help/release/dev/cpack-dmg-multilanguage-sla.rst delete mode 100644 Help/release/dev/cpack-nsis-bitmap.rst delete mode 100644 Help/release/dev/cpack-rpm-percomponent-group-and-name.rst delete mode 100644 Help/release/dev/deprecate-CMakeForceCompiler.rst delete mode 100644 Help/release/dev/install-DIRECTORY-genex.rst delete mode 100644 Help/release/dev/ios-universal.rst delete mode 100644 Help/release/dev/mingw-clang-compile-features.rst delete mode 100644 Help/release/dev/regex-explorer.rst delete mode 100644 Help/release/dev/release-windows.rst delete mode 100644 Help/release/dev/vs-debug-fastlink.rst delete mode 100644 Help/release/dev/vs-global-properties.rst hooks/post-receive -- CMake From kwrobot at kitware.com Tue Feb 2 00:01:07 2016 From: kwrobot at kitware.com (Kitware Robot) Date: Tue, 2 Feb 2016 00:01:07 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.4.3-929-g6a230df Message-ID: <20160202050107.19025E4C66@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 6a230df6368e699521aff1ded3e3f452a161385b (commit) from adc3d1244bf373fca10cc15a45e34ac7aac34961 (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=6a230df6368e699521aff1ded3e3f452a161385b commit 6a230df6368e699521aff1ded3e3f452a161385b Author: Kitware Robot AuthorDate: Tue Feb 2 00:01:05 2016 -0500 Commit: Kitware Robot CommitDate: Tue Feb 2 00:01:05 2016 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index e147247..d3b2ff5 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 4) -set(CMake_VERSION_PATCH 20160201) +set(CMake_VERSION_PATCH 20160202) #set(CMake_VERSION_RC 1) ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Tue Feb 2 08:33:22 2016 From: brad.king at kitware.com (Brad King) Date: Tue, 2 Feb 2016 08:33:22 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.4.3-931-gf8e5e5b Message-ID: <20160202133322.5A928E4D8B@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 f8e5e5bb0353d7ecf2ad9ea861e3a4cd5d4277d1 (commit) via 6ffc4323670f3671f262b3e9f035f1ea3f714986 (commit) from 6a230df6368e699521aff1ded3e3f452a161385b (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=f8e5e5bb0353d7ecf2ad9ea861e3a4cd5d4277d1 commit f8e5e5bb0353d7ecf2ad9ea861e3a4cd5d4277d1 Merge: 6a230df 6ffc432 Author: Brad King AuthorDate: Tue Feb 2 08:33:20 2016 -0500 Commit: CMake Topic Stage CommitDate: Tue Feb 2 08:33:20 2016 -0500 Merge topic 'fix-CMAKE_MATCH-self-match' 6ffc4323 cmConditionEvaluator: Fix matching of `CMAKE_MATCH_*` values (#15944) ----------------------------------------------------------------------- Summary of changes: Source/cmConditionEvaluator.cxx | 10 ++++++++++ Tests/RunCMake/if/MatchesSelf.cmake | 4 ++++ Tests/RunCMake/if/RunCMakeTest.cmake | 2 ++ 3 files changed, 16 insertions(+) create mode 100644 Tests/RunCMake/if/MatchesSelf.cmake hooks/post-receive -- CMake From brad.king at kitware.com Tue Feb 2 08:33:24 2016 From: brad.king at kitware.com (Brad King) Date: Tue, 2 Feb 2016 08:33:24 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.4.3-933-g570e84b Message-ID: <20160202133324.DED9DBB3C3@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 570e84b44b43c62539a47bc6cc2f18d7223114df (commit) via ccb2d5c07f32fb6bd96128527a36a00868e905fa (commit) from f8e5e5bb0353d7ecf2ad9ea861e3a4cd5d4277d1 (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=570e84b44b43c62539a47bc6cc2f18d7223114df commit 570e84b44b43c62539a47bc6cc2f18d7223114df Merge: f8e5e5b ccb2d5c Author: Brad King AuthorDate: Tue Feb 2 08:33:23 2016 -0500 Commit: CMake Topic Stage CommitDate: Tue Feb 2 08:33:23 2016 -0500 Merge topic 'remove-stray-semicolon' ccb2d5c0 cmAlgorithms.h: remove superfluous semicolon after method ----------------------------------------------------------------------- Summary of changes: Source/cmAlgorithms.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Tue Feb 2 08:33:27 2016 From: brad.king at kitware.com (Brad King) Date: Tue, 2 Feb 2016 08:33:27 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.4.3-936-ga5a5a68 Message-ID: <20160202133327.93A2EE4D90@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 a5a5a6857241c21d306661d723b749839f4c6e1a (commit) via ad701d9f013b5a40d6f241f334340d78c1083c1a (commit) via 377a12b2d239c531b324d31759aa05450ee8d622 (commit) from 570e84b44b43c62539a47bc6cc2f18d7223114df (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=a5a5a6857241c21d306661d723b749839f4c6e1a commit a5a5a6857241c21d306661d723b749839f4c6e1a Merge: 570e84b ad701d9 Author: Brad King AuthorDate: Tue Feb 2 08:33:25 2016 -0500 Commit: CMake Topic Stage CommitDate: Tue Feb 2 08:33:25 2016 -0500 Merge topic 'doc-3.5-relnotes' ad701d9f Help: Organize and revise 3.5 release notes 377a12b2 Help: Consolidate 3.5 release notes ----------------------------------------------------------------------- Summary of changes: Help/release/3.5.rst | 182 ++++++++++++++++++++ .../dev/CMakeParseArguments-native-impl.rst | 6 - Help/release/dev/ExternalProject-git-clone-o.rst | 5 - Help/release/dev/FindBoost-imported-targets.rst | 5 - Help/release/dev/FindFLEX-DEFINES_FILE.rst | 6 - Help/release/dev/FindGTK2_GTK2_TARGETS.rst | 7 - Help/release/dev/FindGTK2_sigc++_c++11.rst | 7 - Help/release/dev/FindGTest-imported-targets.rst | 4 - Help/release/dev/FindOpenMP-clang.rst | 4 - Help/release/dev/FindOpenSSL-msvc-static-rt.rst | 6 - Help/release/dev/FindPNG-imported-targets.rst | 4 - Help/release/dev/FindTIFF-imported-targets.rst | 4 - Help/release/dev/FindXalanC.rst | 5 - Help/release/dev/FindXercesC-imported-targets.rst | 4 - Help/release/dev/add-armcc-toolchain.rst | 4 - Help/release/dev/add-cray-linux-platform.rst | 7 - Help/release/dev/better-looking-mac-packages.rst | 8 - Help/release/dev/cmake-E-multiple-inputs.rst | 11 -- Help/release/dev/cmake-E-time-quoting.rst | 7 - Help/release/dev/cmake-W-options.rst | 22 --- Help/release/dev/cmake-gui-select-toolset.rst | 6 - .../dev/cpack-deb-config-file-source-field.rst | 6 - Help/release/dev/cpack-deb-new-component-vars.rst | 7 - Help/release/dev/cpack-dmg-multilanguage-sla.rst | 7 - Help/release/dev/cpack-nsis-bitmap.rst | 6 - .../dev/cpack-rpm-percomponent-group-and-name.rst | 7 - Help/release/dev/deprecate-CMakeForceCompiler.rst | 5 - Help/release/dev/install-DIRECTORY-genex.rst | 6 - Help/release/dev/ios-universal.rst | 7 - Help/release/dev/mingw-clang-compile-features.rst | 5 - Help/release/dev/regex-explorer.rst | 6 - Help/release/dev/release-windows.rst | 7 - Help/release/dev/vs-debug-fastlink.rst | 5 - Help/release/dev/vs-global-properties.rst | 5 - Help/release/index.rst | 1 + 35 files changed, 183 insertions(+), 211 deletions(-) create mode 100644 Help/release/3.5.rst delete mode 100644 Help/release/dev/CMakeParseArguments-native-impl.rst delete mode 100644 Help/release/dev/ExternalProject-git-clone-o.rst delete mode 100644 Help/release/dev/FindBoost-imported-targets.rst delete mode 100644 Help/release/dev/FindFLEX-DEFINES_FILE.rst delete mode 100644 Help/release/dev/FindGTK2_GTK2_TARGETS.rst delete mode 100644 Help/release/dev/FindGTK2_sigc++_c++11.rst delete mode 100644 Help/release/dev/FindGTest-imported-targets.rst delete mode 100644 Help/release/dev/FindOpenMP-clang.rst delete mode 100644 Help/release/dev/FindOpenSSL-msvc-static-rt.rst delete mode 100644 Help/release/dev/FindPNG-imported-targets.rst delete mode 100644 Help/release/dev/FindTIFF-imported-targets.rst delete mode 100644 Help/release/dev/FindXalanC.rst delete mode 100644 Help/release/dev/FindXercesC-imported-targets.rst delete mode 100644 Help/release/dev/add-armcc-toolchain.rst delete mode 100644 Help/release/dev/add-cray-linux-platform.rst delete mode 100644 Help/release/dev/better-looking-mac-packages.rst delete mode 100644 Help/release/dev/cmake-E-multiple-inputs.rst delete mode 100644 Help/release/dev/cmake-E-time-quoting.rst delete mode 100644 Help/release/dev/cmake-W-options.rst delete mode 100644 Help/release/dev/cmake-gui-select-toolset.rst delete mode 100644 Help/release/dev/cpack-deb-config-file-source-field.rst delete mode 100644 Help/release/dev/cpack-deb-new-component-vars.rst delete mode 100644 Help/release/dev/cpack-dmg-multilanguage-sla.rst delete mode 100644 Help/release/dev/cpack-nsis-bitmap.rst delete mode 100644 Help/release/dev/cpack-rpm-percomponent-group-and-name.rst delete mode 100644 Help/release/dev/deprecate-CMakeForceCompiler.rst delete mode 100644 Help/release/dev/install-DIRECTORY-genex.rst delete mode 100644 Help/release/dev/ios-universal.rst delete mode 100644 Help/release/dev/mingw-clang-compile-features.rst delete mode 100644 Help/release/dev/regex-explorer.rst delete mode 100644 Help/release/dev/release-windows.rst delete mode 100644 Help/release/dev/vs-debug-fastlink.rst delete mode 100644 Help/release/dev/vs-global-properties.rst hooks/post-receive -- CMake From brad.king at kitware.com Tue Feb 2 08:33:44 2016 From: brad.king at kitware.com (Brad King) Date: Tue, 2 Feb 2016 08:33:44 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.4.3-2138-g9ec9680 Message-ID: <20160202133344.F41E8E4D93@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, next has been updated via 9ec968015c4d66cad8cb96c889aa48297406fce7 (commit) via a5a5a6857241c21d306661d723b749839f4c6e1a (commit) via 570e84b44b43c62539a47bc6cc2f18d7223114df (commit) via f8e5e5bb0353d7ecf2ad9ea861e3a4cd5d4277d1 (commit) via 6a230df6368e699521aff1ded3e3f452a161385b (commit) from 812d9a224af1be364d763b4d907a222f1d44dec0 (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=9ec968015c4d66cad8cb96c889aa48297406fce7 commit 9ec968015c4d66cad8cb96c889aa48297406fce7 Merge: 812d9a2 a5a5a68 Author: Brad King AuthorDate: Tue Feb 2 08:33:37 2016 -0500 Commit: Brad King CommitDate: Tue Feb 2 08:33:37 2016 -0500 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From cmake-commits at cmake.org Tue Feb 2 08:45:51 2016 From: cmake-commits at cmake.org (cmake-commits at cmake.org) Date: Tue, 2 Feb 2016 08:45:51 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.4.3-940-gc84dfa7 Message-ID: <20160202134551.A2C92E3EEB@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 c84dfa7457e37324e417945c3848e38bdb9372fe (commit) via aeaaa8684b0f312d5fb7080096831f5872b41575 (commit) via 8a8d22cf1e5d20b7c3b32c1ec9b5f06b339c2a50 (commit) via 021a74a6cbc01728964c55c88233491a30f0d812 (commit) from a5a5a6857241c21d306661d723b749839f4c6e1a (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 +- Utilities/Release/upload_release.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake From cmake-commits at cmake.org Tue Feb 2 08:45:54 2016 From: cmake-commits at cmake.org (cmake-commits at cmake.org) Date: Tue, 2 Feb 2016 08:45:54 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.4.3-941-g0bbdcec Message-ID: <20160202134554.3E8DFE3EEE@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, next has been updated discards 9ec968015c4d66cad8cb96c889aa48297406fce7 (commit) discards 812d9a224af1be364d763b4d907a222f1d44dec0 (commit) discards 3ca37701c2e37fb18268e4def57c3ca91862f892 (commit) discards ec2d350795a55ffb5ab1d3b048f62f5db19cd0f4 (commit) discards a753016ca89b2ff5841cc90850c4a74f193d6977 (commit) discards 4ca6b8b949f0fc01122407f5dfc1ab080f7d06a3 (commit) discards 991d04a395868caa7a33a0ddac9333641ec3295b (commit) discards 701a3fdbcc7d848b0554ff9bdaf8ba74a85b07b0 (commit) discards de3d01c33142da1213335e5d6159a9c61d749db5 (commit) discards cec1388c39796ee79c39c4119e6546cb69a2f65e (commit) discards c220f4e80728c2b39db6d375c0a8d9667769cd08 (commit) discards 9b24c2fbefae8427a67392ca1f92a733c60496d9 (commit) discards 52cf1c99ad32867d810a895c3f37a61beb71a750 (commit) discards 26aec99782f958f3a048e7074be1f5b9e8592426 (commit) discards a0771e09b7d1fa613ffa19dfb5d3dadf6014fc7e (commit) discards e9ac370789a1020b85e7a928ffd97673cf79afad (commit) discards 54f9e335ddf7cd14e89f63eb688ad01c56b1a4fa (commit) discards d194d14ba6d2d685ce50a01830f00f07f67650b7 (commit) discards f559b68db2e472b028d7e04f7b864b09fcfb4479 (commit) discards 92b073f950b7cb5e20f138fb685bc2145b0833b8 (commit) discards aa6eaa602a3111415db50cc143534f33f30341cc (commit) discards 8ef9c76b623f3994bcc04c03cacc1f301fb22154 (commit) discards 1ca14513c5df74ec3d4d5b9febbe1627a6a46cb9 (commit) discards 38022559e9947adb274890070499c69738d0deaf (commit) discards 935a4133753eb587b9b91a6b78832430ff780680 (commit) discards 192c112d45399fd5e35fd89ec71d70320ad81bbf (commit) discards c7234a805cc4624901928f08d0507764d7290f18 (commit) discards 87636090c5e499a42c14e57a24b6c1daf7b64e2e (commit) discards 63632df2dc3f464a4e4427300c9a72e3a603fff2 (commit) discards 9ca666a9fb5f2ee134222ee4473fb7dc7c7167fc (commit) discards cfdb9ace020af28dd226790a9d7165712bf45718 (commit) discards e00e292afda204ed9a52abdc3ee317d6ad71b172 (commit) discards 664b407ec54aa38ddb189128ba2baf81e78efab7 (commit) discards 6c1b1d9c251ddd98093e37dfe1c9d605ba0ebe00 (commit) discards c7313e73a122667ec905f3c8f265de6da9f709e7 (commit) discards 81ec5ea6a94a52ca33655e9db4598258fc627762 (commit) discards f372d6eae582b0992c231696d7ac23b5a2632e4b (commit) discards f110ba38bdf00a778c0388da5886f024ce078f47 (commit) discards da0dd89221bbf9a46dd6065c18023b9f62f682a2 (commit) discards 3b61ef9dd48eaaacc2fa5123974d9cb9f68ae96d (commit) discards f0f0470cbf18cdea04873fd1ad67a6504f88a779 (commit) discards d1a35c5c4f0a105e06039f9ca675c1452fbaf3ec (commit) discards 78ff8bba81c7fa4dec884c9b59e4058cc830e818 (commit) discards f565f9fa038d57958a4d34a6829d3ae175063704 (commit) discards b95be1cf8bf2504b4a5d8c9667ea7e936e19a4f6 (commit) discards bde6c5547e181b72aaefbaffff092bdd9a79ba01 (commit) discards 683f5b178974acfe2d387e2ab0a4040ed023b51e (commit) discards 2610a2b988323fa4653fb602935c3a6079d8b68a (commit) discards 9451ea5a6a55f0e46ad68cd622e05a130ca0988f (commit) discards 078e8a2dcbe4e64ad63bdd04c60aba75bdd8b734 (commit) discards 9641548007af875da7a25525037cae7447ae07dd (commit) discards a7940807d7ab684f201271441afa29095378b1c9 (commit) discards ca1e830693328c4162294b215bfd3d18c7860702 (commit) discards 639104a6fedd90748151655d3cbfe36c2d1fa6f5 (commit) discards 4af8e762a976e3602c477d05275db3f7156e7a5f (commit) discards a11c0e7716d57fa7042632868d808b35d9372bb2 (commit) discards f1bbd9719009f15afdbcf2a62c10c7779d5c1ace (commit) discards 9696b5a2b71ca240b36a5ed7a7054b6bea677785 (commit) discards 867a79a332bd3bf9c48e3a713962ead9d96d04c2 (commit) discards 6100263329ac590e489f9454840be8ee71ef02fb (commit) discards 6ed6ba600f7852c34d917dd8fcdff14992201352 (commit) discards be0031e0720e4e1a6ac7d2a8f77b27c7f6ab292a (commit) discards 7ebea33aa830e776fad129f2b238d0777abd626a (commit) discards ab20512b3440a17f47ea559d2df200b1bfd8a13e (commit) discards 5c0d5f06d4e3a021abf17b2469ef7f7e0103b2fd (commit) discards 29b8a5bbf4460d565822bd6e46a8ea08d9ffb166 (commit) discards d78f9e3595c1b901670e9d57c9620e792c797470 (commit) discards ba8912559febcc1614558d2fb08ec802aa6602f4 (commit) discards 32e061936368819a8dc60cac90e4997d60a0a9aa (commit) discards a10f0819c3ddff6527b8ff2524a66079a245468e (commit) discards e37e3f18ca209a04568c1d40420fb385fff71aad (commit) discards 012b6469f84e2b8cef1b457c1185ed0d97209a80 (commit) discards 3f6e32535b336418d834e583f5731832c1b1dd85 (commit) discards dc201bfd7e76b8022de8d7cb7a779dfe7b272e93 (commit) discards 39120bfffe6b2f24cc488bfacf37bc5ca60f5718 (commit) discards 1f83d8a365ec1859b59c596d275fe431126ea63f (commit) discards 7a8ce548243625cc405200c759759e424cf50f98 (commit) discards 718c6e8e33bfb666e7482504f429409df1c0b566 (commit) discards a0e599587c8ddd4898d6019fab52f01f9ddec4d3 (commit) discards aea52d2033f3e17ba11af70fb6d264e8637a8deb (commit) discards 24fcf2ef037e50eb375f8e0d5e49a7658273f230 (commit) discards 8810997b9bcabc895f99f0b68e5a96515831189e (commit) discards 6e0739808514591e9a1cee0ca78aa1da17f52a86 (commit) discards 358f7727f9b30ab91b65905ed7812e216b172466 (commit) discards e584aa916a85ec45a19e751e2c224b97231ff02e (commit) discards 0a9d80385666d819587a5761d0a1f4a9f9e1edfa (commit) discards 021378efed47f005d8b20c3d56487d68982919fe (commit) discards ae32b5c91d660c30c80c29ab5b548b364e94c89b (commit) discards 916741017fce97137df31effb795e93a43c4a54d (commit) discards ed54acf383ef7c46a2746c4423f395d399f0e525 (commit) discards 1e6e2d6c5bc43ad9ff65f2e4e554fb15c70437b4 (commit) discards 9a5ed4dfee23cee7aaaabc1b731cc2aa6cad6c46 (commit) discards 1ead8ced6b1e6132923a6da0a410b005bb48a694 (commit) discards a777600248ea0f71581fcdfac2664b26b0f56376 (commit) discards 646f594fcee5e5ac073a72754a9c067d75bb9bcb (commit) discards e0c8efbea200d306fb8202750d400b58d3c7185a (commit) discards 3f3e6ddf46580649e726293f64c6808256927167 (commit) discards e174bc906b2f65bbc17995f6722ea2e41a78b472 (commit) discards 21bc95c2ff3b44500bc0bb2d777f1e4acb729676 (commit) discards 68881bfe2e9765bef47e25836b7c464b04696064 (commit) discards 06de555a31bed2eb841cee3cb1f0e669cbe9eeeb (commit) discards c60dfb9be771334ca19d146a99315680f9f53acd (commit) discards 3e1fca746416fb82ed79e02e2248c8c26f3549a2 (commit) discards 3a128a8198be563ea3be57b93c8c8100b515efff (commit) discards 84b0545fcf7b259dd0d995c8d9aedf7c1e55500d (commit) discards adbc363bd97e8c8e52bf0dc72ce24232ec0cfb0e (commit) discards 77b30076c63f1e8f3155148a0c9815745b58d24c (commit) discards 8673afc72a2ba9ba8d7184411b4b1247ea45d774 (commit) discards 5c88b0413cba78652e3f238302de04b10221c4a1 (commit) discards e859349334c8e66148766e9f0acc82667a4944fd (commit) discards f3ea5a599f958e20a28e10365bc07253271cde04 (commit) discards ebf86b8bf65ec96e48f814d3f454106201df3538 (commit) discards 816fe03a024f0d2b315c9797e48a4e58a7ae0490 (commit) discards 558d5d986886e224346cee5b992920ec073cb6d7 (commit) discards 7f6ba8cd74bd5030916247049c6259293ad668a9 (commit) discards 466e182975d4dde63719f0c2aa28de12afad0b61 (commit) discards aa579b552c0e7321ed580e3df15325aa3e102560 (commit) discards 7a36e812c4f26bdf7e70d2b284b9f7650a4369ca (commit) discards d24f98fc29d6ce0a01218d30f89982b153c3e141 (commit) discards 746af298c623980ebc96eb203adeffef4853628c (commit) discards f97ef254862a4c5d37e370b6390cbbe97cd89946 (commit) discards e920fa671ac31373a04c2613bd80ec147b3bd3e7 (commit) discards 946910862468bef655e28378fc0bf74caa70dc7a (commit) discards 4aae44966324856ff60424e4629681c1840794f7 (commit) discards da8f980ca6488a3695bd813dec234cdb8b6d7da8 (commit) discards 560346831628c1a887923e6bf866d91727e9c1ca (commit) discards 633b34d968b9513fb3106642f88a63f346503dab (commit) discards 1a1d94b61c82bd507dc4c36ef323043be9454dd2 (commit) discards be48a89e5523595edd9ac2851dce73ef2b102692 (commit) discards acf58fefebf43a7ea17fdc7cbe110c3b04cc63cd (commit) discards a928a051a370fee18cf799c3995161305f6b258e (commit) discards 6dcfc1f49c6afa6cf6a3cd4b7c90e59dbfc18fb0 (commit) discards 7385263f00a745033714a5072147e0c26743b6f6 (commit) discards b03eb971c6e5a282c975cc84531fba7caee43f67 (commit) discards 6d962fb9bf94585bb58044502c4ce0e0294e6395 (commit) discards cab328fb37a3e12e75ce76879134d4ab206319bd (commit) discards 11fa53d45aae116826340668efa4a035db17fb4e (commit) discards acd84715b0e4cfabbb2dadb8e7941efb3fd8f96b (commit) discards 3f0725765641ba3dff41f135c5a23b089ac40e1b (commit) discards 2aa03802ead74a2adbcb2687b6a17e783add47db (commit) discards f80b5b22722ae4e20eec33705a56c3734df2dd05 (commit) discards a314171669df6f6b8584eec9554b68b542841ba2 (commit) discards 8b627550ef91e12a0952e8ed271a4f90a8da1aaa (commit) discards 4631633ebf7cf92bc1ed03c24d51d74e00519fcb (commit) discards ddbacc21f0b21abed14bf1ba34437cf03b299f73 (commit) discards b6883ac381657dd855dfe9a8cda76b040a225dcf (commit) discards 9c8fbca2ea642d32ba3a6e4e0324c2d9874c0baa (commit) discards 7dc60bb47e942f702680217d4e5bf5ed34b06902 (commit) discards 50e3373bfe154b3fd37d9e74f728552a1c012bfc (commit) discards 22504521bd226abdb85db22fb036dea49d9816e0 (commit) discards e8e36aac89d44f7d6bfeecf795b9c662f1e5f3b0 (commit) discards ce359e539d5591535cb11a7dc59cc19b0b716a3d (commit) discards 46b3d791b50efad69db00959244b2f8f738776f5 (commit) discards fa0cd33d066bd789e8c04f24547905c78dc2cc69 (commit) discards 1d104f29c75e8cb264b94bd1fa916ae769e4cb18 (commit) discards ad8a17f8c2763e3ccabaf9c70580972fef0673a2 (commit) discards 20cb54ff1292226acef12ae75da0aa92c524b303 (commit) discards 8df8012086280e9b9c79cc393fa8cf7b7df398d9 (commit) discards 3ddf434f437c49f4a342796f2a92f28a10465bf6 (commit) discards f07caa4874144ecb7701df41bb1c2e7ef754f16d (commit) discards deef02dd4b919d85f636eecd8dca09500ee322c4 (commit) discards 45b017abd486a576137b01d41cef654f78721b9c (commit) discards 69873d4a4434d4be2261f23f99ff4f0bffae60e4 (commit) discards 7a9f867254c923cba334c73e5cbf512e2ae64419 (commit) discards 1c87eba4a16e0d31175f955ed6d7a55ce86931a7 (commit) discards 6ed1a5bb93664b4654a2f1528530d8d4e67db668 (commit) discards b1ee0f0c0c6999b4c83e66ee6fe009d0c53f8d57 (commit) discards 26df433e9e54e6a2c6bc862e2b19ad63c037082d (commit) discards abe5e4a93c0f0a2041cf670371c4b8604595ae59 (commit) discards a4c6b4d6b17b430c23aab2f7452e4fe860244916 (commit) discards 8afdd81e1c8ad9f42506fa38e5d005427beef0c0 (commit) discards b31550dba8557e9fe306b8123d172d484bb8c25c (commit) discards 96c6c8574b0a176fd27401eb2464f88c6b76b47b (commit) discards 906215d2fe7e9c6408be4c69935c150cf85210d3 (commit) discards 017ef8f70f259e4b6f826fc6bd710fe6a5a386ae (commit) discards 3d5ec083460e03b1ad57baa90cddbc543233f3fa (commit) discards 95224b2152c8df6869f02f04a1f741f5607b111f (commit) discards d75e40d647d3d8869d375455a64a78aa0eca4f93 (commit) discards fb02b77199c5ed153c9b4f7fe82b069017bbbeef (commit) discards 7bce703841f1204d82fb23fa2cfc3e91ee2d7fc4 (commit) discards f13c32c336518c1ffbe319abebea4f3e5196943b (commit) discards a93d6bfc9f94463468acde105e9d9bfec830baf4 (commit) discards cdd538824948101a207fe1522f3c4e50b39d69e1 (commit) discards a41efac3d6559d8efdc013321483ba32da5e5be3 (commit) discards f970a8a319f6ab69a734452e3d6d3c7264bec722 (commit) discards a2aebd15058cbee5fea2b692808059bc51dfe35c (commit) discards ff1e32843bee2f17f6b7d40a83620924e1ca17bf (commit) discards 2e739f3454bac56de4d37fc03d3d955344609545 (commit) discards a47ed2f3b2fd2c997fada7ad4ac245caaa8cbaf7 (commit) discards 24495e7ca1ed5abcf34db1ce000fb2b1163f21fc (commit) discards d3ccdd30915356d716d3de0e56129e6da36bed0e (commit) discards caa83f4e41630cd00e8e32f2330d2c1be045b95f (commit) discards 65b3b57e0b5d3c9e8f0b8fff5fa336c00a3e1644 (commit) discards 68f9dcba60f873d3091a1201a88dfdc2e26a1bb1 (commit) discards 2e600b5a0fc16027df9b2138164bc5268c6fc9b6 (commit) discards 64cfea7261834d8075ab5d844e0779bae4c3724c (commit) discards 4f8ab578a2e9e1221fb56463d02864ed429b8613 (commit) discards 987c2cf1d8ae76df4bf5bfc93745d898f981bff7 (commit) discards e4b7c4e3c9ab8d95c41d9c8fac4d06cfc7407625 (commit) discards 3c09aff91048787b6d3a019b36a81e1bd3a8562f (commit) discards d94e61ab747b1eb3e8209a8e6011cbd4926122db (commit) discards d9556ecb53c6a34736fee6c2b58c360203fcabd9 (commit) discards b40c3f77caad27321aa570fd59b1e63ea972ea4d (commit) discards 75501ddf13fcfcef4f59de31d0cfdbd3665640f2 (commit) discards 42232ce47b1378e7576fb66cff27e79ce9b1fed5 (commit) discards 91798eb761176a082e692411e981404474f48276 (commit) discards 28552384b40e9516073bcd099fd5f73679578c80 (commit) discards f447ad40b4a155f3501354857aaaaaa6cfb36d52 (commit) discards 11039e0002bd03eccaee930d308b1afd5dcf3a9b (commit) discards 3b6d20b90ba55652b3bd3f75ceed4bc6a45286c4 (commit) discards 7f4a91effc558b164bba6de78388543411541cf4 (commit) discards c185045515eaa9482bc29a0b325fde4f6490f5e1 (commit) discards 93c69b8edc6c0b1a69cc995c0321cc275acdd3ee (commit) discards df5dbe2d51b9b88583792bdfe818c97e8a6474c8 (commit) discards 8b8a03fc4a03845c797523d918fc06d408dde2c7 (commit) discards 88903117356d43bca0ae6e01b5aa3b687bc8a32f (commit) discards eb253f04c3b90cfd692d664fbdfe289c1d0b61a0 (commit) discards 270a1aef1c938e7683fb338075c6db432c50bc0e (commit) discards 279b421bf8e42a41b5afee9a05916fe08e278f70 (commit) discards 2dd7af2fb8a24af0e03608de327342abc0d49db6 (commit) discards 995642cbf6d47366c3d24285a9d2120b569d3527 (commit) discards e7d06d84eb0cf3db967474d807a88415fcd20c08 (commit) discards b23beeab3872c765c12b4e90565cc89c891ce6d5 (commit) discards ee3c15fe6151a469a1704dfb332a74c88b685d18 (commit) discards e907bb6a216e5d3d68b5d9609338382bd3916de1 (commit) discards 7d9197505db6dbc6369501ad68c1fa98c4bc2ae8 (commit) discards fe032a678a4e893c33ebecccec06b0167ce52b54 (commit) discards fedd71b69c7266c2aa517fbe13cfa4d308a46b33 (commit) discards 89a6daaf935e28ef3867518d28322af9cfeb4280 (commit) discards b88b91d25a83ae1079985f19109731d97da4e8b7 (commit) discards b0159b685bd6b07fff7c88f26fe0e5eea81f1eae (commit) discards 2bf9bacba60042fb1bdcd256ce37842210f29e78 (commit) discards 1c791e9a205af480cc493e992b1bc9e4d6f6fd75 (commit) discards 9eeb756f1a4c34ef598f7b5eeff4919d685ce2bc (commit) discards d4cc1d3df555e15699be48a603c486bdf12ba547 (commit) discards 40c9095f5559abe6acb1bc106643d2fd75959795 (commit) discards 92f8b11450f00cf4e71a1bd42e55cc46a1dfb398 (commit) discards 64adca56d7c4657c1aa20b11adee703ea9a003a6 (commit) discards 5cd4443436fc33e6eea2dd81ce4575b4a41c7973 (commit) discards 11827dbbe0052170df574bc23c9fee5ce7287e38 (commit) discards 1897aba57b4471d06b54fbb178caf233a4bd6308 (commit) discards 28b34545ee7e2e8de7ef8f4dbac33ae28b9d6401 (commit) discards d85228770a8062b40392e26a066954f6efd4f517 (commit) discards 203efca5072f27271f5403f0188afc0bb0df767a (commit) discards 09f36344eaa6adee6a238ae1320d57352eaee8f0 (commit) discards a237b26d6c9821464856db283e0f83152409465b (commit) discards 26d765cf6b6c6a08b03b8643cd7b408dc29a373b (commit) discards 23b5ca6d7461f3c166a0ab826c456bc30a370452 (commit) discards 97739fa35a165782eba503845a14f3eb769b0338 (commit) discards 8003ff4f85df29213becc0ac3d45ffa8b592bf75 (commit) discards eb9afec9bd9949e4a7fd26b95bf1b9a0eafcfe1e (commit) discards 07b0b29d6cb38cec581c126b4e69fc10e8e48d1a (commit) discards 4d1d9c62c5bb26fdf202e6fa5f302bee254ab77c (commit) discards d8ac93fff8a91c77294d2c5b062765ebdafdbe1e (commit) discards 6fc91ffb5f836e5878295030ea83a8f733fd0e96 (commit) discards 103203b3b0b83c73476f82a2e1bd29bb272a53c6 (commit) discards b0cc082ad6c6619653afbceca0ac2888d944e9e2 (commit) discards 1c27e7df4e033f981dde15f7731913ffd6750b03 (commit) discards b732f72a3dcda862b16e3b7a775f9d2b34e0d5be (commit) discards b2ae6a309c8e5cc729fc5269aa04f38b46311f53 (commit) discards 064ad91d29944c70567eedfa995e6375690c08e2 (commit) discards 60032277ce39e4708664bb16d74a7c20c8661b19 (commit) discards e5ecb1269f6f27aec1af3127bcecdfafc66a63b0 (commit) discards 5fe8cb993882d62d9f54475e2b0bab798d64bd7e (commit) discards 9b3f50a7a2be85f86900590d7df9d3b3c89b3cd9 (commit) discards 811442428dbf577b2fbc8400330904f13339aad9 (commit) discards f0acaa7671009517d1947cabec18668054c42164 (commit) discards 7fe51ef21ecd8c7d1ef18dde26ebe3aef688c55e (commit) discards 723ae591165ac8f1124f5015b6e76ddba8003887 (commit) discards 4f5acd54c99b0b0ada5b7180cd1cf865d9b7a2ca (commit) discards e76cbccd6e645a7b098d602d6f2f460d0688f009 (commit) discards c95156f85d7fa9a1cf1737d801a31b1bb74bae5b (commit) discards cfcc9d523d53ca01cdebe0e6c01e7e03b8fa8780 (commit) discards 3a00e367994cde14d1a23a753b5e281e6342554a (commit) discards e10bfb77472f0a1706337e03d53f9c14c2347448 (commit) discards 67dbde412032c40fec53387ac32e7361b208166b (commit) discards 16f5d1843b3720729f50376f522550fcfa787a3c (commit) discards 343a2a6fe2bf4ddd7b661fee1f6b1315247ae01d (commit) discards 523ccb5cf99486b8951bec2505c677310eee710a (commit) discards 6e81fe754311f879d384d66cdade128afdff7313 (commit) discards 48f4880a3d252fa8fd86896d55c88ee90a3a04af (commit) discards a31c85da5ed82d913eeb71ebbbd4d51af4625380 (commit) discards d5dcfed6747cda9f835988bd3d02ec4b4864fc54 (commit) discards 117d49b8b7671b7ad2901de444da725eda8ea8cc (commit) discards 1d0b45af79dee7fbf4ca3cc88b5da61654e57ba0 (commit) discards 4ef291346729d0807a9a0f92b42b517941cf9809 (commit) discards 0d8d36d0dc8f89116bf8b5a6f11bb367db2c23c0 (commit) discards a2d81f68df75eba057b47b96a7dcab81bee75ece (commit) discards 565661ea6680b27fcb8b433c4bef94a0bd1dd2ca (commit) discards aad2a58ff2946212d9d6f6de24a5b756fb482701 (commit) discards d8d7bbdb520b7a9b5d9be900a45d9c9559122179 (commit) discards f3123711dfcaea5e1e340e4b0203f23e8e5fc3d9 (commit) discards e43f7fc454d9f8551ca6b2740326ad89ebc05dd3 (commit) discards ac4154fb048ce3291651ae97d4d92b2a6440962b (commit) discards 35ab6c4b9ecbdcec4b5fbb9a14ae4381c2d99906 (commit) discards f368abbf74ff9b59b40e142a9c54ccf88c7c49ea (commit) discards a2358610481fa1206418d43bbc95aaeda3f54816 (commit) discards d8dd2a7aa7f94982975fd1786dfcc0203ccc8428 (commit) discards 257e7438abb7a536dd59c5e85a5ab5b7c74873a2 (commit) discards b0e539efd846e166441cf219029daae363ffacaa (commit) discards 9b40c5d41d8ab3cea48dc0387d6f2b237628c985 (commit) discards c87c437dd7e2fe613026fe7efeb3472adbd288ec (commit) discards 6dd5bb882afe66f252a7c925a30493cb207c9fa0 (commit) discards b62d3d17ce22297278dd084ab11142899d91157f (commit) discards e1098e4313117275e8e39262178012c630fc7917 (commit) discards 36c86a814a4e94985dc792c2157bcddd53da1738 (commit) discards a591cf634cf4fa4ce971886d0ff0f16224da0d41 (commit) discards 7e33309c1755f61326f8d11403d4b72c0648ff7b (commit) discards 328b26f818b568d42d5fb1bc1e7e6cdf2eeca178 (commit) discards 5d24c399b564cb73442e33471fdbcd2e1a390bc6 (commit) discards 0f92b26643bf519218f7ea7107eb2cf617e48056 (commit) discards 3c80335160f44d7faee118d15b0f670cd1ff6ca6 (commit) discards 55d32996139459115e92666cf0d54dffc037b754 (commit) discards 804de5d0269ee1f8220bccaa743f447c75252d80 (commit) discards 03c85501c6bfeac86f8fcdeb066722949a5b9096 (commit) discards 881bf217627b0c5b7fbf18bbe2f3282cfc832209 (commit) discards 20f70b2dcaea62a60cf8fa30d1996ee32e7e3fb5 (commit) discards 19745918026efa558514cfd6959dae0d7942bb2f (commit) discards d2c6fb212b40a79e8496b84fe109de36d8f8272e (commit) discards 230be56f8a16737754085a2c26ba382c43ff21c9 (commit) discards ec649040592ea1ae06b02c3a9665f72f9ffbe6a5 (commit) discards acb550c33e9b1c6a19fb7fb9d691bd45bd8ec795 (commit) discards e8f8a0805ff5cf70cd962c8365dcff47797cb45d (commit) discards 8cebadd7215fb67b9e2f73e341d8a04520840a04 (commit) discards f0b50da14d9f14b1a548784eeddfd16eedc0cfea (commit) discards 49e1c1d7819707a52a5acf37dad5457c4ea3061b (commit) discards 22ff7d51595092f5e12e0d604ba5c808ca1e9447 (commit) discards 199e3b8d359905d04539712cb67a8d3e2a371735 (commit) discards 20de7946aaa8b225cca300ccb2868578eca8623f (commit) discards ced9d8ada2bc6bb3944cac9d4814a75bbce8aa62 (commit) discards f639bae9e50a9317798a2a583b08dddc24f85f4e (commit) discards a03222b0b528e2598e835d69824a5160c70ee476 (commit) discards 1a4b307c15e0bd5e0eca48648fd9815d32369ff7 (commit) discards 6ff8890fbd07e4aa93a2d232fec5d28321192672 (commit) discards 9af8f411fa6df6268597a0ab744048a5e6bae341 (commit) discards 1835942c915892d6a27a869f49f5583de0b34284 (commit) discards 4b07dbef44da7241224820e19fd74211cd84181b (commit) discards f619480da3071fb404124a3d042bf0769c450c93 (commit) discards 78a209f9c233ee5cb6c246b0959d988718d88611 (commit) discards 4a6fde6ca620be16e621f6b4a224685730cd13a0 (commit) discards c5c1a6691e47b765755567023b930c0456019f90 (commit) discards e720b5f39b594f48e4c0f1b2133e071c63009431 (commit) discards a7b285b07ad87bef6503aa7ededc8af6cb20540e (commit) discards 8913439f0bd4fe8fb314ea86ea8fc6f48511609f (commit) discards 716a09b913fa42eb50fe5039a39a26df58f70da7 (commit) discards 03a3f24612e30d9df30bc30227febeb0977bbd7f (commit) discards ad5e439deac90094883bf6f050d5877379e22a2c (commit) discards 295b83a84d068b7ad673c586e085901a0779baac (commit) discards c8db8b97f9364a6c0677c698f7ce5bde1e4a9742 (commit) discards 7f0ab8ed3696d106d2c0e678ccc614fbaf1ec71f (commit) discards 58f54d3a0288d6210eac005f933cf1d7f5bade53 (commit) discards 60014e9faf147fbdc6d7789627f02da3f176d5a7 (commit) discards 4a67aba1018f6f5e203cb02a32040145951077d8 (commit) discards eb7ca13c574c9fbf5863adf3904a9f207e4b4d20 (commit) discards 9adc7f65f8ed81258090695833177fd4cbf811c2 (commit) discards 6458382373c381fa7a1c99a052b7c7c3e929dd8d (commit) discards 73a3b5a9c0288b5535e7d0b677b2a576dc2249e6 (commit) discards 05d5d46051003f3b1d8fc89e21519ecbc7ca7ab2 (commit) discards 9c717752e61305cfd522380ba7e9bcc40a95cdb9 (commit) discards 92b23ad8c22e384736b165214f1dddbcab5040c1 (commit) discards f53fe86cef5a6ff342d8ac5b931e1998e5b7744c (commit) discards d0c697e47f54fcb626f3ea9385c7664deb78c637 (commit) discards 030ed07d4c22542422af9ae6e226ebec6300d36f (commit) discards 1c2a6406a4311c59afeb3993982e74c7c8e38bdd (commit) discards 137ba24f5d2fafefe812b592df2a96a5720c8304 (commit) discards cf9453139841a31e07f5d5bbda87a08dc05e1a59 (commit) discards da0ddf16cae7757380c898656f71936a67a4c2f1 (commit) discards ae0f52aa32424dfa446d9449cd30a570c0ca4bec (commit) discards c3181e513d998593ac6c3d8a0baba5257302e32f (commit) discards de6472a9aeb36c16414062f858fd34bb01efd652 (commit) discards 66d8ec9dd1c936873ba89ac40cabe1b75b7230ed (commit) discards 3be554f2cbc3cfa45458df87d0f25e50927c6006 (commit) discards b66c5e52b235e032fcc01773ae6e3e91cb0caa2d (commit) discards 1c2a51a800691344234f5500919c0b005f2196ec (commit) discards 30b10c7d6d4d570855a01376295d3125d8fad6ea (commit) discards fa843e7614ccf613e7709cefbcaa8935616d5900 (commit) discards 973e97cd31edd3bbf6326a81f9dcb1712392b40e (commit) discards 2acc0abc0c34ab7ca49777c8e64ed455c48e8ce2 (commit) discards 48c73f5a01e840039b18d79adc788708d19ffb56 (commit) discards 7e4a0d873f746d1cbe7b421795f6c1b0d1a7af21 (commit) discards faf5e0ebdae22a8bac15d4b3fd1239e645d70ffe (commit) discards 3597b371f980b961baaec9990c70902ec27d0dea (commit) discards 34b00442235ef7f0073908b7b5be5a09d8b4a00c (commit) discards 498165092f3cb117e381f833c0faeb03c82209fb (commit) discards 7dacb71df22e5cb6c4f32cc4b6347d4bcf2c9c56 (commit) discards f3deee39e482cbc898f78d52c261ff9e1137ee7a (commit) discards 521b470688cf71f0c798e8fb515f8dcd4d62a60f (commit) discards dc756e35d35e14175db0a91040fd587ba2cf8582 (commit) discards 3887c55e5e1b23bffb960f797c25dcbf343c7e84 (commit) discards 9df32d6e8dc0075d6c80ae344bac6ac7b26d9ee4 (commit) discards 0110ad290e5796cc8c511f48939b9f79f67cc653 (commit) discards f8a917d886a41d5fbc2c734db8b078eebce1f33d (commit) discards 937d3d667d624fc430c9040213c6d179620a0168 (commit) discards 9274cfb8630c96c2aacebc6252d5c7d7596ca35b (commit) discards 8813a3a6913690eaad76fe7486efc1819b5ba113 (commit) discards 5c42e29bd532d48299354950ee8c3a62e0e7f94f (commit) discards c2262942c2a24f088f22b9089e37a2e256d85d7c (commit) discards 93a4cb7f76b162ad29b4d796660395d621b23223 (commit) discards 3ac922460dbb6221d1fe0702b4eb305c84dc478e (commit) discards 542875b07de07a9ce2289a02cc576976898f3df1 (commit) discards 64f4259b199f471715c484663bd08e288a74bafa (commit) discards c872423dc917a91b61c91eabcf1648413bc88210 (commit) discards 9dc34452ef78b67c7b33bf198ccbc3fd06721f74 (commit) discards 9c7a7154ef26d6dbcb10b36b0a2e599daf79b5ba (commit) discards 45a799f000067991147e32a56c331de858af2bfb (commit) discards 84351658ae6c344413382dd93830b0959b136ece (commit) discards aa32f715b0950ff1b81735a270962d803dfdd65c (commit) discards b05104419a750ca1039c40bfa0ef04aed908674b (commit) discards 6d6d6d891dfc4950149ab9c0454b5315ef945803 (commit) discards 487ce279b6a1a4a326b13c0056d405466eb38164 (commit) discards 0f054a775aaaae2183d07b43a69a099d76613dda (commit) discards 377027bdfcdef823f282c7d107984f2ac41310e3 (commit) discards d6d873fbd7af072e10362e2a4767185117068c5b (commit) discards c43b4f8fdc9a2f1072509ed4eaa7d4cc1a6cf234 (commit) discards b5ff9b5676858ec63e0bbb84686ca7c5f495c47a (commit) discards 113cd6847ae40078d49e5fd4b3aced9d83284032 (commit) discards ee7fc8b23c16a7692ab398909551b7bed1022d3d (commit) discards f857471867229d9f364f2898ef152b7e4ecf40e2 (commit) discards 8f876dfdc3d7f3b609f1b4aa9084bc60b86139a8 (commit) discards 3be9d3d9790ae5cbbe419dd474b6984a0631a6fd (commit) discards b4751893d6596db6dba0b1d44ea19390308ef549 (commit) discards e9dda568cef8da23dca873a9825d67ab93bbe2f4 (commit) discards 24b99875e384e1141b6e8e2004718e890b765893 (commit) discards 9aa7aabe2c969b46359c9e756b5483e213f1d06b (commit) discards 3101b714421578987d8dc28e097baaa3c1c29aae (commit) discards 3fd6cb7a7894811679d8423ad301b55b520d6ae2 (commit) discards 7621f4f4012d900cd6fb588fed076857de5521e0 (commit) discards a4c0917e1eebd45e5ba409c7fcb28b7a2eb9225b (commit) discards 382dcfc4eea6ed4ff12fe1a1dfd5fe243fd3774d (commit) discards 5373eeccbd6911aa862ecddbbd8fa520646447e6 (commit) discards 680f645f5d26b05b687965dd1baac38b0551ac9f (commit) discards 87605acb1c89dfe65795fd99b6acb2b9553f74af (commit) discards 3b4c612aac81b5a8ec5e53fcd847eb8a03e3ba59 (commit) discards 08f8b2ab31d4df0b7b80a8d85c8719e07452880b (commit) discards c2b4d892103a99b61ceb8ece6911b6c8b8ba3d5a (commit) discards 1ddb9c87379fb888b1ba3fe6198214486dd73f7b (commit) discards e564fe352916316f0044a4ac4491a54b3c43c7ae (commit) discards b7b7274f3718b3ad7cd83db06a04adddf5e5acc5 (commit) discards becaf5107b9e2f9e2df1a14d2b4d169a37f846fc (commit) discards 3dd60a3574b97ae10e437fa6ed31aa530dda62ca (commit) discards 0d669fb472061be4fa988febf6318e45f37883e8 (commit) discards b1677521acfb581d8c298cf70227c442e9cb1dc4 (commit) discards f6eab59bef91d8c51f247df950750591669ecbd8 (commit) discards 5e0cafb14164d92300e618c4ac6f5769ad5b8450 (commit) discards d018a8c8aac6cf99594dfadf5561b94f3de716b8 (commit) discards ed645b3a720e7d3df63aa39da3883a994e74a298 (commit) discards 76f0fd05a5fc25eb8a3c86aae18371c02417f0b0 (commit) discards 0cb1469e2babd1af11d2c290c6dc24c7c313422a (commit) discards 6dfbd02e6455d25b98672cd366408f8746557fc5 (commit) discards 44f5dda355f3ac3763c0e47fac99c292835b1ee1 (commit) discards 4668f9ed6842fee90007c6134710c0c2d9aa787d (commit) discards 7b24b3bb11baee969d6a8942f08c8f6fbe108f35 (commit) discards 683c4787ed58881343f8f776e04379dbaa6a21fd (commit) discards e105df31069d07cd3aa3da3d1671e89456194c72 (commit) discards 8ff25210e96af07cc722faa1813711785572ea45 (commit) discards abb6548710a19ffbcc7168229edc7828dd1d3326 (commit) discards e10873cee168013e854488cd2bc7d1753f817539 (commit) discards 43f302ff68cdf76521c0ab43468b6190e1e842f0 (commit) discards 5a6f29d605b6357ee65154f78aa2d58952ff2a1a (commit) discards d09e66b35791aa4c54abf0d9e72ec4b3d2440efe (commit) discards 3f3fd184b3d219f0ba69d7bcbd8f380f98e9fd2f (commit) discards cecfc27b895d919f62026eb29d45e8e00ee52c8d (commit) discards 7a9ebb1c6c10cd31884e2c287d626506850bab4f (commit) discards 63966e13c4b02f45a02b6a308b7d9bb70ca77efe (commit) discards 5f933bd6620e6abf54268087d6714691cec57194 (commit) discards acd292f497cb88d2212be5fe0752dadb05bc9c2a (commit) discards 31e92e6ea1fae6e3d360dbe49edf032f4efa4523 (commit) discards 20a2a98d7b2f61dd3ac74b7073a15ca84efb517d (commit) discards 6f530c8dfbc217cf83b6e27e5c312b4661b2c8fb (commit) discards 2a94c83c8babd8c42001d593dbafe6faaf291938 (commit) discards a7d27cb8910452060b063e73f6f70b77b12645e0 (commit) discards 259ddba4fe9349093f618e553f7505c2dcf76200 (commit) discards ffd0beb99d554a55e2a895dc4ff572bd1cefa0b0 (commit) discards 8caf05055b61c0b47782540e7af4c97f409cd1ee (commit) discards 9b79e030af1300f231df35a1114725f734520fc3 (commit) discards 883f9c45c53320c48939d956c4bcd4c47b850716 (commit) discards 1df2cc256c7a60d3075390a5dd7704332ab1444b (commit) discards f14b0bbbf19f09d914635688d325f72dfd450898 (commit) discards 39a3b09a53ea3b8334153b97805ff4cd99593386 (commit) discards 2986208551bbd84b7dfe8fa28955b334f2faced8 (commit) discards ffc3bed3929bb91079c86e40f62194f54872c1c6 (commit) discards b941b3b4b7ae8d550418ed3278b023674e64c640 (commit) discards 4e4866aa7e26a8151683300da019208a9cb06f4a (commit) discards 9783c9d76f4feaa77b4952b99179702195c57484 (commit) discards b0338173a7374c328c7b10691da55d4ffa57fda5 (commit) discards 543db74ee695f2da558b1524a77850dd2d491fbd (commit) discards c34258c8190cbf2978067168d80fc4c6bb41d369 (commit) discards 661712cd21acc4ae8d6fc865eae49a6c9c696557 (commit) discards 1e1bf45e270773fa5b85957a1753dfa162baca9d (commit) discards b398ad685ee8e6becd8a8da37af80d12e4d8e14d (commit) discards 08147a9a0cee722196ddf8d63c25c5d1f8ebd336 (commit) discards dcf76f3c79b4fae61eadee59bc1ca5e0ecd36dfe (commit) discards e1cff3e94cf6d46776d33d0ebe83aaf826bc0037 (commit) discards e45be64386ea6974c27e58f8253a7144956fd767 (commit) discards 4960ce1287665ddbaec12424c722f4d0018a7756 (commit) discards f94ceec95d7444fc6d4f151f8d8a07643ec27db6 (commit) discards 1385ec49f071e81838bcb5bf8973c6fcbba9e280 (commit) discards 0e0a60ac4ea0687ddd991b80762f591b79f2b528 (commit) discards 58f96e3e5ed6d62f7aa381283fbad16a5a8b4847 (commit) discards a7dec996fb26a27411cafe2872ad255e741f3fb4 (commit) discards b5f23d67b5d6be6c7e4d970d23ca4eb86a6857a0 (commit) discards c941d7e324b88ec7cda88dbe99e64b1b37f42cff (commit) discards 5faad89d23c55235bfa4510c7378bae5620053ae (commit) discards 164d11d3dbb65359fa64ff1b33478d7a21c3cf62 (commit) discards 58a001242c3342838d4cd19303b093eceff678ca (commit) discards 4ae36de53a171357889825a863460c8eda56844d (commit) discards 3c9b31e2576c518117266429de50298b86bd7bb8 (commit) discards 77cdfa1ce75e992b58a00b004d1dcfbe84a86c5f (commit) discards 82913d2acfeb90b442703bd53b7c8cf9015d3d9a (commit) discards db2a97da1ef82d54a9a4a86c125c8accf3dd0814 (commit) discards 2dc870c081a5a1d292ff57e8baea3e80a83a8bb3 (commit) discards 88eced78c37f90729afd43e466568e240b95a5fc (commit) discards c0ae76151e252e572d2abf8fafc08fb3eaec8563 (commit) discards 47bc139ee6e7043b1486a89e97a25941cb00a356 (commit) discards 6316178da0d01778eb7a82e0c2c77526f0a0e47a (commit) discards 778a3a92b1dae56edd247800002da7b75d0a61e5 (commit) discards 4826709d4b314fb30398ee9ee0060876b772abde (commit) discards 270344ffbaabf2a0bc44a2dadf7fe63c302fc124 (commit) discards 063d1758e064310ef90b803ab03ab16d8324b6fb (commit) discards ad90bf916fde6ee0b929bb971053a09d6f89ef20 (commit) discards ae3b13d414dc4802805302b2d754fa915e78e379 (commit) discards fc97ea8c4e75885d8f21838e8096fadcbf5318b7 (commit) discards 92c573bbf930e9e7d67e27f328d5627659e089e6 (commit) discards 2861573b6ed32cc6d1779f23cc00d58d35123cb7 (commit) discards a4ac72e7c925081e8f353e6fb62d9c782a8fca3a (commit) discards 6b90c1a174ccce659569ad2c630275bd0d60e73d (commit) discards cce8b1abbc622503188f525347d877523d74d0f0 (commit) discards 3721fca04d6fff4c337e862192f1fe86bc1ce754 (commit) discards af464f982ccde44217892200ef3279456ce220b2 (commit) discards a39310dc2250b061db63ca2e0c78aa080b8ab63b (commit) discards 49e77f3cb0d4365e333140911b3a782512bfe4bb (commit) discards 32ce5957282a4e09ae7023c4ba3ff3b058998637 (commit) discards c71153606ef52a10fe8d1867f169bf28a8baf9fb (commit) discards 83ac11ddee0b40999bd94d52c4fffd09ab268a43 (commit) discards ce3a4cde0cd851d3a1cd01b10f4c0cc39e5b5742 (commit) discards 4f9e8feff6fdfe494c2593f9a134b9bdf95482c6 (commit) discards f612829d6646566c22e52801dcef139eaf93138c (commit) discards a8c067ddda62aa792afdd3cad96c7b5e91782044 (commit) discards f2071631488fbc22d309bef66e839f21bfa996a2 (commit) discards cc35daad41c2dca7625f0cb509083eaf18df1d2a (commit) discards e7e0c3d2bf5acdfe910f88f82649e9ee77eeb51f (commit) discards 623dca799db66d64cc9a8d534f9b47bc4ab8c2e7 (commit) discards 55333e9accde64372a8c5055dde2c9f06f81ee18 (commit) discards 96b3231f81778c7d7a7bcfdbc299dd0fbd47de3b (commit) discards 3ba6490b94f1268e6a9901bf5a78dec9459ec64e (commit) discards d111fa6817c5974a9fb4bc3b0d604493fee12a19 (commit) discards 3f2388be33118a6f17e7907347eba2b37b13d996 (commit) discards 3f2e77edfc78b4a1780a1f9b0cc8ece0f4f030c6 (commit) discards 716ad6f482964d7653ba321eea53b48d60a8b745 (commit) discards 2d4fed8ff924cdb5f0af9c62d869b7e7c796e77f (commit) discards 151658ccee329ff2620872d689e5429a3d01196c (commit) discards b1be66ed644728d981d26e67a375a69cb23506b2 (commit) discards a00135f26ba8f5c8d6bd7d5751c2e229455170b5 (commit) discards f6e2ec7ba59e0231d128de54c8cc4a535c651197 (commit) discards 82153a79e944e44594ff7eb9a39f37d1cf000675 (commit) discards fd5e3ad4a1c5f9ef8e6bd3f19bc1620c58010f93 (commit) discards 878cebd3c9ce7d5dec268fb5b4d55b18c8b4e4a4 (commit) discards a84f34ef545e626650df811a711b61995d8b7a47 (commit) discards 7ef7920915b014e38f4e1fcd79bcd291b9497934 (commit) discards 19ea1c6f3ec02bc9e06f4518f8dc1b2d3497aa22 (commit) discards 3e72e81c21ac623fe849f2272d2052fe2e68c1d6 (commit) discards 04945b5b3bcfb1f38741e59fa74f788847265e52 (commit) discards 2e495b948fb8f18526292be8a0a1a73f5845731b (commit) discards 15470969b867442b5547425f830a71fe4977195d (commit) discards 495ef58b5686cd3073aa1f0a6cd7fc5b1893ee64 (commit) discards a67d87f7d1d8ea4a18c4bf59a3ba1b21c59bfd57 (commit) discards d948be4660331e42e683c6efa8c34513d7b22670 (commit) discards d21c090c5816913599e6d19954f1d3e8fe490063 (commit) discards c637e81d6a0b1d84482ded02702fea8598da8e63 (commit) discards 033d75bacc31269808e2964d0394ca0cff2d4387 (commit) discards c48ec1eb7473ed22f47f43c75902120b76651f4e (commit) discards c36aab2c1e14c8b8e9e3dcfe1d33ff209a3d10e7 (commit) discards 9220295298732e69f2ed3d7c21417d20ec72fef9 (commit) discards 228dfffbe900b161df292a2c826ed84de0d6551d (commit) discards 267736ce1e5827e30fd49c96075adeb123aca2e3 (commit) discards 6bc79630288d468ed1cd669aa3fbda04b5adb7e3 (commit) discards 5b7ed7a73661201dc691477b81ec2436723d263a (commit) discards 4e6d18cf3cb0d2aac2aabe388e3be38153c43a6b (commit) discards 5d30d016f85ba0f94450e60b68ff627be3599318 (commit) discards 14abcc1dbedecfb7aa6a945fcf29f19d3fe4465e (commit) discards 0a500eaaf6e37f5d413d7d2384769e144e951aa2 (commit) discards 26ccc3821fce09e04540dacc3714a3fdb278c6b9 (commit) discards f9c3f0a7ff450d266e54621cfe5009e5aef3ea1e (commit) discards 06fdd262b21f3eb7b23a9d90e2582bdf820122a9 (commit) discards c346202ef815fe600d7970ddf47cdc71fa3b4a47 (commit) discards 882544cdaa44612ae37b60ec5fc45c6909bd8efa (commit) discards 7455293496e8543830b3a5b7c1bffbd58713014f (commit) discards a24eb94f5b608441265eaa591934a4b0b6d1c46b (commit) discards 05fc07b1fe6793147902a4363b61c12ae0c40c5f (commit) discards 1e9cfc0f22edb7df06dc6059cecb712b06c063a1 (commit) discards 4752866b6d3a4543572a9b150571d623e24efd4a (commit) discards 35313e8e7b9286388c51bd4c5cbe0e4886730e47 (commit) discards 9b73251ba80778b7e4c97dabe549e285d478d7b3 (commit) discards fb5c12d8d3a4a653854f42c15a6a170a5b5e1261 (commit) discards cad56c165456a71b2d078bf562f072ce703499f2 (commit) discards b976c491833cbe263ff972624650087253b2aa30 (commit) discards ab90caa1110936859e9bd2c46aee3e043d2aab6e (commit) discards c582f6801bbf2bd0c7f5a61f2c648bacbb4cca8e (commit) discards e1103fb672c66d832dc84d74027dfc249c4e9b7e (commit) discards 20d79eaca06f1d8577fdd5922ec78e70af690e5b (commit) discards e526d71328336e1a07e5990b79b1adf2ad4740fb (commit) discards cc07a7b80d1295de9465d9798f4c6874356990ad (commit) discards 60527028258a114ce5b7bfb5779f2611f1c1a2c6 (commit) discards b2989d1bfc2730b1539c587142a23f7cbaa3088c (commit) discards 3fdb3490503041d999e8381c11a1e431953204df (commit) discards b7fb0ad756d908018ecc53ab50c153ec22b4bf4a (commit) discards 5d7a437bcb781a6c8b0d2b29cc2c6cc911de661e (commit) discards 5a023c8cf5bd0eb30e9a1b6805fdda04f339fb87 (commit) discards 7de7776d7f01054c97e3ca4498cc0f7d8ce106e8 (commit) discards addb1dad4f1f99e054f3fc3e0f94d571ef8842c8 (commit) discards 8fbc8e473b347d69331cd120aea3dd6c33e98599 (commit) discards 88b9b0a6f138fa933cd9d286c02fe5a7e255080a (commit) discards 636bcd6428f4c05ff7c0c7d41668e306e2d1789e (commit) discards 8766741e7fefceb2302243e8fcc16def63756c64 (commit) discards 4283faa2f135cafba8481a0ba617b81ee126dd9b (commit) discards 55e1200a87f9775d159906d52955c2055e30560a (commit) discards c0389992b2be8bd4e458a86e066c28380d26ea96 (commit) discards 0fef3c54a68b279bd8f7bc4135886ceb01ea10c7 (commit) discards dd2a1c8d230d2e142aa4ff81f4e1c34c938dd4fe (commit) discards 96e918c6b10483cae8a67b7afd44bcabca39ced4 (commit) discards 065e54e569f7bb47665ec69564e3fccf3dfa0db9 (commit) discards 8778d695e411d65611e38a4cb6e258dba14c93bd (commit) discards b09b42f168772d781d6e80568ed8c986343cf915 (commit) discards 22bded47beb0417d004d152ab35e2b57b9e3c338 (commit) discards 9a24d6a269df453ce684bfe856b7a3570f5b141f (commit) discards 96a151398387fae00dde98c2a626f38b635e114c (commit) discards 786a5bbd1612a6da3487aae97ae99a88f20ea272 (commit) discards 7b9ac9cc4805d2be79364ce2a18baf66e7415110 (commit) discards 650938a289cc5da9304aeaaab6ee3fb85710a204 (commit) discards 36f0c5e076363d2fbc66dc474f977c1ba32f461d (commit) discards 252e10e0ac05f082269be461ad522e32c84b568c (commit) discards f271764c40abbc481d9920e907b7a547ffe313fa (commit) discards 940375c6202eaac97b0967204964163b5b683e9d (commit) discards 29164eaa8289efb4891dfc8c46f75d87c5a481d7 (commit) discards 2eb7d97faf19dd8e545aac544fba318a86383e36 (commit) discards a8afd07610a92140e7f47af1672cec2441d929a4 (commit) discards 7a846d46997341f52591cdaa0e500d2ae328eb06 (commit) discards 979b1f5bdba2d1d3f27cf9c93013f59094519944 (commit) discards 154405face0b7e8ca7142fc7d2db07ec64f10a73 (commit) discards 3e340be968ce920e7d21156453acad7810b8d51e (commit) discards ade9860f531113e13ce2c5acb2cbc38797ef3556 (commit) discards 7b668158627f94d69e8dae1c6be7d6f83f0fa49b (commit) discards 732055ef56d0c797ece0af9e2ca396e53734bc1f (commit) discards 5c1433dc295b622be273614470e778fc65460efe (commit) discards a970363ae069e1b40eba2444df303cceb6d5d638 (commit) discards 23a2ea9d7f1bf9e05462e78508cb4a8a5ab0d28c (commit) discards b579e955b411029e189c6f173884ee25be3c138c (commit) discards d67b9669fd1511a4bf8f9732c37e35f7d70c60ab (commit) discards 8cb738cb008759bf5146822834130a466a0f74a1 (commit) discards d87154d0dc3881c81df8acad8275c629d48832f5 (commit) discards 7b5508df640190bc6bbd8542de6ae5eeef4300a2 (commit) discards 715a873cb5aed773241c28cfa24a490b105aca84 (commit) discards d02435b24edd127ff33f2eb9ea3075b2898ec057 (commit) discards 7d88907a36306870673898a452cfa2ee77d3ea4d (commit) discards 4ab54236e329f882a31081780645cd853ea90a63 (commit) discards 01bd45b35341d83cc4f44c0976f14883817c0351 (commit) discards 41256e03c170a8395bc5cd59fbe55bec27f4e19d (commit) discards cdd8c25052c9812b4845113d7d4dab747cdfd4ea (commit) discards 2bf5bb2da53b24f90a1bc919a0d39ac008ffa5a1 (commit) discards ccdc5dd7f82fa96d2b466a1de438e7216229337f (commit) discards bedffcf4df1253dd86a6fa4ee9dbee3f78d71971 (commit) discards 6e0a8ca07576308cde48d6554d7e5bacfef1451b (commit) discards 023d01589b2313816cae715e990f0dd8b37b6e86 (commit) discards 26bea611b12f8b2764a48d42efc57892f9b41657 (commit) discards 8c8bd72d962dac7d52c74e7d56eae3ea93b437c0 (commit) discards 19b3dc41898c7534acfbd9d752de0225e5398bcf (commit) discards 3d1015405b77213c46a1795a1106b0a7914899ac (commit) discards 6d32d5361e497f6b0e27647682c3004be2d40ff3 (commit) discards e6d7f7695df7997fe20a4f14e8710f95bb87bff9 (commit) discards cbe044c42d1b11d780c7eac6a78dffa62ac62966 (commit) discards 8d3944cc9860454b1309ce8932cc15a94536964b (commit) discards 231ec7854b464159ec1ec734a052ae651f400bb5 (commit) discards 03c259301d72cb598b89123acc7a478bae9c9c32 (commit) discards 1f66627c467ee3df1b11b44867bc911464584195 (commit) discards fd65691ec3e92d8268d8370588b0e6bd3add0f1f (commit) discards 4cfadee82628e5c8e7a7c33518d525082db1cc8b (commit) discards 358bcae013fc6a3f0b670ad08942eac5abdbefd2 (commit) discards f02136bef4677fe2645e35226557943b835ed0a3 (commit) discards 0862e00c816d5f1b4676b4bcde7c32a7e265faa6 (commit) discards db6015d2487b427bca8180209ca6656da0386d93 (commit) discards 3248a77ae9b6459e0a0fcd63092cfe1236f51a58 (commit) discards 77e56c9c1bef782500416e3c8242f77e2719ee8a (commit) discards 7fcfedf5edcb5658224542f6aca6514177fec43d (commit) discards e2baf86f385525ddd17f60109578eaeb15dd3526 (commit) discards 47ea61600ffab189b8bc276194c2b7dd039e286f (commit) discards 3ea7bff85fc1d5a6c27fd63f54a984da24520375 (commit) discards a2c2997e2151a12cc7e267bdb5a6eab42594e85d (commit) discards 0b1f41dfc4794a636dbc52975c950c6b4dd9ebba (commit) discards a456855ece62f7337b62bbe578ae1eaebe73c8c3 (commit) discards b3f1aef5ee65d66a9f075f02812c90383eeec6e3 (commit) discards 6d858ce5d3cde10c457da8cf9372339db018e843 (commit) discards 37c976a599fbc7ddcffb640211bfaa19dfb86cad (commit) discards 96f4b0c939e18799234dee180d4d6ae54ed61cc5 (commit) discards e20951c90df511cf0374a9fa6d27ad8a131b4903 (commit) discards 9d230d94b91625ed2edaae73649b0371013cf54a (commit) discards 3dce55492f97de80f455a53d5bce4178f2ae11a7 (commit) discards 7b38cda3bc92ab002b19020a1c201552d039a6fc (commit) discards acf26f03f1cdf55686dc50cddfc4aa6fd68cfae7 (commit) discards 9c9072439af6d8f16ec407789e8a1223dd7c7564 (commit) discards c3d33f3b0d9341d1a5927382ff58e6ba4baa330f (commit) discards ba75619be0d91624d2cc2451a225bb31d187be65 (commit) discards a991ddfd46c94f2743267ad572fab75936d34a10 (commit) discards 92abc662014dc135ea5af612861373c67eb94734 (commit) discards 464c0314e74dda86d3812e7022d88f516258dbf6 (commit) discards bdf3feb98e2efa29ac93873c5b16f98cc02143ee (commit) discards d158158255d11b1bfb3aff01bce98d1125dab757 (commit) discards 93bc501d43c4ac66b1f27fae802054b7efaf40b5 (commit) discards dd82a1338bac70f4fcfbe2c29293950c250e605b (commit) discards a25fc62ac40f2fe24a7d96d9014d03bf604cdad0 (commit) discards 23f212b86d1890722a8e58ff4153ec60df696580 (commit) discards 5f8521d0755f65917b8f406e78097b9b444af094 (commit) discards 0546c7fa0c379c154b0da606ff38b815cf3da25c (commit) discards ca72f3ce24edb8959a2d622c5fc34139e6b81fd4 (commit) discards b45d4a883d10a8b3cd2ddfa2fc9fcbdfffbe8187 (commit) discards a52e9382ed912858423b4683879109900376859b (commit) discards a013d46b49596bccabc9d5741499230ca015ef96 (commit) discards 3385d860ae497fdf9b1a52c7701ec6013ea61c16 (commit) discards 0e73e4a606080880589ed1f4273ed01cb67b2fda (commit) discards 78a13bcae980a8e50c3a3895c8dff652156dc605 (commit) discards f5fb7f1d1cdb87b03576b607e78a6ced9fe631a7 (commit) discards 67e11dcd03afa00d5c7cdc83075eafb50243f145 (commit) discards 15411eebfe1f3407a620d96ed85d92d67624ac5a (commit) discards ba39a6661b8be65647e4651b1356e4f25c0688fd (commit) discards a4bd5e7a13f9ab7b50f4b5de3725b0f531c3631c (commit) discards 0e88d9c0156e74e422e1ed7e22aef9cf6327180d (commit) discards d261de843aded62176a2737830e3d2c3248c03db (commit) discards 0719fee046e721f703fb9dc04b11b0c33298b756 (commit) discards 65cddc1e1c64c7ddbaf8ee437616e301d5dd030a (commit) discards a2bff698a27adbbca715aad4534b1fbc4f5919e0 (commit) discards edf57f39262a38c17ba78501ebda5ac7eb23fe4e (commit) discards bae0e9c394efd50193f468f5bfd9e66744d8dbc3 (commit) discards 000f68c3e015fffdab01f3e9768fa4d9f28f4df2 (commit) discards 8de77993724933156f584fa6cf59fe4e488a55d7 (commit) discards 5e18337d0c38f7d12fd44509112706f21f75a9fb (commit) discards eb21a05a987f27982f8918e1f771bf19accb4281 (commit) discards 8ab1833c2ad99fa882b7aa85ac87ded78c580576 (commit) discards cee12fd8a8c10258e0dde6cb7c44b64eaf65712c (commit) discards 998a7db7d498dc96407ad960f24d5294859d889b (commit) discards 0efd8804fb40059974f5aa1d6d2eda81e074ddd1 (commit) discards f8c53bc39a4cefa7451daed75440cd481f124e8c (commit) discards ba06360340174b280a39feac915dcbb1306a8afb (commit) discards 681338ddfd95a1542b05bdcc385cce59d08658a4 (commit) discards d5cf49da4240421a03ee3c2d17078371650a23bf (commit) discards d861762709fdf5bd01be4b83e4701194203c646a (commit) discards 58c5065bc5bb5d08939669c2abaea4ac8835b75c (commit) discards f3ec1567ed0a0980074091afcddf5a6c8a1b015d (commit) discards 6a889f151253e98bb7cbe7d500f07c88021a8bce (commit) discards 3df8be1826ac49fb99a495288873bb02f6690e38 (commit) discards 2fc8bee548c8d15d34ae9357523e0d5423026c03 (commit) discards a174f7e14b464be73a4282f9d1ade942f1476b5c (commit) discards 47f10ce212e3b0cdcbf72c2c24b257ba3ae3d935 (commit) discards edb731113d63696ae691dfca207c2155129ff27c (commit) discards d06f93ac425f3fc61720fb2752111457e4b56431 (commit) discards 876808594963e8b4547e415aaa755cb115eb1bed (commit) discards 9407f9732a9c7b32b5689094cbd29a3a74a0d6a5 (commit) discards 7fcccb9f7b854319c23febac9c9280c271e8740c (commit) discards 657b36f08e5329c2fdcd6f299685796dc8abfbd0 (commit) discards a3de829edbb478a949ae9877e6a1541657869305 (commit) discards 0f185d838e86a536c2c9200dcb82e735316d6728 (commit) discards cde492f0b1d5cdd7106f937cfc53108f821e9876 (commit) discards 25601a41cdfd2381cbfb54d2756317e96a297cd5 (commit) discards 2388d660afbce79a91468546cdd561c32a264086 (commit) discards 0d946486ef25927b8ececefda8fc2fdb2046bcad (commit) discards e4cd731d0518276fdc8e1a51885044d600a0293b (commit) discards d9423b618c7c8e70e7f2b27adff57dd9dbe4bf94 (commit) discards 056af502257c68f6670313d65c96c80341af0110 (commit) discards a4991893050f0611d3593dad84c2d8b72326b015 (commit) discards 1bc5bbf165a5d818d9589d5b6599727af47afaa3 (commit) discards c6f8df7c86b99f41f30ea8c5968f8394d05082cf (commit) discards e9316ead07a15e4eb85a8dd92e1e7d42ae5b6ccf (commit) discards 69d4ddd992b62c68fe4f6d609a439356d282654d (commit) discards 2ac7d953c36c36293922e53daed7a1737a813d23 (commit) discards 379d66ac571ff5082db73cb48a29a3ce4c51ebd2 (commit) discards c8286a5ff5e2c7843a0ee33376dd3b0032317d48 (commit) discards 03c0c9cc4098108010dc115bbdde4158fe423a40 (commit) discards 18f848549bcbe4de8bfee66762304c2d241965fb (commit) discards b004a2d4798afd1747e8f52f52a7184890eb606c (commit) discards 23520f1dca774bdb9aac3b0e264447d822d716de (commit) discards b440006bcad4df6916b90b7505352cc866bf8b96 (commit) discards 1fe5b927e070f42067487b7dd0c3cac720d879bf (commit) discards 846d838c55836073bb97d4589a20885af9328079 (commit) discards e17e6c2fe24f89c5fab89484bb3d37558eec949f (commit) discards 09ea1692740698a16454f67e35041558960d11e7 (commit) discards afef984e57cdaab76df8c668803dcf7607ed0447 (commit) discards d21ed9a402e0056501539f5c2535991936131d59 (commit) discards 6f61eaec79937e9706c86346dd419f1a7bcd6ab5 (commit) discards 752c301eae3244b8ec98dd389dc742f2d431fe09 (commit) discards 6569d40a72c9502b812c563f473871400bb87b0d (commit) discards 2dae1015d77b7b83bdc1e77cb27c09ee16e46365 (commit) discards f89d71957b470b16631cd1d54f5478aea1008530 (commit) discards 770cf22f35ebcbc48afdeb1db41f9a93ffb5cc42 (commit) discards 5908dcb66e251ac32693ab3329bc64120a019dd9 (commit) discards a376dc0290cc0086e1c13b816b6e0975b44874ed (commit) discards a478b43f4f505b79ff41b2068c70fcfc588f5336 (commit) discards 0b75f567d2ceb3de072ce50cfc9609a1760c35ac (commit) discards eefcb1e9bbcc3c5c6bfa140531d3ab5bb03f8961 (commit) discards a11fc241782983650d2acf21c02bc03b91e316a5 (commit) discards 93f60505956fffb710bd6b500ea13619f01f9f23 (commit) discards 0d66e7258e6bc16a0489d6003fae155a37cb9622 (commit) discards 9267b251d85227466e397b5ebe31fe9e87ed252c (commit) discards ea9280d857b05724f5fbab88832fa294fca0efbe (commit) discards b04a0f096a221c03639dd4c86f5ef712745be705 (commit) discards 000a87a49e29b30f397992b249e7b3ada30aacbd (commit) discards 5227cfe53987e0ccbccb0513d5d8f5bb08222b17 (commit) discards b00a1f312283af0e3dca58a58a4a2e03220eed3b (commit) discards fc5cb15ed74293da1ac0609ca19a5248f49a7329 (commit) discards 600b6cc722e5c2f8ab89d81ad1ba769fb737144c (commit) discards d62cc0c2c706856c9d6e3a90f1b60cee414d854d (commit) discards c3e40261dd83c385985f12bc4c0c99d0d839994b (commit) discards d179ca77724410452012005d3853d920b04b4ed8 (commit) discards 947fdd95c30510095e75cf905b14c2cf1b88210d (commit) discards 4e41d0b5ea3e5b259a6d93d54b106010f6a07248 (commit) discards 55020c374b0e2b62844486cdccb8030d7f9fc501 (commit) discards c16774d718dec0e462342e69245fdb4b16bbc32b (commit) discards 152f0f18b9f5321d70b14ad0cfe30d0bcd950217 (commit) discards 12c1f02eef5600c3af762c610c0105376becde64 (commit) discards a51306f892bfa078ebb2bffcd3061e1c8401c5b0 (commit) discards c6aac95dbdcfb3d0de70d0b75790bc59637a2771 (commit) discards 73be3fb3489e5c7b8db7fe7b74dc70f863c60ef8 (commit) discards f3717655fc820691377d1f6a09c9ee4f45acd423 (commit) discards c1f02e29ffabb7cb83049fb7c3dd67d4a750e22b (commit) discards 7427b779900b67548c474dadbd410861a8e80bbe (commit) discards f0451cd02bb479ba0a3ab68c9fd15cf14c7d5ae9 (commit) discards fc64d57d37c302feca79a9a5398c8269d639f91b (commit) discards 02e1c493bb45e1a192069b67fe9b682f041ca6f9 (commit) discards c9224a0aa83711e24dbda9514c7107fa1bce19c5 (commit) discards cefb623d84c7657574c3dc2cc62ff94f0d65acae (commit) discards 429440edab6f0e15991f281928e9c38f798b4e4a (commit) discards 39540916916e390fc7059f77f646cd7f341693b9 (commit) discards 80c97771319f3ab6d32ffc77c2660d863e7a7166 (commit) discards 0c454746a0865d2310fb0746a85c5491df196b72 (commit) discards 943b26f4f39d94d50d1f0f9b84ef139225eb921f (commit) discards 1884d054d86a1e8d326cdcbc904a2d4b34382a2b (commit) discards 52b56835e39b93a42f7c5235b8469178dfc5db12 (commit) discards 4f1135ba712f145edb70299d38ac539d70c13c42 (commit) discards 274d73e8616430028ec1245ba6cdc66f73d7cdba (commit) discards 80bfcc17eff2681012a234275f6f9bb60b84142e (commit) discards d693e2fca03d03f12f02c38270543b29b0270600 (commit) discards bf32afb11df8ca3e03c418a9073941dd3e12fb5c (commit) discards a4d256a66132604486d047aa019de58f398b408d (commit) discards 772e91eba562f466e9ce11dfc7b61a8c716f7afb (commit) discards 10902e4a6c66162c165cf804e46c8879290244a3 (commit) discards 640dde743eaf4e35012d35b51c64fb3e819372fc (commit) discards af145f293fee74cac3be906f51299f2d2517e8c4 (commit) discards 827d221fba94ffd792818b27e1866bb4a43f6844 (commit) discards d5f81679704ef21eefaa547ac51c48764bfe00f4 (commit) discards 7c38530a4c135de6a7c4eb50d948cdb68f5a8a54 (commit) discards ee36c9f18f785ebbd3653010315fae8722d4aab1 (commit) discards 672069cdff86598e620b1555b2fe3778d9d9ea53 (commit) discards 3f5c977fce4899de082a072bdd4e853ee0e1488a (commit) discards 5783be81b2b18d82eb95b9b2a39b2acd83704634 (commit) discards d29f1acf72cb068ac05f4876c20e3559f232f4f1 (commit) discards 68e446bf9b8e6471c947e6c464c910468ba7aa69 (commit) discards 5b5b3c2c19e0d56ddab120c469aa416f41bf20fa (commit) discards 29ec1367612e788f6750a51bfbe94b0766769daf (commit) discards f170c3b04e279ea0fa86869512e4b3f3d27cf620 (commit) discards 4075372122dbdd3f6a22cf1d51628df0e92a2bbd (commit) discards 068e3828eefa45cc64d9b24c3dc86f1b0cdfbe33 (commit) discards 168acad48d395ba3e138bbd9962927120069ad3e (commit) discards 7450bd4f6b3b186cd56e6f1b38c6da6eea3a6652 (commit) discards bc3926bb42c3ee1718892edfefcaa81d1e51b7ad (commit) discards 8709f887f1565054381b8eed3c525f5192dc244b (commit) discards 1c7f65b28d6b12a4a3f7bf0dca56fb4ef4fcf386 (commit) discards c9ede510ec479901208d986e35fc50f47c6ace00 (commit) discards 450543241dc814f5035c13b49b2d763903b2fcd8 (commit) discards c9402d93bd1b5243017e68eafd0703d1ca45e9e6 (commit) discards 5fd4e1b8d48203e72f736a5ad83a203a2408cb3e (commit) discards 4d19575c6be1f07347dbb99d74a48a1306ffc975 (commit) discards 6606505bd2c76d205d4ca46ee652c196cbbddb77 (commit) discards cad6dffc83775ea51b0f8e3acee5062233a8b693 (commit) discards b0fc765ebda20e896101790d38a4ba3205412549 (commit) discards 0a462a9684f3138b712dc7738f160b479ce08f84 (commit) discards 462621e43b9b64aa1013348a48a63755bf066aab (commit) discards c934e2991a88af8b459075f093eb649607be029d (commit) discards 64c5cef21853511f8c33a5a8fe49222b8cb88f58 (commit) discards 9abf040d536b6adf1a06269cc1dbf90117b85c48 (commit) discards 305beb6f88e699ccc5efdb198b45e6089afd038d (commit) discards 664c328b02211a9e3273845cfd029203f1fe397f (commit) discards df52be7fd5704ac652b9795be41ac5107dc9819c (commit) discards 4c266d709f232b336f8f06f1bb36a3fee45809d3 (commit) discards 1304be33b367820dca449c753ac502afb059f611 (commit) discards af9ba74bf9451f2c89601ad24f88e36e7808e148 (commit) discards b824a0a146246ec959b7a40f72a8557d163ab090 (commit) discards d2d09aece23f023f3e81586811a31abac0e3292f (commit) discards e15afa23efdaa409f5f809444fa1ceb98f18210b (commit) discards 1d4979a5cd69a115c91d04a343925d2860b92c1e (commit) discards 6638bfeba68c732f5441e00fdcd807957d3b041a (commit) discards fd7dfcae57604216c18d60efffcd243b5506f5a6 (commit) discards da7ed9b1e766d6cb8e657c1420c07eabd726a34a (commit) discards 398edc10b5b2c73876bb4a409cff2ef43ecb8239 (commit) discards 6219fc87aedb59e99f116b8c92f670f1ab3f60a4 (commit) discards 0013c5cad94e4e3c61a4f3eceafeb382bdc36969 (commit) discards 10d662d477f63604e2370c84c5d47f565d519433 (commit) discards 2ee565e6f2795a90b7a4821cda7cbf23070efa5a (commit) discards a177b8586863744f774579f744afd400404993df (commit) discards 12fcad5764d82276a98b5f1b22de34ac5ea77144 (commit) discards 7db9307dfdf5f2e6713f6a41d688d09a4dc8bd56 (commit) discards be129b862a878c9154d601603dc20e7d3cc24bf6 (commit) discards 904a3cfb099a68de66f21e148c2000ebf6ea51cc (commit) discards 5925f99caa1590eedf7c81f62449782f7babb218 (commit) discards 1193027b65833ae2492cc6e962032cfc3b6d3a1c (commit) discards ad506955b1fdf275e7babe74c4c7f3b58389cee0 (commit) discards e31d48a0a451e1f197fe61dbbd9e9a7d9b3d945e (commit) discards c8b072eff94c5cc168996a318d329fd9129476d7 (commit) discards 05e3076bf14fde75c27324d6979cde3dfb7f792c (commit) discards 04f953f3f96def0a62979668c1e7e61f9be22be4 (commit) discards c75a21e18747dd824d0d5303b0e8c75ad09dd631 (commit) discards 903a1bcdac07460526f3e175af3e66c32e1f23a6 (commit) discards 8ed591d59edbd7b2c088105de9ee07a501558d35 (commit) discards 4d977ac509c73b78cd999f92952e2c8c322b2199 (commit) discards f9e09afe1d38874b652526b3f65662c6e64e43b4 (commit) discards 754d920daa2e2e1f81b46560b39bb92935bc3944 (commit) discards 3f11b0d74e94a6587e2b4664defb6d1b93ce4b1f (commit) discards ce09d3f70c8ed86cf3afa911b06038ca31767b88 (commit) discards 1bb21a3db2a9f21519af13ce8f80c045334bae63 (commit) discards 02f6ee3a5534016a16089e0572efedbb179f1e08 (commit) discards 051c84ff36515a494787acbd8f8c8197c9326413 (commit) discards c9212c81bb136aabe28e8bd9918208d830721a4e (commit) discards 6c56c67ce562df1ff796a53a4af14e3cb5c39e06 (commit) discards 1797356e02b361d44f572e7bdd4e68343016408d (commit) discards 55d42cf319cdfff989b67f14d560a6c571c0eb55 (commit) discards 2e181996e78fed27b0a9af87867497227c787cac (commit) discards 49a71eaca1bbc813bee09ccf674e6022fa8116b6 (commit) discards 7dac31b2292b0eac32929649cad1f32e6f0a6114 (commit) discards 711ee928a6531f5f8323d9cbded47c78c8a9619e (commit) discards 4abdfa32f1f2fd6691f6770e581ef4e57c91d0a0 (commit) discards 248c10f6987ad3ae672ba1b2c8b060283ae520be (commit) discards 77b09083b32c39943f1cc5e8e52ff2dd7ca61405 (commit) discards 19896d0f262325f783aabb01b44022e52b863149 (commit) discards f5a6fb97d6638e485b017bc2a86d36d521dcc742 (commit) discards f4172dce1680f567b6b853377ce4d8dbb1093c05 (commit) discards f8024bd6b69b84e5cd63ddf2e81be016c9f251b7 (commit) discards 0f404e51f17f29ba1d525d5bcfdeb303608e0ee0 (commit) discards cbeae3b62d1db399875314fd307b7e1581793b71 (commit) discards 1c4bc19a68fab7e3c2ccebc78a99379af4538a61 (commit) discards 6236da01157482f9fad74a27725bdbb5fd4f62a6 (commit) discards fbcff577124f997f0861f079eb790d1a421bad50 (commit) discards 28ce8348b5d55ce1b4c3006d103aef9a897ce190 (commit) discards 56e63ea28a5d507644a5e330cd47f495c1df8011 (commit) discards 793a7e20b49ed9c07d9d119ed0fd8659e94fef2e (commit) discards c2b6619b0d50b65668976530c7c30178165f66b5 (commit) discards 754543150fa16f2b1526d37befff7ee15fd944af (commit) discards c9c053563891a851ccbb8d187ed3f7b2bb317d02 (commit) discards 0f325d3427c1a12af88dbe7a149393dfafa1954a (commit) discards bb3d49dd2b6f7c95682a28a87dbb1206cc02b70e (commit) discards ca8c0a30492b37fb2e11e3aa68eaf0cae3d366f8 (commit) discards 51acf2d5770dc6af1f7d75ceca6c7254e3529abf (commit) discards c9247dccdd01a9af71ddfdac7972cb9f8d00f4d1 (commit) discards 1e8f1510a0e5c0ae12beca221a427b0a896fca1f (commit) discards 7215227102926fa2148e6e09a6c0cfebd35af8b5 (commit) discards a67e081742ee32fecd773334e73bcc820e88db05 (commit) discards db45ca5adbc32969b72445a41c09026b30024740 (commit) discards ff08e9fd42ab83e87e302de189c1fbb372829e0d (commit) discards 3e69ce0ae4a453517bbea020b546fdd5a7bc0bca (commit) discards 1c17d2b90a0bf80ba90d73c271887b4fee9fc0d0 (commit) discards b61351dbb2d9ab1586b477aa52a1fa6e18ab1c84 (commit) discards 19c2c041e4c0a6a0bdac1255588c19a97c66e886 (commit) discards 4c913ae3eced731ed1815542b870b83ca192d695 (commit) discards b78c76d7528b2e2c76b6f88c50cf571e33e5e42b (commit) discards e37626a00ded5e9b36c6325d4b6f812b8c60be4f (commit) discards 8bec5ff2099c4939a767254ab4897263cc8bd008 (commit) discards 7a66c8bad451998b51a51f0fb79c6d65d44013ec (commit) discards 4216992604629a2ac69500e266cf7f095007f454 (commit) discards 8d3710471c2d5fa067b0a52dc2e2ce8b066c1d58 (commit) discards 20102a723f381356ae4753c94584f662a9c22b4d (commit) discards bf14b121bb55241990f223579f0ba3f89c57a475 (commit) discards 5e63ed9be398dafbfb05e55f9b64a602327db0aa (commit) discards 4b382f3ee3bf7d915718150924fd358a026a72bb (commit) discards df8cb6efec82efa5610915bbadbda474368e46e0 (commit) discards bbd9b70dbc2f3277ad3b01c8b80ec8b5646814b8 (commit) discards 61a3053faf69309828c9555795b8b9e6ed91558d (commit) discards dc1f9735fae5fac3884559b8e7b9ec9a51092b4a (commit) discards 36724922064aba82080ffb53eacaa964c5a61d37 (commit) discards 533ab6137307a2355db96c8ea73e6594ec13e81b (commit) discards edd2c4805d27824dae35f58fafaf883ade022a5b (commit) discards a44fda077251b9241a6ffa782ada1ea78cce7bac (commit) discards 2f8e39bac198cb04fe872fed0bf3b471bb7edb4e (commit) discards 64694951477c4fd0f976eb90f4328886798790dd (commit) discards 05bd28bf6b77c99146a3088e347dc9471502c777 (commit) discards 4c742b92b4e8088f1663bc55a0f2862ca69123e9 (commit) discards d7d27d58401ca7249cd54991f6ffa97df6524acc (commit) discards 5ddc5120c65adf066ff6f074515e9f57b4ee6b45 (commit) discards 387d6e90014384090c9fb7526ecb8af28f89c932 (commit) discards cbe57bcc2208225328780f05a871242b0a800c63 (commit) discards c5eda76a39c98711216a68805a2c716b542419b3 (commit) discards 3fa1996761c86079d71581caead4ec69ab808739 (commit) discards 9af81007b00417fe814602c1f3ab008191038929 (commit) discards 2cf7dc74f549d7cd08e502aa3c5912410be96b98 (commit) discards a3bf276785818646050d9e396072cd129bff668c (commit) discards a05e0b90295216ae5fd94501c4dcec19a3bf5678 (commit) discards de7a02a918f46ae89148ccbb835d4c44e7b74048 (commit) discards 8970d08a69f136ef3585fa02f7887dcc8dcab6f3 (commit) discards aa5c39d40fc00d24db90636e081f68e0597db0a3 (commit) discards d4aa358320ebf61a65f7c4db93d4ecba0734796b (commit) discards 018f8f652b2fd87cadecbb7ccfba20432ea16abf (commit) discards 835b14262fee6c29a352418bd540b58b48a1b77d (commit) discards 27c1377178717a4d93ea679736f5c29bc8e0212e (commit) discards fc713cf71ba635acfbe4b48f96992524ece72743 (commit) discards 29312d0a1b45f3bc77c9da38198c6b8e422d638a (commit) discards 4119a278e5e5dc0309810dcf7112d84f3057ab67 (commit) discards c4981b3c34aa77e985535fb63f2efcc062971556 (commit) discards f6a7eda3c32192f72a601dbd8b8b3303ad617e6f (commit) discards 3db365dad3a9046ef33984ba5bba9e67879e9dc6 (commit) discards b4dd013d791d3b09e2bc64b84fe29b94cec86b19 (commit) discards a7e6f378567eb91079039cfdedcc4395bb03a5bc (commit) discards 5206c7ef959e078473c01cc0ad8adb210f1bef66 (commit) discards db4b5fb5712037f60eeabaa13d5e6b0c152218e3 (commit) discards d4508aa255bf74773774cf685f6b60b7c683df01 (commit) discards eb30ccd427e00974c561e5f3ecf8881368678609 (commit) discards ad54856827f8a11ffbf764ad9fa7ee92211a6eae (commit) discards 265136cc0531171803b63c5c2868f30eed4cf71e (commit) discards 9e7c41bf54e943bb370d32fd1a2065c570eb4149 (commit) discards c9c13c26f36a68e0c9d6d7a35055bc156ef6aea9 (commit) discards 504c6d2032789926536ee97dd545894f65f8b5e1 (commit) discards ee3121be4a4cfe438b9da84d4b3c00f770c0d581 (commit) discards ae2f757aaecc6deff840af565d720a3e11b6dc53 (commit) discards 775da7a32ea2b57eaa6efaba736c3ba7ded23e67 (commit) discards a70de679ed964f97422f3ffb065c8b91726e2260 (commit) discards 05fb83041999c351a10782d5030cbd95c20f5e65 (commit) discards e21544ecd34b08f9a181e61ff915571a50398d1b (commit) discards 1c8375317e5aaab268c0aaca0f196a134698e090 (commit) discards c5549817d395f89efc1238b67b300b3f102b3a18 (commit) discards 895d210831c0b70c5aa7d731940d87d3f5762beb (commit) discards e345d1bebac961f9942cb5f9a576b7fd8e3b56ff (commit) discards 053dd97933e57a1107e606c19f92784d84691031 (commit) discards 95a780becd6f20994c59b9dd8de7c6f91d8a638d (commit) discards 1e769f360f22d0fdc09e049bcd3f3f6005534aa4 (commit) discards 447886f9173e168eaacd9aacc01c8fc82a763cb3 (commit) discards 8f6f6504dbffbc40785fd98f5668789d558fea77 (commit) discards 172270644be5784f54a4c83785ec2000d0855710 (commit) discards 8260b306665b1c86841c6a20dae3556b58ecbdee (commit) discards 5d28a728727caa1eb95e12e3cd99a203e07bcdac (commit) discards a333ec20fffea2c7ae9f5a4d0968efa625a9e8c4 (commit) discards 36337d07ecfcaa04321cfac40398ebac54accb18 (commit) discards d4838ace89946d4bdea9bbe6b2a4e5d5f20ad4c5 (commit) discards 10a7ea170dc799c4fadcea88c1b06ad2fbb3e7ab (commit) discards 7eb3cd504945c5ae0e3aa4b1df343efdab8b3fef (commit) discards 38d18c054f21306bd8af249d350d692ab4630c3c (commit) discards 612ece829a24c3331154d759b1f8f82821457507 (commit) discards 4dcd97c26c639e3fb73faf60664f00df493ff85a (commit) discards b43dac4dc04eb2eadb457a82c1cf1ac9d61be8a2 (commit) discards 656975894b67e721a11b0446d5933a41edb6204d (commit) discards 7be66db4582e5163abec632e5a021dd9d9475278 (commit) discards 22f0a1583103ba74f52c4563a04463001417a3ab (commit) discards 3ac7f941aecd14571dd4f2100407b4136ef8c676 (commit) discards d9e8923e6028730754720cd3234c989757707e83 (commit) discards 05141639287767e46a89e4f68b6d91f6fffd5e06 (commit) discards 34db99de453188fa908dbd2793fbeb8b9472817d (commit) discards 053a8bd3160f5b5a0867ca8bc42fe8314b50189b (commit) discards f118abb78dd201ac5d0f600d13cd500b83e42217 (commit) discards 4eb9a039a920ea1849555e7f8d2948d086838341 (commit) discards 3e0c78f42556752c3257e63722c479439720fa85 (commit) discards 67dcb22d11ae4ae62d8fe47ef2de32d9b9737710 (commit) discards 40d9455bcc8b98d209c70bc3ec600a22ae10b187 (commit) discards 6ab3f91c9e7f8b0d2a10d4acf9f1477fa12440f6 (commit) discards ec658cbeb4356219dfbcf1b34b8488eb2fe187cb (commit) discards d5e347476ec94b035a98d0948bc46ffa7f30cc86 (commit) discards 6def43706f9adb61ed0397e685e2585008d7ba32 (commit) discards 2d6a2675bdc7c6c4ba12efc75ff23afcf6b5f25d (commit) discards d3d8f3d2afdc15fbcf1c8e9f6b794467e08a24fb (commit) discards 5ebbd4fe9156d58a5863172fe80c7fe80d1b7219 (commit) discards 06f076e26eeba6fa589285da1fa1b004aca2ac72 (commit) discards e4d314808ea90e7bb5facdc40fcbd579e197b41f (commit) discards bb03982fc6abea876fbfb6078608e85571c5f8a5 (commit) discards ddfc20d3a967f98c47d2bd169b881d0b88f966d7 (commit) discards 0dbd2ccd93a9f3817ccc9c1bee843915c8cc079c (commit) discards fe32129dabe409b66d09e03c489d18b7a35b383a (commit) discards 6143d7b19761653a13e96b03705392eeb2a78dd5 (commit) discards 7336ce66bf26816ca7469120bb958cdb5e01f50f (commit) discards 90bde57cdb2e8fbb7690af011b888c8ac12ef74e (commit) discards b184adfa4101a0f4636bbfbf82e6c0c147d791e5 (commit) discards becbfbb1988e1cd8805cf063fda8e9eebc3c34ac (commit) discards 0f9e43f8a46d62ae64243e4db09c90bdfb661525 (commit) discards 80004259f2b9be6ae4aa5deeecc70e86a4f0a846 (commit) discards 2aa7685256dfa5063641eb125a56b557d9621369 (commit) discards a1fc051fa7eabeca93163887cbe0039dc2b78310 (commit) discards ecaf4ac91fefb0c8a063ff8823137b5685b0a9b1 (commit) discards 81e01f92df657516456d036fd0a99f69410fd07e (commit) discards b222a4ca6f7d84378164e67ce9f81a5e0865eda1 (commit) discards c97e586c8c3d97a9d448c3bc46f4aad3a4257914 (commit) discards 2f9ff1252a2308e034b2ab6add40bd569256a4e1 (commit) discards 1b700612691e300540dc2418e5a71329f2da40cf (commit) discards 6d0145dbeace6b7be1073796cf95154764378114 (commit) discards 8036c7f0d40a45614937f386636d0a227d9de7dd (commit) discards 5f678ee258419a1f50bc5d88e04ca14a4a2b7d91 (commit) discards f05c9294d30a5def61bcc014a71582310ceb010a (commit) discards d95810be461200491f7671e3cbe42573aa05c7a1 (commit) discards 850c5282f04c99632fbf876b0c73bdb94d0722de (commit) discards e6bfc5ee5271cb6ff29152a1684452f432e5dff6 (commit) discards 3a3af1790faa93f90d5d2b728ab67c2cebd26248 (commit) discards b2ee4cb71be4fc8960b17303e19d0512362bab9f (commit) discards a8e25daac7e967cb8ca9c7c71710b424c28041f3 (commit) discards 0e013bb7ee45f8ba31582005885b855f7a2407ef (commit) discards f6043d59e60d6aa4eb12cb091d4b906e01c4b607 (commit) discards 56d29100ac34778a35c56740234ec2f837508f34 (commit) discards bf2a0a5aea5fd218de25f07450a7a69e3f3adcd7 (commit) discards eb68b0e5da527904d72b81e693624e7d9c697dd5 (commit) discards fd6692825f5e4b9787746e2811a8a53e33886138 (commit) discards 8029773fbd01c8dafe1a6f7e0136ae9b7a5339e1 (commit) discards f1de916fda8bb37780f8c7ceb01517400ca718e6 (commit) discards 5ce9220ececf0f71f9c2f14ed1b02e67ffefb56e (commit) discards 51b5214b4bd684bb6beddafc30a94f27dbcaf251 (commit) discards 7bfa629436654ff4b5704bd0b252326b58e096ba (commit) discards a18b86b9c44ce4d669bf4719c2addf3f79628333 (commit) discards fa30a5b222994d34b85ee015fd00427cbce59703 (commit) discards c2a2122ddd75d1da54ce20fc31c38be541ba2495 (commit) discards 5535c9e5591dbe2daabd8dcc454f39bd23331aca (commit) discards e8ae7ca36153d8729c19aee7e044810224d21fa5 (commit) discards c119635fa33e6c41005f09a1346787d73f189eab (commit) discards bd87ae1dcc2f2c01ea806268185b075f0bc97c9e (commit) discards a103f41a1a63912bb82f18d36a0bc5a849971b2f (commit) discards 09854f3ce8bcfb401eb27390c881d92a2a85a1da (commit) discards 5e866769024f5a88fc7c28bbd6550266af71b0e6 (commit) discards 79b5e37a46ce05a28ec5d596ef57bf4f3072a3bb (commit) discards 6b7b0ab93b0a957a7699564d0a1a2ec9da80af26 (commit) discards 5af30a47f6a35aa1d5c41a12d5e3ef05320941d6 (commit) discards 929719e63c127c5e621950142f9375544efdb2b8 (commit) discards 0c0eac9eaaacfdf70759794604380c70f8d65b09 (commit) discards 9feb9c7f05b7b743b445af10636ae25f31af1147 (commit) discards a09b1ec39c60823550d4b71b2259a735bf8faa95 (commit) discards dcc75e363d4e09ce3ba323a7a49b62d16125cb3b (commit) discards 06ca5bac6eef5afa951fbf935cd496ff4da414ca (commit) discards 1e37130c450c22f99a3c39ca79a5457b0b5ea38f (commit) discards bcb25eab9fba90e318d7fe91a662c096ab92e7a5 (commit) discards 2b04f5bfea49c228205bb503532d8ee3e4e9be8c (commit) discards efce39b8ee2b80e6b6542bdf263a2d196d978126 (commit) discards 3d00e7adc0cabc91ea8845f4037ba65278a1ad10 (commit) discards 9990befcd93999ac476dd78ef4c74514da0673d2 (commit) discards 16df189e1b4393bea525629cc7cca7da183fc5d7 (commit) discards 4121d6722a0f268c2bd3be5faee83c766180ad0d (commit) discards d812f3379a2b00d374b8b95be3b8297a590417b5 (commit) discards 84786ee484cce6ad54d15bcdd9d9a6ed64df7c22 (commit) discards 3af63d13e8827bf86b53a85376c5f76a67604e4f (commit) discards 461a70ec71dffdd5fa390ed8171b9cd2d14e0070 (commit) discards c6dc5dd0186349d32e756dc2e8f877567bdc0e3c (commit) discards 449739634258340947548467f73cc8c3479c2e90 (commit) discards 884ba71d96fe4b62336f61c367f8cf785e3842df (commit) discards 4553ab7075c7d87914cf45d714c7a3b995242d6d (commit) discards 947611f7d1d00bd7a3004104ea5a84e5bdd3d16d (commit) discards 2f34cdd3793bfc53947f2bd6f5032523196c2943 (commit) discards b8d23e48a296e308a31717ab213b9661adf133e1 (commit) discards ff83742a8e8cf9443b08406a696aad8c70db8430 (commit) discards c1bf5253ab99e76c5ba8e67ebab1256ed97142a0 (commit) discards c4589e5dff619a2f0ff7c102fd8f9c012f2b01fd (commit) discards e6de22ed27da0eb141f099b15fc7eab3cf738731 (commit) discards dc581a1e0cc0186fcdc0d9ccc3f09c814eca700f (commit) discards f1011833f215daee03dc861ed50eb0d75500c4b2 (commit) discards 97d89bdfb52435323eb8922dda92cd9198397df0 (commit) discards a9008a9b2c302d9a0b7deecb35e8a3d6291f0830 (commit) discards 4a19e497cbdd9e2a17a259e0004f015af87f51fc (commit) discards f51ef97b068d174ecc502374dacf5b5559069499 (commit) discards 4eafc01acb0a24effedaa6b1f9d798a8f971d852 (commit) discards c54c869a7127352d7e2ca757c5ecd039d12ae2ab (commit) discards 2921944e08dbe5ed51d3b402ab08c49966b26ed5 (commit) discards faa703b091317c76afaa8432c86f7abf8a31d53f (commit) discards 092c8f35b6e9c0c2c468cc449fabaa81d574ca40 (commit) discards e804e2824f44d1cc86d0dca8a6aef9b179dfa6dd (commit) discards 3fb8a61ed3ff288ea404bce4b0ccda047ddaa977 (commit) discards 18be18f060e897bc51acd04d0e3e7c9f2c93ecfc (commit) discards 2bb6c801a18a0e7672b991dbdc1efd879116747d (commit) discards 5eeb043fb2b9febef44771855d14ea6acf63d5dd (commit) discards 788c3cc9e8eb4777c0146d63d8d994456ac51d19 (commit) discards 852e9b1b54d755dda1e8ca131c7aed247e8ab311 (commit) discards 86db10d78e429b9a934649c15d2cad91c1860576 (commit) discards 09898c15aacbeda92f34721c3283c730d00a66c3 (commit) discards 41eef9ccc94f1d6c4cff0c45f02ebcdbdf185725 (commit) discards 3d6c305c4e458276e6ebadfe88a3ca2a88c7e010 (commit) discards 33eb8fa34ba7fd86753a07555d62eef33ed92104 (commit) discards 5636a8971908bd663f148081401cf48725bcf71c (commit) discards 5f80b1b146e2f39b8998cb49ff734e2fc5bcac91 (commit) discards a868359d4b10a917c30174613c1aeb6bdf5d6fdf (commit) discards f0dba830863feecb9b147632ae5b49c209249dc1 (commit) discards fc4520b4b8a2656ba636fc58a4923e1b9c475c6e (commit) discards a5971e8b348e48ff5bbb489992d41905f6aa5d65 (commit) discards 6e49b3c19d945d5a0822e3a8457451593b8b9369 (commit) discards f3a5e6f689b17b02ff433d7c313f508874b93c0f (commit) discards 93d9a39bcf9942e5763a2c67c2f100053c057eb8 (commit) discards 8b9266c92d3b6f2cc33ccc113a367fea04f31ba4 (commit) discards 1451bdf2a4f86e88034b29ee7fb604f45b91f956 (commit) discards fab3860de1e08981f48638142cb2f85a7e9897df (commit) discards 3e72e9eb1958a5126146c21679e0812e5bddecd3 (commit) discards 7581b99a1b8fd2ae3f4b92c530c73fd35649ccae (commit) discards 6d62f50d47b15612ecfd7d29d9826edea2893d54 (commit) discards 91fe16a558a5eea82e57ef12945104e0f6d372c9 (commit) discards 984b5ead5b86301c2a8ca5da6c515ba2a9e2396c (commit) discards aec059ff3e82ce5077c9125728b11d1bb53b3862 (commit) discards 0eef5e37a8744883aea2276049e27757bc142c02 (commit) discards 963efb9ec9970f7107face767083dc90adcec60c (commit) discards a2b981ed9bedfddd39186d13832cbfc4534617c9 (commit) discards a6f88ed63fd27070a98b52582ab582374824bf30 (commit) discards bf024a798e96a2cf2dcae8b704258b162588e243 (commit) discards a5041efeed15f3c389909d4fa748b8f1bcaf24d7 (commit) discards 4f2ccc7ce37df18d0ac15cfec8030df6ade95b04 (commit) discards abb935f986e1de5f836f2220572d47cddb54ce6d (commit) discards 8a2fb65090dd95053d3d5e24e645868530355636 (commit) discards e72bb585d8cb967d0471f3d5067cce0784054340 (commit) discards a8265810e35ddfcb3d6fe8e979bcb2b810e5a885 (commit) discards d8119d08d9922c6428fce180a64d95b475f348ca (commit) discards eb1640ad737262b7197d544c012e62bcdcc17f56 (commit) discards 558dbeb599340556d0d9cb629624e53feebc9a70 (commit) discards 98557c16c5a93b81f586dde9ab7b2c2e238d6978 (commit) discards 2d4e6f4e1712472b6423efa3be8eddb8ff68c330 (commit) via 0bbdcec3521d98ec9f3548b39b6705efd43fe4ee (commit) via c84dfa7457e37324e417945c3848e38bdb9372fe (commit) via aeaaa8684b0f312d5fb7080096831f5872b41575 (commit) via 8a8d22cf1e5d20b7c3b32c1ec9b5f06b339c2a50 (commit) via 021a74a6cbc01728964c55c88233491a30f0d812 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (9ec968015c4d66cad8cb96c889aa48297406fce7) \ N -- N -- N (0bbdcec3521d98ec9f3548b39b6705efd43fe4ee) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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=0bbdcec3521d98ec9f3548b39b6705efd43fe4ee commit 0bbdcec3521d98ec9f3548b39b6705efd43fe4ee Merge: aeaaa86 c84dfa7 Author: Brad King AuthorDate: Tue Feb 2 08:44:15 2016 -0500 Commit: Brad King CommitDate: Tue Feb 2 08:44:15 2016 -0500 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- Utilities/Release/upload_release.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake From cmake-commits at cmake.org Tue Feb 2 08:45:56 2016 From: cmake-commits at cmake.org (cmake-commits at cmake.org) Date: Tue, 2 Feb 2016 08:45:56 -0500 (EST) Subject: [Cmake-commits] CMake branch, release, updated. v3.4.3-938-g8a8d22c Message-ID: <20160202134556.BE558E422E@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 8a8d22cf1e5d20b7c3b32c1ec9b5f06b339c2a50 (commit) via 021a74a6cbc01728964c55c88233491a30f0d812 (commit) via a5a5a6857241c21d306661d723b749839f4c6e1a (commit) via 570e84b44b43c62539a47bc6cc2f18d7223114df (commit) via f8e5e5bb0353d7ecf2ad9ea861e3a4cd5d4277d1 (commit) via 6a230df6368e699521aff1ded3e3f452a161385b (commit) via ad701d9f013b5a40d6f241f334340d78c1083c1a (commit) via 377a12b2d239c531b324d31759aa05450ee8d622 (commit) via ccb2d5c07f32fb6bd96128527a36a00868e905fa (commit) via adc3d1244bf373fca10cc15a45e34ac7aac34961 (commit) via 5ee96fc2724e2264d7ba804586da2f0bc759929d (commit) via c022b6f6862c67885401d24c438acac457c64f31 (commit) via 6f83db1cc10beca21b088bfe8d623f6256eb3d0b (commit) via 6ffc4323670f3671f262b3e9f035f1ea3f714986 (commit) via e18d0df5ed7170b9cc4eafa9f73c6605cc9b4107 (commit) via 13b4ef24e1abd69b4fd8eec55772670a85bd5aa8 (commit) via f270404a3d3cb11a9c57253e5f2a0a45f1595231 (commit) via 76a51dfab8b0ebeadb377862758fdddd555cb10c (commit) via d257d68138a00758910bbca3dd77dcfcc04e65cc (commit) via 4d53e0a75e3ccddf14f556e88302573f14aa8830 (commit) via 8c615af4dfaaec38dfb7f42ec951485644c2e24b (commit) via 63c5808f9328797ef225c0d81d60b0fa39ac7d3b (commit) via a336e438e2dc45ffffcd656cfc81507f94e0cec5 (commit) via 88968265e24bc294b4055d7db8a1f9ffbaf73698 (commit) via 5335d275527d4f58e4f2992d307c1c62cd94dd3c (commit) via 656768cffe981e02f12fe51d6723d21176a46329 (commit) via fa78ee97ff30cc066a620cacdfe4144852947dc4 (commit) via facfb52c9fe36c172c4aa21b40c5886efa28e0ae (commit) via 30e294f68fb78a4d813fa0f9df668e543e4cf991 (commit) via 1053db7b0cbe89acfa693fbd76b20992fe9ba023 (commit) via e7eab0ec40f19a1fc81920bdd0dcf356a5b362d4 (commit) via c4e1bc6ed24d57ef3136756802aa575642927ff1 (commit) via f9cc671364d86a33399f7293aae9b145d7f90d94 (commit) via 0586f1798e5dde39c18f70fb5c411902c2bf5357 (commit) via 9722f8f9a5b1c1ec24b6cb6edf5edd59922e90a5 (commit) via b9dadca90b2b10a71ffca87a308dcbfef5058f3c (commit) via 490483b947fe3fcefc73af3e899b47dcf0eddbde (commit) via 4a3fa1e8a09ef1fa674d36c1188bb73aed0de231 (commit) via 1d9c539cf72e29014e1d03cdede0cd15e64426d7 (commit) via ddb09ec8f91e7215d867c83d9229d3558bf2c166 (commit) via dcf977ea1a97f41fe19a871235dc75e85891e478 (commit) via 666487a402310ea69ac20b1d6dceb20746d16f6a (commit) via b94e855d5fbf5cae975034ce5d7836425c8ad87f (commit) via f81ccc575331b4e184622b192deac2865931de19 (commit) via 9b08c6233052fa1c3d393ee474c874f997491f7b (commit) via 3e7794a2e6297e8ed3e114e92ea1480f75aa38b1 (commit) via aaf06f2b0f4ce4085e2bf1c60ffc63065968a9c6 (commit) via 563a6c7be09c73bdd7e0ee7b0c52dd9bbc20c50a (commit) via 071c94eeac9811c8dbe7b6e627899051f1a18ec4 (commit) via 184676532c8192a520b4db8380efbddc13272289 (commit) via f98ae28e3dd633126e7897a593f2d15ba68a75d9 (commit) via 7dbfdddf33ab2d52e471c8533897bc2d7aeb40c9 (commit) via 40249bccdf9c66453433da3608da9cc89cbee675 (commit) via 750ae8d5a8890f5d8091105a0b03bee085cc4dff (commit) via 70788e92641c4cf4c3f20af607cc6e203203b420 (commit) via bd2384f593d0cf2c894ff781c4e5278fff2ac96c (commit) via ad9394f4fdb69f3f3376d7377fac0a22568aed7c (commit) via f9599ed42f5bfda35b98936257423f00e260498f (commit) via 275f2a85b21d781e237dd22252261a0a62d9879b (commit) via f9e45ab9d412b08ded8a11ff1f4f0ef90e10358c (commit) via 1787269ef3c476ee1176c92c54e5b22f9cb7f3fe (commit) via ec00e89e83eeb91633affd662870b7a6955dbf5a (commit) via 5d739a3c843c95aec6c5c8df4d7e87e606c0c8ea (commit) via d8bced813cdd0c3eb7c2e3e150f513da04ded513 (commit) via ae5f30b36a58bffbc0954906eb2e60961f57caca (commit) via 184be68580d19900b289bfc45d507980ea2bce8b (commit) via 606ad1764ee8aff62368878576ecec7dd8671bae (commit) via 211d097998da4b730213645af4767fc24015f397 (commit) via 15fe480bf06f5ab5aae5641d2ebe6ca368099450 (commit) via a15e375cddb415ebe89aa5896d783b821aca940c (commit) via 1040e690c6c99979f8edf2a121de6d835be96dbe (commit) via ce3b713baa1c899ae7739c192040e24445368a0a (commit) via dc039cc02c857b2c418481533a236dad6a586a7f (commit) via ffa2a8c967df09c4630e50e7c7339e36b027ecaf (commit) via 92e9bb21758f73266e1f805e366ce90d2cbd688d (commit) via fb1526f57fe4720aff596b312e6a767502b86e13 (commit) via c8daac3556bc4ef7b39e0e632ead55d566e927cc (commit) via c13ed964012bcdf3765ada195db66930d6a0fcf9 (commit) via e4a135dc446475b01a2c4d60dac0d8c5c8078590 (commit) via 18c3714f4f4cf35f2b040d887850cb3607345e5d (commit) via 77cd74a3ea964fa390d85c371902387e9ffc4a92 (commit) via 53511936e43c14f362b1e1ba069a77f5ba251ccc (commit) via 249aac71d0b0022031d16963f3b46f9860919104 (commit) via f8f531584716e732a8f0da44e285e996cb172574 (commit) via 65146afc4e6b7fd9394e475e7d5e5ef9d0f10401 (commit) via ceeea23323837bd3cd51f35dd339d4c6f9414c78 (commit) via 790959aa9df923ae78ab5cb3c347a4413418273d (commit) via caf49853463a1ae7dec830cf82737c63b9625c3b (commit) via 2a73530be91cd39c8aa534c9b924f16e79034bd2 (commit) via 5079cc1243e3ffaea353c88a97b7d605c0807667 (commit) via 03c0303d2e4bc07b9c5df1ecdbf89da6e36259d9 (commit) via 27410a9c62f883f3bada885b0ef6cdb343ea40b5 (commit) via 66942a764cd7692921080247e184b26d43140e54 (commit) via 8979a1070097fde3ca0ab45bdd6580b7acd07ca4 (commit) via 6e92f7b2de3d6a25e4e77e274de110a2974c74ca (commit) via 3ec9226779776811240bde88a3f173c29aa935b5 (commit) via 83d633919a75bde05acdf642ff79c5b310fce824 (commit) via 09b2f1c3f5819a5a3ec03069e7c2811172ac3591 (commit) via aea1b03617bed037bbd12af36d7ef92feff0ba74 (commit) via e5cbec14a5aec9203bd0e29fa0172fa00c97e521 (commit) via 0ca122fcb3df3331a6daaeec090bd967daa0f2b9 (commit) via 6ccc307053f03c4c48a2cb9d5795f91d341a5c39 (commit) via b8d002af1aeefb435a9560b056f081e5d8dff734 (commit) via 43a32bdff6b452016a9b59224cd83e3c79c58e28 (commit) via 4b24626e0096f5bf6d57b5861a2eb001067c8f89 (commit) via f3fd50ad4b4252c42de55657074ca0b84f97a83c (commit) via 6e1a3df0c7d570ae560fc39fae17de839fe2f3e6 (commit) via 9cf63886985f39bb364e620e4459252b9ba8072a (commit) via 6be2dedaedec4d6df7844119d2e4954535d66ad2 (commit) via 7a37afa7e709bb1134ad7fb058195bc85f261b87 (commit) via a7393cbd40b4387d352413c48cec36b9d3cd0b51 (commit) via 05ab4b7c66cccb7b04b05e252671f3628d4795fc (commit) via 59dac28856b6ba5971217e0cf907a76cc0dba82c (commit) via 5774f389cde220199d257af41f0188b09c6d3857 (commit) via ef3202fb98bf3dd56ee5eca06f169270619064e3 (commit) via 630c8aa8435fced988545d396714398faa3426b1 (commit) via 39b7954d4de734d6f08fab1a6fb442abc2e9bb5c (commit) via 361c199ff602d492d4261f0387d84913a0989473 (commit) via d790f4feeadc863d47ffec9d901d4bf5519001df (commit) via 821667018cc0ea049c52647b507d1a8e4bbe2c3a (commit) via 28f2d750edaf6ee1af660d3a0ae6792c65c47997 (commit) via fc5d6592291aaff7238b7625468f9820a596d758 (commit) via 36d87e18a1ffe4d4f23fbd1bb4ba77c9bc10c099 (commit) via 8c8e53d06011ef476780d10601adac78baf8aead (commit) via 33cafa68b85b06c0a88105de24797df3fa44e551 (commit) via ffcc235c7ee2528638fd2ae4029eabcd5b0f1042 (commit) via b5009720d3020021f189570d72c099963795a5c5 (commit) via ae7398c0a7d2a094f932fada3e4d0675a30afb6a (commit) via 3e4da6144723450a287a78690d1f9e348c85a4e7 (commit) via 03554210357b8378ac907ee24cd39c699080be50 (commit) via 6262fb2f4e10995026710802b213bdd307e0d7b8 (commit) via 31a58b438f1d597d10835db30edeb1283a4d4829 (commit) via b3c10efb0885e2ed23a04cbaf967de23d921ffc8 (commit) via cd9a59b1993bc7732dae4d683c5864847f36a046 (commit) via d50cbbb03d53da6b990402a482a56b3163807dcb (commit) via 31b4700ed640bee962f9db9ce25fa84261a944d2 (commit) via 4d05f195d9518eb5075f5b2a024f6c5874aab042 (commit) via af39f11521af7fc2ec037103df1ad5a616dd7f19 (commit) via 9821924d45e0a9a22e8366060f41d6d87c26622f (commit) via 8e7356a2921c769c091c52140564b04108e692c4 (commit) via 3baca6364bb1569e6856337d80e54b37a96d017e (commit) via b3677b35d320cce5d23831ec398d6bb283d1444e (commit) via c22da7cff74a293d6362598c2a381147d658022f (commit) via 4ca9df8bd1991870a8a4acfeae26933e8ca7dc9a (commit) via cedbb7994dddce2c3fdf846bf4563c846adf4632 (commit) via d9f9c4fbc0a02f048793f4b91aeb5c65d9571e84 (commit) via 196d912200667750d73d872c1c237eebe9d426e0 (commit) via 7a45d91dc4dcbf52a576cca37878bc5c37f293f3 (commit) via c6ff95be6113bb2880653caa4efc0d125016f7e0 (commit) via 2b48f63ce38e49a5c3ee84aa3763da00c8af08f3 (commit) via b74560c32a6fc9df3f5e09b8f29200f4cd9aaeb2 (commit) via bbf962bf8aaeda57a899ea5d35769c4eccd46096 (commit) via 4226c83fa23bf80b6fd3086fb49cf6d91b1a80fe (commit) via 963d99de1477f1a117dca232c74b4dd2e3f7949a (commit) via bbb3c4ffc18dcadc774b7fe4b2ceca1557ddb253 (commit) via b947fc27d5e8c54b2e4cd58c6c9b22b34a843039 (commit) via 5112da5c2fe9cfa35d741cd0f35d20c787797475 (commit) via 070f09f91ea2ea903ad503925e4870aaf541d291 (commit) via f7fbe0f6811dcd656f8cf772c6d57199c92f0a5e (commit) via 5c6cbd390e1d2466df318d2f25e563eb3418bce3 (commit) via 64dd52422b02398d652220514bcf18c2abbbe643 (commit) via 0296089291d59568780baea30332b66ef24f1df4 (commit) via 1c646e4839418d51e1c9673929d55021f2ed9865 (commit) via ba39d7e9d04b6a8d3d9bccdf07b69cd2d959a083 (commit) via f2b0bf6e3f45f4f2a474732f29528299825bf7e9 (commit) via 0a5ce85f602a70d166c2cdc1f2dad8aab9a85269 (commit) via b021455e40f921ab3887dec8cde665838b92bd66 (commit) via bc908abd989c9a241b11733cbda6213520aa0dd8 (commit) via a6cbc89179f7fc6e4ac359df48eb1d31abe027cb (commit) via 3d2d17c00c2b20185b7fe0af22ba06bba3730d7c (commit) via d8bc26a065f1999698c9b499ca793f9adf740a9d (commit) via dc0ddb9e34f885d32f0fa3bb25072ec77e4a79bb (commit) via 28f98ceef1770fe252c0c3c1e59aca773cc64009 (commit) via 28db2268e8e36521626071a39596b9aaa87defbb (commit) via 506504d44049b91fe51539a1b7a29cdc65234b7f (commit) via 90b50b2e28d32bcf239d3f6bc4d1114756a78827 (commit) via 1e47d2b371ebd83374bbfbf9ff22637606e712b1 (commit) via 9ebc5626ef9a11b9f55641755504f054079caa7c (commit) via 9647b32f85d368e9e7adc78372ab5639f4ae64bd (commit) via d5eb7d8565d01af80e4ab0b08014e52286d43f95 (commit) via 4aff1650d698fe31dd5d1f1cfdd359737d16c727 (commit) via f04a09d1bd7107b73d2063c1ac4de3080b21cea4 (commit) via 64e26850fc2a98994424a34eada9bec90f384c7e (commit) via 69374919fd3fde3cd414eddfe01be79d16908391 (commit) via 9fdb66cff6c28fa279ff510ae9af6662b155524f (commit) via 1d73f6525c523661e51173829b327acf9de9dfc4 (commit) via 0b3b5fb16984e81639a92796ddf1f846ae6e8cea (commit) via 630e444e97df52d35a93d22c54359881c1e11193 (commit) via 554c3074556fb8fbf4918fc3e2ea3bef97add1ad (commit) via 56653b81b85c7484a37b6574a1f4b628f462c717 (commit) via 8a45573e99165e926482b07da5ceb3dd86307ea5 (commit) via 7656662148782b7751c62efd256e644c7295c883 (commit) via fae4779864d1e5a93369b1ac7de9ee7428a28043 (commit) via 083312a8fd39f6ff7a9abc79184e31eb233e8933 (commit) via 240b065faa9bc3b1a8dcf073a94028cd473a8c62 (commit) via a95b47154ef0508cb30c82b79dab75526743498a (commit) via a53e0168c344111de301ad67498ad89862b58cdf (commit) via 3768a79c232dc2456b9e9b70da6582b0eb1e78f1 (commit) via ba88bfcf212bc8e93eb065e6d4bafbbf34394e68 (commit) via 693a42fb00650180c98a15a62e11e450b6ab99f0 (commit) via a5149d31beaf7e36c449659066f5348136666a8c (commit) via f9e3ca46cbeae4fb885398e8f7b90c784078b1d3 (commit) via 928d2085d8ebeadc498e9e9f884b8adabf3346c3 (commit) via 5ffdd37b7ff8279ffffbf8cc5a007a541be0d7ff (commit) via 81e5bf2548f91adae813360aef8f7fa5cd2ef0b0 (commit) via 83a1f0a99b05d5f8d060d5777349a32d196be16d (commit) via 4395190cd474f3e83139961d1271c766604e4a1c (commit) via a5dd0c9d427d66f7e361b0aa714a0a41b65ae4f0 (commit) via 036b6ef7c47ccb19f291d2f36df37aaf885b4ba8 (commit) via 614c8a1c920083c3ae76ff035168f7096db6c510 (commit) via 0a31fdabecd2724d456aef0664ad7da1ca28f359 (commit) via 12293371ee0f3b930afee8d328415968eb8201e6 (commit) via 3fdbb0a806f67f10ea8428e03a4523d08d2b083c (commit) via 55b21d072e2df9a35a354fd33e8cf2d0c3bd22be (commit) via c7d9a249118a7b01ed8fa9cc8c61833e39d251d2 (commit) via 38c31ed5f5e34894febf19c873be83eab4f6ea3c (commit) via ec1398d7aec410da0aa085cf7693d62afa11291d (commit) via c4282347e27badf2f1e8b8b5a17bb01ce3209eea (commit) via f1ee10c15e9c4f7d46962029fbb7a9d312ce878d (commit) via 498c36850ba3e3b04dc2cbcd0baad7e8ee750de7 (commit) via a479d7a0ae1583e0e9471e747393839f1af6a593 (commit) via ab8a280857da5cf8545bd2a6f69b7378f53449a5 (commit) via e8b148318f1fab26b2289cadc2d0c5e12201169d (commit) via cbbdfc2b6120e192b4248ce89af93cf34ea8a254 (commit) via 24cdb9df598a1c10fffc718255527729595442a1 (commit) via 2913876c58daec60fec24c6b47c16c3d13b28405 (commit) via e51fa1dc4dcc8c06899f2681890ec61b2517420d (commit) via 7e290214659b2b253bd7034a2f56e47d0ff032b5 (commit) via 7a47745d69003ec580e8f38d26dbf8858a4f5b18 (commit) via de77d4a741c84e0b5774e79a0c84e945e25ad9f8 (commit) via dcca789272057e2cb0aae640836c189873701d68 (commit) via 6a6d00aeeffadcb535b5a4cf4adaeda296f91b3a (commit) via 22ccae1d683b3d2e829edaa08abea0a7f6362000 (commit) via c952f2b42469c22b09570d35eb67d6521eeffbb7 (commit) via 09da79b40ff5a809490b40709a9e564e4ceec0b7 (commit) via f0b5ce7f94ae699ed583777534742bbeb211407a (commit) via 08580be2ada7b226c3b8f91b6ecdbc57d843d42e (commit) via b97018534fbb4ce238561a1363f2698526bcda31 (commit) via ac6025c5ff9a24a6a03b225c0b02ce67d65013d3 (commit) via 38d723b37e660223a9c8a125cf01ae5a6c9977ba (commit) via 8ed8c2956486d841a4e62ffb8f1d82c6c8534b1c (commit) via 2908103d04daeaf396173b6f868f2cad5eb47b08 (commit) via a680211ca782751159d70464e51eac812d8db8f1 (commit) via 53930877b3e8ae356a6b1dfbb1c63c92e7383465 (commit) via 57d5628fd9155a9f7f203ee6d612c6feeb3cc704 (commit) via 198e7df97e7efafca8a96f448c2712125aa71266 (commit) via c634b5d4c5f5856be7b7ae163f34019b93175c51 (commit) via 63f2737993b5d0b0821bf7400c39266692713f16 (commit) via 05d8aed844e0e0c555ee879fd3fa893da364e12f (commit) via e240a489c15a8cd09dc36f1ec8dcb8241aac7ed1 (commit) via 67afa4e407d133754cc2614b137311c35ef3dfca (commit) via 511e5dbd710af570d45488a48a1256724784b761 (commit) via 693abba25176d073ab3073e7920f4aa8929cc6e0 (commit) via 99afe23513054db4add5143de4aa3a826e8c6c75 (commit) via 611735e76e14807e2145d6b67efbb080d419f19f (commit) via 565d080a9a1e133bda868e905226181b60e90356 (commit) via 34f5ef564aa94f2f66f35c708dbfca260b419e4b (commit) via 4c60e07d857277f1edc45358b35c6f50439324b4 (commit) via a42bf6c5ddc70e0b15bbf60f11678aae71ff1f56 (commit) via 93936d78d221ea49f918f95e33b97796b2a3190f (commit) via 1549927d7dc29476ada7b0c0867e9630ebe6ea00 (commit) via 972849fbb7531b2d43e4ecc5bd0cf2b0b75922da (commit) via ecdc77f14d7a37f9d173ea2ca4946bf51c6a43d0 (commit) via c025e61ad47513d63c4b09a2267d254229c13c2e (commit) via 2b7a47d76ac5289acc1572917b8ac8266ffec0ca (commit) via fc6c5074e800fb7fe3f829564d7a7e284133cdd9 (commit) via 291275347be3f9c02aff6fb4dfa45a3e5b2f5b4a (commit) via 67211011d946684bed73bcd5b976ec90f4c30856 (commit) via e0ad72d8af9bfba80d24f823d79440ebb9136bda (commit) via 39abbaed7756ac9b4d1d2e7f44575ae85388aaf6 (commit) via 7984ac5e58722295e71f6c2418e2a54d6f1a0cc1 (commit) via 4ce6fbc76b0ebaeef258695c2b876061b5b61073 (commit) via a657b324822b5bd549706b337a74fa3bfd7bc1c6 (commit) via d462ac27d814e966c54bb638444e4b125d1d665f (commit) via dc873f6eef1e6f952cf3d09be7568b03fbf8c6d3 (commit) via ad1be6ee769ecaba4d6dadae84c0fc372049a333 (commit) via 27ed820c816a80bf140613cb2f47ccb2f21b021f (commit) via a7ef02253bf8ef33d4ffdd761802ea30ef289b8a (commit) via 3a824a963ac54930b072e2d31c54e182af3d027c (commit) via c6eacfd56a9c5a8da2304c446230127b6ce42470 (commit) via 27e6f74f29084fbdee35eb5a8d309d99d39e66d8 (commit) via c926efa1398aa2c4ff273dee173d84d0031bcdf6 (commit) via 0763a8365528166747746e3b94e74ca98d0d705f (commit) via 5eaac0c96ac51e1300664ef37239f3215bb58489 (commit) via bc35087da3eb9039dad8fb5d27c1fab60b43f776 (commit) via 98be140fc0dc0bab8955c4fea9274ea52ac8cd9c (commit) via 93cc80aee59cfb328d541ba527d40239ab8348b1 (commit) via 0903812b0b8c325913d766b793bbf9438ad6b423 (commit) via 128d569af02d95e455b5ee1d8dddec07251b7033 (commit) via d9bbc8f02b8374d258c254b2e105b951620d795a (commit) via 8cc5e2cb87cc0b2868f10015688991f257371755 (commit) via 939792fdf6d16e192566b1e661725a8a72d6bc7d (commit) via 8ff907113792d4554b2837afa7102427572997d1 (commit) via c3bb76dfd2bc732acb8d69ef47dacce9a55a6582 (commit) via 335314e35f5bbfe4131895e9e877e4a19cd3e806 (commit) via ebaca6290d2c0be7dec22452389632949a700d28 (commit) via eda493a38021f439b08807bb8202bab29e79635d (commit) via 5609ba1bcd4803547dfbb558d8de3c3d3af6369c (commit) via 2c03215050fee3695e7ed9362f35dff1ea9c3016 (commit) via 71e5f253f9b035be7049f36dab2e942220ff6209 (commit) via 384ae5514e423fccb02e48a4da25e1549556d898 (commit) via 0be5020bf814efd040f7dcd35cc3a9f07d113458 (commit) via 306e2016bb3e285fcfb58e0f17657dc228b67812 (commit) via d5d90f5ec8792fafbe754e2c943825267f7aaff1 (commit) via e069aa05c6a0d8e89a677fa4f00d33432191eeaa (commit) via 5875801293ae1ba09b15cdc22902ee7766416de5 (commit) via 65dc4170f858d561144a3c79397f4d2822bae4b6 (commit) via d4767fca963e97ec2147a343e24ec366cc2646cb (commit) via 4d4fcabdfd9ceb02d947f6631370f6091e1ed337 (commit) via 7410e2ed61851385d0c06dd174a4782a54c44ab0 (commit) via 7a3277276e69c92d0f69674cdc27bae11bcbc14f (commit) via 25211d756fad353e96d29e289d40d780a5341c92 (commit) via 060442c2e866c44ecf0c479e49e1d5ae35e8c6fb (commit) via f3b3219c9687e54a83dc7e5dabb0afc4637bb799 (commit) via fc656fa4fe2926c7a50de91ff1b5564802ac4a7e (commit) via ddbda72288f022fa558d8253c8894687634448c1 (commit) via 56c11eee13604e163eb5a5d9092df405be0e9a5c (commit) via e76ee2c006777e268715b39ad71f49e3d18b11a4 (commit) via 4ffeab0e3c451854a4a9d424b47b2179c6cf6c6b (commit) via 6f6897f1aef884963503d8068707cf27fa7d99e7 (commit) via d60cef773659d69ed2fce9b963d788ab422679b9 (commit) via 9fd987507622c585f4e0131678654e0643fd9a50 (commit) via 3f9b081f6ee85e0691c36496d989edbe8382589d (commit) via 01c80acdbdadf3811bc0a6cab0c28469a4e9f5b7 (commit) via 5183c6e5dd6ff2bbb5cce33a6f8b6b1d74dfe217 (commit) via 8a60e6961e84fc3177d2439fe6b2b5f972104cd9 (commit) via 4e29a514ad83c5711e7ee894b825203e8c302269 (commit) via 3fa2fc71b119751bc915f0068d2046667fdefd32 (commit) via da78a1648fd5d4452a98c46eb9af486d16c43c9a (commit) via dec15fc32cdcd2604dc58eb7275f444b01002117 (commit) via d956816d70e7400b1d70f46f4f6adb87cee8c1ce (commit) via 5257a3b931e3a2edc3fbe262c8215af6e7f5bfd7 (commit) via 36e6ee913d7ea22060cc45b6a6a7b7e573402b28 (commit) via 88c2d4b446c8b23b9694c6f00e76e02cf5e3d8f8 (commit) via ae434ee2dd1a91cd8ec53a631d8db9949d5f46b0 (commit) via bb5fccd0a77956b02f9f2c6f1c4c7acdea472178 (commit) via aac633d5e5765bb6b51e31364325ae7d916f021c (commit) via e8974b62d7883adf100d4c6ad90a0fbf682aaa91 (commit) via b146747ed7f3cee8d8ef9c3ea6899ec3135aa527 (commit) via da688bcb3b7edc1da19fc8b89e2425f40d3fa7f1 (commit) via 07388f83b69739116c8364e9443f10158fcdc912 (commit) via 246b0bfbfda9a8f3091fc34fc92816aebaf60ae9 (commit) via fe05ad975292a2ff57a66746f1aa3870217f1ddd (commit) via e25f294a0e0aa03da4516d0baa488ad02cece089 (commit) via a6f5281419c59b433f248b41972530242172a124 (commit) via deec3a3f06d341cfe0bef4e856b263eff347cc72 (commit) via aa427a4239eb691d4129ebc383ab7b0d61b5b94e (commit) via 2218962dbdc7f552a076978a0393433091aa35c4 (commit) via 3c6a3668760ba48dde33f20de08dc6e16cfe7ab3 (commit) via 58c1840a193d8cc5e0fca3e8300b6f9d93c3aeb1 (commit) via eec87ec8a77550af5b39b95bead1d4be6a802637 (commit) via 31b013b14ad3bf4838f4ba327b5392018f4853b6 (commit) via 9cbb8058ca843c1a3f3b67d155718b03a3e91d6c (commit) via 61f677edf8bd1f24ee4db39984f7a18a92ad533e (commit) via 74a6d43ea04cd0a2813076feb04f623a52c4928d (commit) via 2b87b58dced5ebab753f1cca8b4a90f2821bc450 (commit) via 9342a4c2033ce7bb6845afd3625ac9c195a8e22d (commit) via 99533c8e345c627f5f5a98be5cda7b7624756fb9 (commit) via 2b24fbf48ce00777738c306354c8c7ec2cb3237b (commit) via 75c73272862285b1b35575b04abbe871ac5e9b2e (commit) via 056115106a91df5396ef691a58ea4e5563fec24f (commit) via f66f6e2490a883ecb9a9505d87f76869980e776f (commit) via bc1136b2753e82f9d98a4870f2ff026fbefe7ace (commit) via db7457452cfbf6734d0ff6e3ba8700e9df46c2ae (commit) via 7c74de8de8be5a03a572f476bedc9d4c5ca6c0a0 (commit) via b2de70a036cb3e1ae677b0a923c05276af4e6054 (commit) via 2bcc63e5b5fe0612189400d2b6d3c13acc12e0af (commit) via f430198db64a8cbf1e4c64c0d088fc9e2c79dc54 (commit) via ae1003cdb9b6c4949022ef3b24d368c467a1d15f (commit) via 5dcc833b28eecc95486852f032a54edc64f76eec (commit) via 5c60f16b1241d6ad6062f28151f9d3c473397eb3 (commit) via ed08d1d48969994e9cd4f4ff9d3815c644bfcc8d (commit) via 15c454fe82818c3f317db83ddf9ca90347e2b510 (commit) via 32268810d9f1cf40d20bfb287be30db582696043 (commit) via 0c5b96bf7ca781b9ff7bb00b79790215956d68e6 (commit) via 5d74c870d907eed9afc9c544e7e6786fd1ea53c8 (commit) via dbef2244f97e266896f71729d0de5eeb80c1c5f9 (commit) via 1aae378848e1168a46627df8831df5297770fadb (commit) via 6c24ca93a6ec6c6d5bdf102dd6985130ffe85090 (commit) via 5bba0432f4448f5bf3fcc281ce42bc935634ca5d (commit) via b6f471773d943bfb0f5cc012bce3fd25f5f9f7fa (commit) via 7171f64cc108dfb4072def578ef38ed8ce99187b (commit) via d1f4b6b501f477a0ed9af4abadc5995b835b5ba2 (commit) via 67248baaf98c3c8555dfa85f532c6a840eab10b6 (commit) via 1ccb417d61e08b69606a9d66b8ae4244f0b051d5 (commit) via 65b866122184e1a791127dc77fcd3b937ff5dbb9 (commit) via 193987d34477858470fef68cb8d34764a660acc2 (commit) via 75004280af22edd22a3efb7b47d5d87f2da65354 (commit) via 3477b26ff6c455b64421bf19000d7203acdd6024 (commit) via 7d64a0598db5da2c4c1874f9fe8726fd6c9b18a7 (commit) via 866c75dedd42fae9dd05be402bdc94d51ffc7713 (commit) via e45e503f140f99f4fcf387e5359e7aba4bb1de0e (commit) via db952a58178daebfcd821b7a7d9a7f3ee1279bc8 (commit) via 65b9d1f228efb1d028c3682ec5637f431cbc3fc5 (commit) via cdff176f7ee487d306af138fd3e1ede340d406df (commit) via 4ba760260b95a1d23b09130df6ec3e7736af7493 (commit) via 4e333e3b32ba2b19b5fb07b9764264add34984b7 (commit) via 743fcf1e89a5e5172d46a3202b123bc441ec42ba (commit) via 96e4a79ab1236926ac5076a47bbbc013d32c6555 (commit) via 79cc14257a0736cccda6451346a30a51f2f390a2 (commit) via d6c186046395991c1975c3173eaa8eec5f4b45f7 (commit) via c1cdf60a005ce1d9973fa7a3c7481ccab7b47e02 (commit) via 4c66a9011baf3c7b42c3b7fa613ce7883a8069d6 (commit) via 1c1ace2db012919f23b6de5400ab192b9277dfc6 (commit) via 3379365e6b3a4466b3e337c2e159125fb91ad447 (commit) via 2b958a20275c1c73aee745c29ecf4d2de1377f7b (commit) via eb6036a9a4b5c8c970dc384fb37c68c07505a255 (commit) via 6772913fff10d59b38ccec6c1104008c8a21f7f7 (commit) via 30b0db7bb5482258ccdb96d2f0b7aadb5d3b23ac (commit) via 166a61c72986a45814c524f178857207f3cc113e (commit) via 96be53aebd01e313634a0cf0c611c718fbccc1b6 (commit) via 1db32ffe98272ded29827b833f373ffa399429e9 (commit) via 64b3df7d1eabbd7c8af5262e68b3b729fc43cb22 (commit) via faf98444497201abe8a5b772dec5bda237f4aaf0 (commit) via 31d52139ca30f5c0fb814765da542d44531ca146 (commit) via c54a621b55dd09f212037cacb35b98b5129afd40 (commit) via 9b41415bcdda480b2984c4a21b393738b4ccfcfc (commit) via 9feb24e514f3c0f6b9a9705e17cf1917152df977 (commit) via bbf1757dfa4804c0d8ac311e6645084982831a50 (commit) via 4bca9401269878d2f3b0465377f0fb8bce87c734 (commit) via c4b9ee1878c62a272d38ae057e0a76409be54e8f (commit) via 167a465565cda9bb33d2e919509c23a761ea45e9 (commit) via 9c1dfbfd600819a751d4c5058fd939650ee6d6b4 (commit) via 47302038c1021f0b6b0d9977f5bccaa795045805 (commit) via f6f03ed4cc4271384ec934fd5867ccbce4e798f2 (commit) via 9f053763d769780385fbc8e3e936f1c996d2e00a (commit) via 415863e6d40f3c09d43b41ef16e0a7ffa0006063 (commit) via 7387f06586f0b01dd3c1c4f66339c89f2e985e82 (commit) via 16efed6af970796a3a7d4071e8a802f223ae7034 (commit) via 8f8f9e216eea962f9b7c978ccd37f3c87fbe09e2 (commit) via 48182afd3d04cc659fc5d86ab65b403d8a2b8eff (commit) via 710d8bab7ea045216f904798f0df4d21bc94a66c (commit) via 54153fb98dfe6b91ed162e7c195005bf35fcd352 (commit) via 3cb726371f27948149f668d43aa58cd2a5e9be4c (commit) via 556fe92b765ea6d200b76c4e6d35a2147952d9a3 (commit) via 21684a240186f061237a5445042920decb0fc337 (commit) via d3625b72834ab63a2c946c75f7949aaffaf9427c (commit) via 0ecb5e7f8b02c96823104ab4b08773dccb12a2c8 (commit) via 9ad0ae1c01d67ba788645d3114967ba8718d4ec7 (commit) via ed484544cbf39ffefe1898b8255a5189062e5c60 (commit) via 20e445f4418088ddf6e8f30ff3425af1588d2710 (commit) via 04a2a923481bcc1cc734e1ed58d8505370ec909b (commit) via 57672e7275fc12534b5b13f9c922fe569936c81a (commit) via a45a4b2d86bf7d03d690433c3b1299ace1e6dbe0 (commit) via a60574f1bfbb5a153b7e55cf5183be93ac50bea0 (commit) via 5d79b9563f7852098721a9218a13c84383f780ed (commit) via c53e692db92ce5f24151f4bded40ffcddc9b0fb2 (commit) via 24012e3c15c127fe570a222fc8cde37cf2a27023 (commit) via 47182ab876260c20554d8c5e3e8f453264a47b53 (commit) via 4ce9742ae33678d8fce189d172c2fffb1a43061c (commit) via f071d8ebd4a7bd34f52c92cec539a6afb8f277e6 (commit) via da65c5191c7692d2f733561eef336eea675f42a5 (commit) via 39e830a98e81929ce95694f2f81d92ffd3f14d5b (commit) via 5bd78b0e999d28b163485232e434f5c7a5678ddd (commit) via 08b8fef254f4fb705046e5c59c1b8e2f4f3afe22 (commit) via f88533cc067ea252254b0851d87f09ef798e2c97 (commit) via 13dc7bdb5e3a0eaaf3607b154bba77a01404a788 (commit) via 60cbd9b9da2059481e2f29fbb5859a5b0643d3d7 (commit) via e5b70ed0137df3b72f279a039cbdae1a20784473 (commit) via f2d98e2d3c9d7581703b124d3436312949dda141 (commit) via 59315f5b0028e4f9c4fde765196c4df38ab83b3e (commit) via 7a37936adfce70edab7048a311bf9cf4e9a0f61c (commit) via 49ac682d39af7fe47e79455827e2e83130193236 (commit) via 1e83e41d5eae60adfd588904e5418df38075b1d7 (commit) via 2098e8e8ff7be5940a8f018ec6764470205271d1 (commit) via e7e713cc0533cd8f1ef47de4cdfd895d33545502 (commit) via 247c168b987a8c9c479112c13078aa2e5db37773 (commit) via adfc8a677e51772d87a3e050477c60ce0b70288f (commit) via 73f255e29d2ac9b45106e9ba7c9bb20ff2ab4349 (commit) via fe00c137a866779cb2f7578a7712895ad4dc33f3 (commit) via b1efb0233e9c925090bf1eb44c3c1cfb8e186764 (commit) via 341cd934897b3e37319b978113a1fdf9bea21c6d (commit) via b87bed0ff6d724a91bbe5ee97b5608eed588d1af (commit) via a3c5ca960bdf7c136fc64e3bb6d6619ca30623d2 (commit) via ed67f4052264003133b19edde2c85791d501e001 (commit) via ba819f49df33b546072a5928de3253770c4716b9 (commit) via 7748a02c3f7d028af13d4fc2c83e7181d11397e9 (commit) via 035a658f4fdc8028ff19568aa2ded8b3efa70909 (commit) via 74ea66850c99578d7d1665e64579279a6ff89896 (commit) via 2aaf702dec9cd3d846643abffae0d4f1cb2f2702 (commit) via 9d1c77cfdace4250438cd449304ea013f950cf61 (commit) via 06ed3eb9e97e0b5e7f8f968518f0822f3bdda06d (commit) via b7b3b675fdb3240d8157b51d28bfe9b135d89302 (commit) via f8eb72fe5fedbf45e66f433e6bc54e1cf0359760 (commit) via 96ac964d765108ea0bf2c37567efdf777a6047e4 (commit) via 3db46ec57d9f85f5f2b3d2b5d963856b876a5a13 (commit) via b7fdc8cc39cda665b921147bf729fca921207edf (commit) via 136104740663b3310616bec51b2cec7f807715ce (commit) via a375702eaa961a496b9420a836c336d884e9cbf3 (commit) via 4f9a02db41a93822547c4cafd00d545adf07eb86 (commit) via 1f9affacdad90240fb1f3bd729eaa4c81bd34568 (commit) via b5c75a8e88debd8b003441ee88e8a82fec68e03e (commit) via 6c0d8a5d027bfe681f45337c79d1bbba6331bbd8 (commit) via 3ca925579c2cea0a11eba7ad3ecd1a51c4d1ccef (commit) via 41e5605d029ac92c9593d69e06c3a56e1d5c40da (commit) via 5cdba31fc631453d530abbac04bf4a455d1f10bb (commit) via 7f6c613fd041e8b2dcbfdfc43992a6db28a4b36a (commit) via 3179d9a2415702b8ca73e8759c0dba97f26423e2 (commit) via b5d94065c07a3ba6db29297e55b0e01ba0ef1f9d (commit) via e14709e5a5379f0a6fa2434551211b66561ad540 (commit) via fbb8d086ba864ce6b12a9fc01e39329ba0152bf9 (commit) via 3b0c074345065e623e08eb9b1d12061f6db14be1 (commit) via 1bfb527f561c705169f0716108e34a2b5ba5c8bb (commit) via 63e2af0f8dbae222ebaae62b532340f3d83cbc93 (commit) via e78fcc6329483c99e61cebffbe5d82b67a3361ae (commit) via 2fd5fd1f4d93322e85d662c1467a46cd7da84560 (commit) via 1e8c920d0409770214a4ff517f6a4c31b9830f45 (commit) via 27570a6d0ea6df41a7792ce2c3ba2f0c9e1916df (commit) via d3325c3db79e7decff881cc8113d6febb6fd136b (commit) via f68f8a14161ee41c52cdb0725e57e56e15b42118 (commit) via b272a656552682e4042a65089703d6f78043ff18 (commit) via 87f1f363dfaf181854b81d84518ea57334edcc8f (commit) via 45cd9e63371ae09b6ad9dbc27ac4d36c19b357af (commit) via c09acf4fdd961a8ba9a27f9af2800e9262cd18be (commit) via 2f940f89951027bc596edbe1a5768cc0a0ef78a0 (commit) via 1e4738173053450c370f6d558fff6c08e5b084f5 (commit) via 43d577dcb9e29842c91073056ca400963d6bee0e (commit) via b28101c65fe47cb15390ac1ad4c85418071468d5 (commit) via 13a37f5f76eb03e01e9ca225281531233ff0006c (commit) via 958508bb1fa8854cfe7bc4386fe83c82fed73e65 (commit) via 91a829c165209b96c20d17f8eb7d46d3375cc57c (commit) via e0213882222798eec587a4dbed6f28555d64b8d9 (commit) via 0554c2c970bf12dba01b408f3d8a103ede10a30b (commit) via b22e5d0ab71199b45f1f9f4e271f677dba602452 (commit) via 6a56c8247fa874bd418c3e175c941070dafb0e76 (commit) via 5f14040c34096c7421e9d8e5dc9aff1bbe21f8b0 (commit) via 5ba3209247b7c7e4e4cc7c38b8702bee4879d50f (commit) via 10e8ccf6e583f8bea721906b5085ecc564095a42 (commit) via 79c3a2a8f72ea175533da9f323f88c507220486e (commit) via c389f8bb07e900d805ca3163f47b06e3dbe4303b (commit) via 02533038dae9fb5b4ae1b6f7d55bb5af397400af (commit) via b6278e9ff714d8bdacb54f055eac71fe073b28d8 (commit) via 7a6caae1a78e8d67422b144ceffdd97595f67683 (commit) via 0fb187cc589b83ded107d9a9a1971830efb6c751 (commit) via 8caf1f361b2207522d19bf4a28cecaa3a2391918 (commit) via 278ba2db477fdc8cccd2313eb56e0179234747a0 (commit) via 79c11d23405d3894a254a8c03df5ead32464b109 (commit) via 9b244cc0ecff0cde22b71b7097a3d84c018c6044 (commit) via def6da616b81958c9f1058a4e520ac3cbc534757 (commit) via a67231ac114235f0af4673235c4c07fa896c8ab6 (commit) via d566f39a640297114bd3ad933bb3279440b2f38f (commit) via 0c97d32f7a592a768d614c19b3fd48eab245a2c4 (commit) via 383bfd95432990365ac5c7fc3ab190bfb05cbec1 (commit) via 7f6beddae372a7ae47789f5460bcdfdac39c64e6 (commit) via 520ca0ff6c123250c633a3618459d0161cbc4683 (commit) via 3e3c754b8cc3af463dcea95000daf3a18b359b7a (commit) via 593f347b5385a510e641eca0448f7ddf64c1c12b (commit) via 7b127c62d4d4c94cf96e9d406859dbd24eed7dc9 (commit) via 780bff5279c6c2d356e5c7726b656bd9c68532b8 (commit) via 6bd7bd1e06fcf92d40c762f2713626d125cb8f87 (commit) via b397eae82e14fdf75eddcbfd022d9f2d5933eb1e (commit) via 00b8c0a8d4b59dc01276d083ccae4a8138718b12 (commit) via 4c6374bcc56ea7d7f7e67c518e60de94be267256 (commit) via 7d409f500e3403f8dbb4a0fee6ecdad94f45c35e (commit) via 7a1b83cb3fc79639b9e2c1bf11af2d2274e4224a (commit) via 736c2042c6bade0322441aafabababcbd92af52e (commit) via f210cb131e5814631d6d2974cf2437632446654f (commit) via 8c13f0f7eaff8fd0404dbbc9a6eab5ee2637643b (commit) via ce43ed2cc14f96c56441da9908053737efbaaf2e (commit) via d90c9738da7003b966036c70727611b17d17f3a6 (commit) via 331023ae06b795a1733ae03dce2ce2197ca1c36a (commit) via a03f3d0e01edcb617813144626400058a5c0a177 (commit) via d50c4220e29ef0b7366f3e1812f0a79736f2c18e (commit) via 803f1901784937e40717fbf6cc675eb7aacbcce1 (commit) via bde277e811fea2532ed32ade6d7f3d6e910bfda0 (commit) via cf69630e510a5c639a93a99b315fcefea9688935 (commit) via 3f8aa62bfb339dded326b0bc36016134a3dc845b (commit) via e166203f31890e5bbe2bfa19bd5eb63e7d8c3b90 (commit) via d288b216af6864567354ccb05e85466fb57d46b0 (commit) via d71920c45763fe15fa93c2fc1f5aceabba23975e (commit) via 4c4da56b2eb22fd902a100b294ff2acb6d77fac3 (commit) via 06ee07b854d4a77c4147dadb97f9769b17da832d (commit) via f054552124bfffce3b15c3422ceb39acec9b8b6a (commit) via 8e86e113bc738cf3cce13991ff6208305f950206 (commit) via 70d2f2aa610fe82f7eac4a4dab510ff8fa3e2638 (commit) via 33b43ec26bc4c22998376cb1f087cd07856a61e0 (commit) via 6cac952b9ed8ad202286ddee7246d9ef7ed8f22d (commit) via 97b3768898431ffff824388dc263654a35a33aa2 (commit) via 600af01d41e32d304e43dc98783ec0f7f010f40e (commit) via 330bfa83368989f6fd67072ef9f5c9e457230f17 (commit) via b13e26e278dcc34243a2b31dfca8e23b01e15b76 (commit) via 8ac8739b2e5df2f36194261f9dcac95107b4b5f7 (commit) via 84fb579fc8935202bf182bbd1685aff6acc2a3b5 (commit) via 1eff421ad00bd26a22b5145fe2b175a300041dca (commit) via 94fd5a5af87adafbbf7f47d6d083b53c6bd3e941 (commit) via ce9e9a92cf773280de55ef6dcbec9fc2524f7b2e (commit) via 26e23e8463f9b9e2298e317a70925c56bcb018d1 (commit) via 01c26986931a409dbb246b780b808c51aea35c2b (commit) via 459c891088c8b2fb8b7cb950878cf7c0579ddb33 (commit) via 7f8bb857b8ab714b80acfa6a6e2c34195fabff6f (commit) via a0ebd69b52dea77c5d8c718bcb7ba0c75ceb9d5f (commit) via bcee21ceb733d7e6d12d85346d8e683399cc4fc4 (commit) via b74aa0e3d2eb90b83bbbdcc91e0b1dd721cd194f (commit) via b92d0b2c94936fa438c8c92a6961b6323795d6f9 (commit) via 05982b26e6fc58422dd4c05497466f206d6c93f7 (commit) via effe874d25cc0448d9f37fd90283fb83118cb31e (commit) via 8616d12cfc868492c030168c228983cf6b22b534 (commit) via ed4ea59a33d094245ff4807c143134846b2be77a (commit) via 634155d6952033f353de90073ac58ef53a900306 (commit) via 4bc65d76f13c63367857b22e87f73baa8e6d5970 (commit) via 80de856bb5cba20d424b91e4a49fe8fdb1f904a3 (commit) via 4c41e74da58b6f1057466e7eaa22942dc62c8802 (commit) via 67b2f4312c431eb363dd94a2bb5d88cc6c8a7c95 (commit) via f528e6bcb9b2e181dcd7ee0c1cc327b6cad84ad5 (commit) via a6b7eb5bc8c304dab2102689eb09ec85c1e7f6be (commit) via c2c239e607549d6513d95c3e919b4f509733bc87 (commit) via 66fcb15bb46a6e24bf513d3f703c1a08bb20aa8d (commit) via a91eebebdb2a012c233db7869ec0ade534c4dd57 (commit) via 601e6e1ad10b83dcb5ad09d061b04e6974cda283 (commit) via a03c13a710fc4c65035e92749720b559cbeeff2e (commit) via 85e0bb84f5eca2f77f070bce9f83024854096307 (commit) via c70491d671b363b50a41d707d5fe82b02fe29424 (commit) via 1bbba477c747581d318b4fe5a1f3ede36301eed7 (commit) via 64bdf0b7469437b101bb0f1cf641956e0b5d1bb0 (commit) via 8f837fc9a9fc335f87613e0c113050e1533d9efd (commit) via 61a0251e824559b27e751ce7ff0be72b9bb8ec69 (commit) via 9e5f253f8dba871d7cdd966aca88af92bd8d14a6 (commit) via a8c0fbcc194bca6986492278e705ff301f283378 (commit) via 56cec75058b1980ead58ddda0c371a783547acec (commit) via 832fe4b133f47781f4e08df1f83fdc4e3e7aa06b (commit) via 0b82f51a308d2ae36a449e6a02a5117199da373a (commit) via 5333c04cd046187dc10cd6576e8fdc1342753d36 (commit) via e861e12f6ed677debd63a78ca80f9e85def77081 (commit) via 932848f420a738ee07997198fead5b2c2fbf4787 (commit) via 1a8c7bc2c649781d1163c1966245a45e0fb829ba (commit) via e4b7d5afde91efafb59749a0a513732a089a6f0a (commit) via 9206120e30d91389470aa0908965103dc301bbae (commit) via d31d92bf1d8b13ddff2c85c1fd380519867b788c (commit) via 740f85a204d7a837e3ad408a79992f6a9c0b000c (commit) via 8bcf2c81fc2a2bc458d54f9d5dbd40b49e5b993e (commit) via 196de9d14d281103e0ee5c36e9dfd39504804aeb (commit) via e2d4bfef3fe24ba5846abbb2dc2c2e0ef58a21f5 (commit) via f1de724f41a516574f22d2b0e61ebf4b6d65c601 (commit) via 893a7fc2ed71760e1c76c4639985d0e1aec87d04 (commit) via a4bbdc5ecf4d2b66346e1006cee891acf95c8ad8 (commit) via c099e00fc0a9c47a2addaca145952b1c33195fab (commit) via d74bca5a8fee1d45c60b60a70a2a1a90abb74180 (commit) via c6e86955086e1824cd666bc69c802d48074cc138 (commit) via 18046bd50a502508f170baa6cec5c81efb33f180 (commit) via 91411641a7b8029d05899b11590fb4e676716a85 (commit) via 6d94078e623d5f1316f1972ffda06ac1d66b6f2f (commit) via 3ebc62850c7461dca4723b063b5e5f019409db84 (commit) via 311018e5ad27abf7c76003ec91d3f26ef316e3cc (commit) via c0969b10330a205a693bdf658185740eea51736e (commit) via 6a1e73281f216d2644dc3527be01c3d38b9e1263 (commit) via 00f50b006cc9afd014374fabc10bdef1330075a2 (commit) via 215cd21a0238ba00aec7c81014fe83e3d47187a6 (commit) via 1df8bd3ab0f6621b90a8801c1d10cfc94c74ff96 (commit) via 83703bda7d1017e1f75ec1b92d672d5ef17194d5 (commit) via 3df749af55c04d5b7bb0ee848c6df112178327bc (commit) via 3029c27e46a193c6319a3c909f938e6614c2b14f (commit) via 04b6bb167636ccf2fe565239a44249366ee1e452 (commit) via 400e3d19fcebf7d6e9551d585d60754bd937c28c (commit) via 726e461b3885aca4144ec79d08bf62c7ebade96d (commit) via 123de1914c7e7d53d1e295c73994b2780041b8fc (commit) via 9afbb733ec2a55424e6c25c6afa7fdd14219d6b1 (commit) via 5ec8064b76aca89b6e0274e53c272f298655b992 (commit) via 1fcc01f2074cc5fd56489ccab90457b51082e10e (commit) via fca389e78ca8d5fe377a4116dedf8b9307126380 (commit) via 3cd2e0e2d5d92266da57fabe6b4435dcf528ca1f (commit) via 693141c40e87a77f0a0258e21235197d421c26a5 (commit) via d8f8940bc68f09e382320d1ffe36947ba880ae65 (commit) via 7550879f570502f31aeafbd48f04bafd17234696 (commit) via 88d10d55ac68f2251a549cf09292af8a1fb66ba3 (commit) via b5f5de70c0b754010f151cde75783a2cc62db835 (commit) via 8e20ea6ef2258867bd6554536fa7b914f266df96 (commit) via 4565a2e1c2643fcd1b40f4a041564fc4ab60c17c (commit) via db3d85059c2e48b1a4da99230098f63d04dd4e93 (commit) via 383abcdc35af1279d428886d8b3084282ffda5d1 (commit) via 919f26ffba4e5b8e1c206182d906081da8c701e9 (commit) via ed77504d89f99c1a395b5472f51d181ad25b90c0 (commit) via c26ff8a90b985f7189aa114b0bcac35b2f476b55 (commit) via 30710b8d32344a7a9acf944f97fc947fd491cd65 (commit) via c6d75294b2827a7f24baed4814046d9d0bd6a61d (commit) via 9c6a7203fb0c6034771011a8ac58ae447726b919 (commit) via bf7d21b0cd7bfad2469a4ae337056a754e6b0fe5 (commit) via a527abf0995fc1bdd45afdb20e80b728dd0ef045 (commit) via eb3be7d68851ce87354f6bd90e0be3a670d22d56 (commit) via d231c31b98eb80929d9aabf8e606abde39fc08f4 (commit) via e6661282436d7901617d2f96d9acf9d4cb7db9d5 (commit) via 2b9cc1e24871c6b527900e119640ef0adf706f0d (commit) via 97062ac268d1bcc62a528aea2e22a7dd6f6efa8f (commit) via 6a72b3c84e016d7e540aa3d9b079200b3fb52ab7 (commit) via 1293c1561a58b2f8b0bd4ec05bb249fc36f487ac (commit) via 381e7afd363d64c72b83e69fd6c6cad5fc3eefb4 (commit) via 65911cae4dd5a81f23a59bf9187b95bda3168fe9 (commit) via 37ab74a607a021567a0a1e2c7df43da33d32d5ec (commit) via 764720c32b8f5f1a4421b274100c213dba17ec1d (commit) via 31c4aee75a18b11d86a364d01fdae3250200866d (commit) via 3e8ef6427393546c77da1b74234311d3b60edd98 (commit) via cfb2f7508af637c9c35758fbd5dac6c8cb679bdb (commit) via b857f0d84b539056bc6a810161eb22e9b9baca43 (commit) via 2f269fdf0c293e80325c748c985279bc4067af3e (commit) via ed09f3b292bee34e8b30204c93ef5596a3124d00 (commit) via beff29f0d4bf1ffface0e6833f29f2f04ceccf0b (commit) via 12e4790a0b40d8176940f855f7f6c9cfe6c39f9f (commit) via 14272277205ac7927a4c13b628ce411538f7b17c (commit) via 8f363d6771dfa792d606978e1e406229637078f6 (commit) via 5794dbc301ace0041c5fc50096cc5331e8ba3c34 (commit) via a892b285f8c621ba50f45f5c4218980c911fd1b6 (commit) via cb8c728f17a61732064280ddb98203cb277e5a3c (commit) via fb4fca0b5efabdf061bd256ed9d35edae6f42b9d (commit) via 50fb2ad6463c500fde44c000c777aa3ac1cffc7e (commit) via d233030f5bcfe2509b82433f7df6383cd301e34e (commit) via 0ebe2bbf4ae7f19b10f8374313b2bbd6fcd6c3da (commit) via 60bd9f9c92faae368fab1c44cf81b489c6a875cb (commit) via 82a6eaf4d0381f0e3236dbd067fe853653bbe6b5 (commit) via 8aaed08696a7444b80b6319e2b5af320ee589658 (commit) via 393654bf49f2c8d86e9ec88fc3c8322497432aea (commit) via 893ce307f9a9f50dbd324a4c72b833e4a3649b0a (commit) via 02f8d51f48ae4abfec5491a8ab47be35a6671bab (commit) via dfd371dc013f14fb8e52c4f16e4a0f03a1ead9ce (commit) via f13521317a43af4ebb2996c9916d1d1da695c5fc (commit) via a4f0b01939ca7c69c1e31f017c6e87b642388252 (commit) via 2f1c3401ec132f0672c108a2312146f39e8f017b (commit) via c4ae157865291d73113f81d4c9a9c2dd86598efc (commit) via 6d27a3dbfbfb8852d8b8ff5c6fc7432eebc604e5 (commit) via ce7ccafce29a618392e05f99881c41f4a4a07125 (commit) via 8e394cf9e39babefdc991b67fa4fd1921735eb7e (commit) via 55474e6182b49acc4183fffdebccc7ae2a7335fa (commit) via 38df5c36d66313a5dd7859c1c55a41f60f141b13 (commit) via 4ee2b2670854b071c8b8ceafb2a4a00f72069ef9 (commit) via eac15298a80b814e9d5fd0077a8c5bbcbd05a8c6 (commit) via 482b3811e4e6043c71632b560f2e773289eeb320 (commit) via 2ee1cb85e855ce0596e85ef1fc53c5c25cc1465f (commit) via a48bcabd33c3d7dcab394e267d4f1b5d21e0d85d (commit) via 6694d99376c8fa7ff327a6b07787cef1bea9b93b (commit) via 983c00f8f97260e7650fcc440047b33898f0363c (commit) via 7f5ec9f109dc66bc22ac377a7fb57d9221aed56b (commit) via 06f56d3bf5d8210d190e1bfcf05673ceb78c5594 (commit) via c8f8f16541f3ac6af3397f3a78ee68fc963af151 (commit) via 9f299a1225798f6485ab77c9140bf9c1d589e2fe (commit) via 088fcbf733a7d1968fc3586a7077f22cb41e1917 (commit) via ad3ff60f4a026d94fba7530325278ecd93a7357d (commit) via ff6ae3ecfc2ab421dccb9e50d78162e0b1c389ba (commit) via 2380896a056a29f22dd440369f4ab30137306ab9 (commit) via 2293d43d00ddcff86c70f0b06014223f3b01e36c (commit) via 488723f5cd9bec3f7b35b26c89ce2d92ad7d4db4 (commit) via 84c1d4f92056b847c804ced2b4a29f2c1eaba62b (commit) via 2bf7de167f0b72b07c6246679c964d83cdc47d45 (commit) via 0aa34de5493732d219dd3f58634222677bd19e22 (commit) via 20b95ef8c83fbcb7705e72c85c9de18ff420562f (commit) via 841164cb36650574a1a7363c78e4cdf28d5d37fd (commit) via 2c219bafc045dfdf49529b8ad141fed3dbb4d8e9 (commit) via 84e0776e77e625ab43c1a5b2031a06a035ae0210 (commit) via 871ab98dad2ed9d504a081a0ffa62b438793cbe4 (commit) via c4361a265b32acaa4a84c1ab14fecee1bfe49d33 (commit) via d6af5566e8c07b6b47ac78b1652c29dbe0e31aa2 (commit) via fc04b8f4b8ebb53b19c0430ac992baa46c75d2e9 (commit) via d75971b5af8b2e48a14bc1363826a555c77eed2d (commit) via 242d664f748baad810ae47aef91fc11475647f98 (commit) via 3d9cf05d2a1dc0ad191c15145ad7648cd77e18d6 (commit) via 1583440509a148d216d6691cdaeede1aa24af95c (commit) via 11165525ba663b4cd7a188c6b698822b8480aafb (commit) via 5a266095ee778fb700c067c55ff0b59777a72c50 (commit) via 57f701a7f045fc13807933860bad22fa405c6621 (commit) via 1fdccff5894914d4408e64c0b55e52c376e64ad4 (commit) via ce75c86ec30e736a738a4143d4abad73117e06c6 (commit) via 526cc7dc52673f1eeb1055ce381e0551f763daea (commit) via 8d2e3e53b903b1ee38292b6bcdf3e4eeb5399a05 (commit) via a143d4ac60da28e12f8b81db39a11226bac8a516 (commit) via 993aace78a12fba1a70f193a1e6ac0cbc6925bd6 (commit) via 43ade9957770a95ef6a589e34ab0bb93def0489b (commit) via 5fd2f43f646d6fa3755d83d6b6f2592a54425071 (commit) via f7acd7421521b3a961480a37077c3814dc684d30 (commit) via 763f7b19fcf8a287a0ce20a955ec9c2f7b1a051f (commit) via ceb35b63a796235bb76284b3fb4046208365e23f (commit) via bf2d061ad37088be9ea6f135a980d14c4e76064b (commit) via 61c02decce0c1b5aa78acd58d987a5d260079ca4 (commit) via 9ca4cae51e8fb67e628fe7b41eea3f459f148237 (commit) via d6b394edcb58752cfa3d2a34a81f558676781304 (commit) via 7c8236efa710372b6e54ba12934b075f718e0e15 (commit) via c7645fca12870cef732f26730588cda3be072852 (commit) via ce8894aaf07871dbc58039e0ff0f22efaee7c014 (commit) via e5fb30fb5bdff2913cc9382649984da89e882b25 (commit) via e6b35abf5bdc335d58882a56d525c221d4397349 (commit) via aad0e62060783539ef8ec4d09ad12ed9dacb5e7c (commit) via 83d2b6f378ddb462a105c2754f0b061f31709655 (commit) via 762108f3ec60ca717cdba369dffc84459a7e3282 (commit) via f3fa7c6bc364a523ba7a437402603fd84c6c9e4b (commit) via 5dba212f3adf8ffac297c283fff748691678887e (commit) via 3f7f4e1d2ea9f9ed658d44343676fe61b2199489 (commit) via 2f2baf09fda85164f4666135e5664914ea5dc4dd (commit) via b6dcf6815b712f755c450c3837fd29c42910cc05 (commit) via 1a0da7d32051783fcec12e85ee56c3adc447b1b1 (commit) via 859bd8d0c64a6e65ee17351489f0bf56e5b67375 (commit) via 9b05b14fef4b318ad8a8a37277ec8a270d124eba (commit) via 887b4c88011517b2ce2eef3d936493c11819df94 (commit) via 3d9e3d7b794bbe92d694e2558eb07b018a4af0ba (commit) via 70764ead1a3462409401288b99eda3ff50812ed8 (commit) via b46b88e07519b28e59c1750b5f63c35365fa0c0b (commit) via 1c1c2a1201682d17491026cb392c31ae5e63e1a5 (commit) via 79a309d786abefef1a4f354c2973a14cba882850 (commit) via e2eecae20517daa2bb292f85e161d5cebbc1f216 (commit) via b5212c68def0395642fc51dcfd499557eb9481d9 (commit) via 95b0d761a75fd2da041eacc9ee22b89043ae301f (commit) via 6f02034e668a307587c2eb1aa0e342fd17ca103e (commit) via 435a2f3ccb51acf119cfa1671f1c5b344a7d47a0 (commit) via 062ed22ec43809068526706d2600297095412911 (commit) via a02e53eb947b61dd25ecd139a213d4062fbc5b62 (commit) via bec3487fa94093e696be170c4d85567c3c934545 (commit) via e0f740f1b1708ac4ec43a57b8f1cbc549afe5df3 (commit) via 2afadb0d5ad21fbbcff961562ec441eb4ac001ab (commit) via 3d8c299f3ea024a309b05e0f21c7f002f43a5742 (commit) via c66084f5d7df57c991d0f498de04a5f00ae0fcc1 (commit) via 83c29e3903f947f9d4b5ed79a535f850b3b946e2 (commit) via 1988255448d7e0f92f4d2f12cc8fc17b1429c328 (commit) via c1f687b1ad2fe3ed7a8a2d300f1e12df59161cbc (commit) via a6e1f05c154d123b01bfe75c13d3e016c9074f72 (commit) via 654002feb88a9a219e2d6b6011c7dccc791627b1 (commit) via 922c89014f372ca38303b4258345c23027046616 (commit) via eaa5b9cbb1b145b76eb0448df1ce3a3c63ee13c6 (commit) via f539da126b55933fae6f40feea35e820cb632877 (commit) via 1c5d70f9c2b9b7e2aeaf1515ef72a6e9282ecde0 (commit) via 064c2488119269e88422ea444f87bdd44c4f6589 (commit) via 223d0efe55ff66f6ceb25ecdfbd1d915c76af548 (commit) via a367416cec8297c5a567825217b933f4539a44e4 (commit) via bbef3c2da83b7a69d1f99b21dc92d5506d98fb35 (commit) via 3e428fdcb4640411f8cbc4adc42c30b9c8b8032e (commit) via 110fd2fba1cbd6c3d89f5460d3f58a94d52d4546 (commit) via e73916992c6893572f24ee4fa631b33445d6cdf6 (commit) via 3fe240a79a53d8069ab51c4a44c4e1f5062983f1 (commit) via 9f6638c8a714c69a6039210267c4175813263d4f (commit) via 096f0988496d49c6c1f56f32863965dc65a077ab (commit) via c5718217ad242ca0fc6e6b15f4ee670e4a332c93 (commit) via bf5eb4a3f394051d9245a7f0c3a18b4a1d2c948a (commit) via 49017cddab23702d8228a195f64934e61ab7667e (commit) via 0bae4a416f9f1b9090499d26f8508660f4f3fc95 (commit) via 1abc20d81df3ee9845904b356960870526fe3276 (commit) via 50dc9b44404f4f31aa24cf17247f10539c3807b2 (commit) via 8b0168863ed121c7d9f05e3282e2f59490ff6c42 (commit) via ee44be22cb26627698d5548171a4d102988a3452 (commit) via 4f767afe1d67bf10f749b0bc5ee5f2cb77ce9b40 (commit) via c72d276a5a07fe850a534f092ace98a3a56afc4f (commit) via c99b6cefbe0da8758f00638a9e18234f562a266c (commit) via 12cb3bdce4b40c39b8697bbf89ea8aace6aeae8b (commit) via 72efa15dc26b5f63a477ec537edfdffb54ecb691 (commit) via f2a641d68bcb4d001ed4f27e41298066e75ade5b (commit) via 10cf42f5ae660c460d5d5f60936250866b33dc94 (commit) via e46ef270ed7c96586ed755322174791374241574 (commit) via 53d3a1c95a4b03b327149e628f6937d68af938e6 (commit) via 4ab2750c54adb09d147839687858aabe3cd988a7 (commit) via c8187f414bcc4668940c2e0fe40d361389efdbe5 (commit) via 8c6e6dd3cef0befcd9a7f4c410a49a5afddd8afb (commit) via e0261a1e20f14cc2ca593bb978479b52954397d8 (commit) via df42dbb3558a6ba604ab584b21dfe7f8722eb025 (commit) via a8429a402da4aeb717f4af234c8d14d1c4e10ed7 (commit) via 370bb92c10cd8fec7770267c93515623e4168012 (commit) via 27916f2cd10904deda1a44bf221fbdef7ba1af66 (commit) via 47f4b3b662da7f49fd0353b978eaf781608e9282 (commit) via 29a2d9fe69a8561ff72f800b5f96bc896cd9d449 (commit) via 8d27b407787549a90d47d273a753bb0000e5e73e (commit) via 0faccb839a75ab94f1ab39681a1ebe567647be6b (commit) via 265fb0cdc72fc46347ae0b8964078ca6d0a978e1 (commit) via 8083285d1bd5ecc31afa5fa689a9a4ca13ca8bb9 (commit) via 13c22d280e3b4d4f73e607617d18a3d55b509099 (commit) via 750391afc19577be693dbe6dfe760903d2e70fc8 (commit) via db266aaade6ac6e7a37be11338b0f8336976ead2 (commit) via 45e9f48f9ca51f2bd32a8dd09ce58cf2ec4197e5 (commit) via c997595ea36b60803068fafdbe0f7041b3cc9da0 (commit) via 3cf71728a17899673f7a07dea9d0242e7d7bff1f (commit) via fc7a191c53da12c4293e82f2dbfc07a08440369c (commit) via c91b14ec861fc351070c9968acadd335a4772975 (commit) via 2b9a155dcdb733df5cc83851c4429915987974f3 (commit) via fab711a87aee06306a681af6d843a14c62031553 (commit) via 24c97529ca98649576e2f98e56dc6830d8a5b3d8 (commit) via 28749903b67d71b35f6ff74dab7c6db1a648a1c8 (commit) via 6c02f62f75735f6e60549ef53b06bd87e843bc35 (commit) via 360e4e1db0cc89ea4f092eeb1ba1e6df8ee782b7 (commit) via af71c7b47947860d06c659647c6ff33ab3676284 (commit) via dce6581b7b58c346796c8d3045f4ce70d9672755 (commit) via 7b6dc0fe45c7064ad741461bfaf19028e8539c78 (commit) via 33f87bb1f503c09a6b8018edf97b615f0e7f713d (commit) via da1b0449d96d4044bc4633a40ac87b6d4a19912d (commit) via fe113f0fd40696e50ac9aac48297466e3b649ad5 (commit) via 776ff8eb0b8d790c63f8ad6bb6689620e6e04cb4 (commit) via 64f73150b8e5e5cad216444c0468e8e59434d973 (commit) via c38e30f68c7beffdc65af0f3799ae82ce60aaf67 (commit) via 5d3776a7ebb718ae6ed4724e0a8961cda68b6316 (commit) via 7ce0991a7a29e244aee3f61e9e8b1879e59d156c (commit) via 2c4f9023360103ca7489ef821038c3b64a5415fc (commit) via f716460ed82134bd1ca09f49bfa507cb2645d96c (commit) via 156bd2c983b439478dff5fe84629b5a93e780a92 (commit) via 01e666c70e9c83ebd8c200d121b706868f69e617 (commit) via bf28b7874b999224782fac72c5a74020bd6c47d3 (commit) via 9d653f9c1cc129be4fdce7f0e93c282760c7603e (commit) via b520b1ca4ec3d51a031d44a25080931c5bb73b83 (commit) via 26a0b52dfe94bad42e1f249aa0341dd1fbbc38cc (commit) via 1bf66fed674bc1b7c463bd230f7c66df8aa86e79 (commit) via 6b575dec8d393c4a38c587ee97afa068eeb4b432 (commit) via 256bf8876a2e460afc37dbe17eb34482944be20b (commit) via 5d315f32236dfebf3561789d17aaaab2d86c504d (commit) via 53d90de3d9b536bcee45acc40183569895a9776e (commit) via c914d2bda278b588c1dca3e0fa5ec97a64c56c3c (commit) via 9d5bfa53e63c894b1c774258882877f57d61638f (commit) via 15c02cf14edd823b96660e65772a9db568a25bdc (commit) via d0c3bf65d560659303e6d3e96da4e6c2c749d3b8 (commit) via bca73252130b7f60fc12b7bcbbc95a3153047bd3 (commit) via 062473842f3c926944cbc2a32c7703bc1204890d (commit) via b6702d40dd9ab512a8cd56dd202ebe8cdbdb03d9 (commit) via fab35c95cbf47e583cbf86b1db1ac3e77ce7035e (commit) via 8bb908b1084b5db1a6f8197a4d26b67984587ee4 (commit) via 3758af12fab8bc3c6279400621be94c4aa540a70 (commit) via 3709e950f4ed7545a38c2506c19ee90ee58fa920 (commit) via 74d565e0e91f31e5fb25c74f998a2e4553c0842e (commit) via 09466690f05a2d81383409962cda2213fd366d8c (commit) via 0a73044579a687d1f610a3b6d65e801d2f217435 (commit) via 3339a7508e2d90cbc832490e64f593c1ab935097 (commit) via 6da4cd8fb9a2583c7ba08c403ec3a5aeb264730f (commit) via 94cc4e74aec3bc76e94a426d94cd1015c8a9749e (commit) via f7738fd122ac38fb3785e6366193fe5095b23b88 (commit) via b2054e1661e5c607cf25e1ac127982f58e29dd44 (commit) via 1e757c318b38566aea1c9312a6fb5a3accd3966b (commit) via 5fb730174dc5e0c07dfc7aec27e3d6e60c79e3d3 (commit) via 992c43d2ed0bdede5d9d0389c51b8e28bb22cd96 (commit) via 45fa326b6ccceae1858ef3f30c11341c8b397d73 (commit) via 9cbab63ee143662a94fa050b95d02e9f14342907 (commit) via 86f7fc5d55da5cf569c516f2d1fb8b69603c1be2 (commit) via 2aa3f500c49e6c81f4d4b821d6ae71ef2589cb07 (commit) via 59b91107d16c2f2ba68791ae67c53bdcc0d32e05 (commit) via 7254f6452596f438f0607ece559be7ad556b190a (commit) via 975b753997849507684da7d529d1bbe0ffd3ade9 (commit) via f75ec6044c593d0ff042e13b940d2c674910b683 (commit) via f3158e45b8fde882603e1d9b2262a5c64e25c1ee (commit) via 493b17f8c7fb171fd7ca36cc0b29257939609298 (commit) via 616f03114eb41218dc3278e72b52d8de09e40365 (commit) via 9eea0486bfe5dfd497e6a8fca9e3c2551169c24e (commit) via 2eca0559881c36061f84ea4fcd955ac32d9d427a (commit) via 21f428f4c0adf7045e852be30739cd1243aa96fe (commit) via a9588e90bbddbfe71b1d33d63d38eedaf397023f (commit) via 4407eee01365d89d370d8e8b89f3ec0a65420046 (commit) via a09c545d3a518d771b66b59f92821af3d55d7d4b (commit) via d945b36a93ab9f935c4e369d5c75be8b47d48f7a (commit) via 48f8b6acf3a8083b5a52bbe1ec3adc10c515d710 (commit) via 821e17785ecd4a329842dc6c5b093eb30cc4f160 (commit) via f2791da132a42cb71384065b340ae212679fc336 (commit) via 091fbd69644e26043d1a7fe5c7a0b04d22066ca8 (commit) via 7037ead2bac3f90aed51861f38fce69d1d6df2e1 (commit) from 0aef6f2412177a236deb292654402518777f3cb0 (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: Auxiliary/cmake-mode.el | 2 +- CMakeCPackOptions.cmake.in | 40 +- CMakeLists.txt | 31 +- CTestCustom.cmake.in | 5 +- Copyright.txt | 2 +- Help/command/add_custom_command.rst | 7 +- Help/command/cmake_parse_arguments.rst | 85 + Help/command/get_target_property.rst | 2 +- Help/command/if.rst | 9 +- Help/command/install.rst | 7 +- Help/manual/OPTIONS_BUILD.txt | 41 +- Help/manual/cmake-buildsystem.7.rst | 9 +- Help/manual/cmake-commands.7.rst | 1 + Help/manual/cmake-developer.7.rst | 2 +- Help/manual/cmake-modules.7.rst | 1 + Help/manual/cmake-properties.7.rst | 1 + Help/manual/cmake-toolchains.7.rst | 30 + Help/manual/cmake-variables.7.rst | 2 + Help/manual/cmake.1.rst | 32 +- Help/module/FindXalanC.rst | 1 + Help/policy/CMP0040.rst | 19 +- Help/prop_dir/CLEAN_NO_CUSTOM.rst | 7 +- Help/prop_sf/MACOSX_PACKAGE_LOCATION.rst | 34 +- Help/prop_tgt/BUNDLE.rst | 6 +- Help/prop_tgt/BUNDLE_EXTENSION.rst | 4 +- Help/prop_tgt/ENABLE_EXPORTS.rst | 4 +- Help/prop_tgt/FRAMEWORK.rst | 28 +- Help/prop_tgt/FRAMEWORK_VERSION.rst | 3 + Help/prop_tgt/IOS_INSTALL_COMBINED.rst | 11 + Help/prop_tgt/MACOSX_BUNDLE.rst | 16 +- Help/prop_tgt/MACOSX_BUNDLE_INFO_PLIST.rst | 4 +- Help/prop_tgt/MACOSX_FRAMEWORK_INFO_PLIST.rst | 4 +- Help/prop_tgt/MACOSX_RPATH.rst | 21 +- Help/prop_tgt/OSX_ARCHITECTURES_CONFIG.rst | 2 +- Help/prop_tgt/PRIVATE_HEADER.rst | 10 +- Help/prop_tgt/PUBLIC_HEADER.rst | 12 +- Help/prop_tgt/RESOURCE.rst | 66 +- Help/release/3.5.rst | 182 ++ Help/release/index.rst | 1 + Help/variable/APPLE.rst | 4 +- Help/variable/CMAKE_BINARY_DIR.rst | 5 + Help/variable/CMAKE_CURRENT_BINARY_DIR.rst | 5 + Help/variable/CMAKE_CURRENT_SOURCE_DIR.rst | 5 + Help/variable/CMAKE_ENABLE_EXPORTS.rst | 8 +- Help/variable/CMAKE_ERROR_DEPRECATED.rst | 7 +- Help/variable/CMAKE_EXPORT_COMPILE_COMMANDS.rst | 30 + Help/variable/CMAKE_HOST_SYSTEM_NAME.rst | 2 +- Help/variable/CMAKE_INSTALL_NAME_DIR.rst | 2 +- Help/variable/CMAKE_IOS_INSTALL_COMBINED.rst | 8 + Help/variable/CMAKE_LANG_COMPILER_ID.rst | 1 + Help/variable/CMAKE_MACOSX_RPATH.rst | 2 +- Help/variable/CMAKE_OSX_ARCHITECTURES.rst | 2 +- Help/variable/CMAKE_SOURCE_DIR.rst | 5 + Help/variable/CMAKE_WARN_DEPRECATED.rst | 9 +- .../CMAKE_XCODE_ATTRIBUTE_an-attribute.rst | 6 + Modules/BundleUtilities.cmake | 4 +- Modules/CMakeCCompiler.cmake.in | 1 + Modules/CMakeCCompilerId.c.in | 7 + Modules/CMakeCInformation.cmake | 8 + Modules/CMakeCXXCompiler.cmake.in | 1 + Modules/CMakeCXXCompilerId.cpp.in | 7 + Modules/CMakeCXXInformation.cmake | 8 + Modules/CMakeCompilerIdDetection.cmake | 1 + Modules/CMakeDetermineASMCompiler.cmake | 4 + Modules/CMakeDetermineCompilerId.cmake | 6 + Modules/CMakeDetermineFortranCompiler.cmake | 2 + Modules/CMakeForceCompiler.cmake | 18 +- Modules/CMakeFortranCompiler.cmake.in | 1 + Modules/CMakeFortranCompilerId.F.in | 3 + Modules/CMakeFortranInformation.cmake | 8 + Modules/CMakeIOSInstallCombined.cmake | 297 +++ Modules/CMakeLanguageInformation.cmake | 37 + Modules/CMakeParseArguments.cmake | 148 +- Modules/CPack.cmake | 2 +- Modules/CPackDMG.cmake | 51 +- Modules/CPackDeb.cmake | 105 +- Modules/CPackNSIS.cmake | 8 + Modules/CPackRPM.cmake | 39 +- Modules/CPackWIX.cmake | 3 +- Modules/CheckCSourceCompiles.cmake | 2 +- Modules/CheckCSourceRuns.cmake | 2 +- Modules/CheckCXXSourceCompiles.cmake | 2 +- Modules/CheckCXXSourceRuns.cmake | 2 +- Modules/CheckForPthreads.c | 4 +- Modules/CheckFortranSourceCompiles.cmake | 2 +- Modules/Compiler/ARMCC-ASM.cmake | 7 + Modules/Compiler/ARMCC-C.cmake | 2 + Modules/Compiler/ARMCC-CXX.cmake | 2 + Modules/Compiler/ARMCC-DetermineCompiler.cmake | 16 + Modules/Compiler/ARMCC.cmake | 36 + Modules/Compiler/Clang-CXX.cmake | 4 +- Modules/Compiler/CrayPrgEnv-C.cmake | 11 + Modules/Compiler/CrayPrgEnv-CXX.cmake | 11 + Modules/Compiler/CrayPrgEnv-Cray-C.cmake | 7 + Modules/Compiler/CrayPrgEnv-Cray-CXX.cmake | 7 + Modules/Compiler/CrayPrgEnv-Cray-Fortran.cmake | 7 + Modules/Compiler/CrayPrgEnv-Fortran.cmake | 11 + Modules/Compiler/CrayPrgEnv-GNU-C.cmake | 7 + Modules/Compiler/CrayPrgEnv-GNU-CXX.cmake | 7 + Modules/Compiler/CrayPrgEnv-GNU-Fortran.cmake | 7 + Modules/Compiler/CrayPrgEnv-Intel-C.cmake | 7 + Modules/Compiler/CrayPrgEnv-Intel-CXX.cmake | 7 + Modules/Compiler/CrayPrgEnv-Intel-Fortran.cmake | 7 + Modules/Compiler/CrayPrgEnv-PGI-C.cmake | 7 + Modules/Compiler/CrayPrgEnv-PGI-CXX.cmake | 7 + Modules/Compiler/CrayPrgEnv-PGI-Fortran.cmake | 7 + Modules/Compiler/CrayPrgEnv.cmake | 91 + .../Compiler/Embarcadero-DetermineCompiler.cmake | 2 +- Modules/ExternalProject.cmake | 32 +- Modules/FindBLAS.cmake | 12 +- Modules/FindBoost.cmake | 402 +++- Modules/FindCUDA.cmake | 15 +- Modules/FindDCMTK.cmake | 275 ++- Modules/FindFLEX.cmake | 87 +- Modules/FindGTK2.cmake | 69 + Modules/FindGTest.cmake | 160 +- Modules/FindGit.cmake | 32 +- Modules/FindJNI.cmake | 6 +- Modules/FindOpenAL.cmake | 9 +- Modules/FindOpenGL.cmake | 12 +- Modules/FindOpenMP.cmake | 3 + Modules/FindOpenSSL.cmake | 27 +- Modules/FindPNG.cmake | 50 +- Modules/FindPkgConfig.cmake | 20 +- Modules/FindProtobuf.cmake | 2 +- Modules/FindTIFF.cmake | 67 +- Modules/FindXalanC.cmake | 162 ++ Modules/FindXercesC.cmake | 67 +- Modules/FindwxWidgets.cmake | 12 - Modules/GenerateExportHeader.cmake | 4 + Modules/GetPrerequisites.cmake | 4 +- Modules/NSIS.template.in | 2 + Modules/Platform/CrayLinuxEnvironment.cmake | 143 ++ Modules/Platform/SunOS.cmake | 6 - Modules/Platform/Windows-Embarcadero.cmake | 6 +- Modules/Platform/Windows-MSVC.cmake | 2 + Modules/Platform/WindowsPaths.cmake | 52 +- Modules/UseJava.cmake | 8 +- Packaging/CMakeDMGBackground.tif | Bin 0 -> 95690 bytes Packaging/CMakeDMGSetup.scpt | 42 + README.rst | 2 +- Source/CMakeInstallDestinations.cmake | 5 + Source/CMakeLists.txt | 19 +- Source/CMakeVersion.cmake | 6 +- Source/CPack/IFW/cmCPackIFWGenerator.cxx | 1 - Source/CPack/WiX/cmCPackWIXGenerator.cxx | 37 +- Source/CPack/WiX/cmCPackWIXGenerator.h | 3 + Source/CPack/WiX/cmWIXPatch.cxx | 44 +- Source/CPack/WiX/cmWIXPatch.h | 5 +- Source/CPack/WiX/cmWIXPatchParser.cxx | 52 +- Source/CPack/WiX/cmWIXPatchParser.h | 29 +- Source/CPack/WiX/cmWIXSourceWriter.cxx | 19 + Source/CPack/WiX/cmWIXSourceWriter.h | 2 + Source/CPack/cmCPackArchiveGenerator.cxx | 1 - Source/CPack/cmCPackCygwinBinaryGenerator.cxx | 1 - Source/CPack/cmCPackCygwinSourceGenerator.cxx | 1 - Source/CPack/cmCPackDebGenerator.cxx | 7 + Source/CPack/cmCPackDragNDropGenerator.cxx | 542 ++++- Source/CPack/cmCPackDragNDropGenerator.h | 15 + Source/CPack/cmCPackGenerator.cxx | 4 +- Source/CPack/cmCPackNSISGenerator.cxx | 23 +- Source/CPack/cmCPackOSXX11Generator.cxx | 1 - Source/CPack/cmCPackPackageMakerGenerator.cxx | 1 - Source/CPack/cmCPackSTGZGenerator.cxx | 1 - Source/CPack/cpack.cxx | 4 +- Source/CTest/cmCTestBuildHandler.cxx | 1 - Source/CTest/cmCTestCoverageHandler.cxx | 48 +- Source/CTest/cmCTestLaunch.cxx | 4 +- Source/CTest/cmCTestScriptHandler.cxx | 24 +- Source/CTest/cmCTestScriptHandler.h | 2 - Source/CTest/cmCTestStartCommand.cxx | 1 - Source/CTest/cmCTestTestHandler.cxx | 10 +- Source/CTest/cmCTestUpdateHandler.cxx | 1 - Source/QtDialog/CMakeLists.txt | 14 +- Source/QtDialog/CMakeSetupDialog.cxx | 26 +- Source/QtDialog/CMakeSetupDialog.h | 4 +- Source/QtDialog/FirstConfigure.cxx | 70 +- Source/QtDialog/FirstConfigure.h | 15 +- Source/QtDialog/QCMake.cxx | 74 +- Source/QtDialog/QCMake.h | 28 +- Source/QtDialog/RegexExplorer.cxx | 166 ++ Source/QtDialog/RegexExplorer.h | 48 + Source/QtDialog/RegexExplorer.ui | 155 ++ Source/QtDialog/WarningMessagesDialog.cxx | 99 + Source/QtDialog/WarningMessagesDialog.h | 75 + Source/QtDialog/WarningMessagesDialog.ui | 173 ++ Source/bindexplib.cxx | 61 +- .../test/test_ABI_CXX.cxx => Source/bindexplib.h | 31 +- Source/cmAddDependenciesCommand.cxx | 1 - Source/cmAddExecutableCommand.cxx | 8 +- Source/cmAddLibraryCommand.cxx | 66 +- Source/cmAlgorithms.h | 10 +- Source/cmArchiveWrite.cxx | 4 + Source/cmAuxSourceDirectoryCommand.cxx | 8 +- Source/cmBootstrapCommands1.cxx | 2 + Source/cmBuildCommand.cxx | 1 - Source/cmCPackPropertiesGenerator.cxx | 4 +- Source/cmCPluginAPI.cxx | 18 +- Source/cmCTest.cxx | 3 +- Source/cmCacheManager.cxx | 107 +- Source/cmCacheManager.h | 13 +- Source/cmCommonTargetGenerator.cxx | 41 +- Source/cmCommonTargetGenerator.h | 4 +- Source/cmComputeLinkDepends.cxx | 50 +- Source/cmComputeLinkDepends.h | 17 +- Source/cmComputeLinkInformation.cxx | 124 +- Source/cmComputeLinkInformation.h | 17 +- Source/cmComputeTargetDepends.cxx | 65 +- Source/cmConditionEvaluator.cxx | 10 + Source/cmCoreTryCompile.cxx | 19 +- Source/cmCustomCommandGenerator.cxx | 15 +- Source/cmDependsFortran.cxx | 2 +- Source/cmELF.cxx | 12 +- Source/cmEnableTestingCommand.cxx | 1 - Source/cmExportBuildFileGenerator.cxx | 98 +- Source/cmExportBuildFileGenerator.h | 19 +- Source/cmExportCommand.cxx | 7 +- Source/cmExportFileGenerator.cxx | 139 +- Source/cmExportFileGenerator.h | 33 +- Source/cmExportInstallFileGenerator.cxx | 67 +- Source/cmExportInstallFileGenerator.h | 11 +- Source/cmExportLibraryDependenciesCommand.cxx | 10 +- Source/cmExportSet.cxx | 10 + Source/cmExportSet.h | 3 + Source/cmExportTryCompileFileGenerator.cxx | 63 +- Source/cmExportTryCompileFileGenerator.h | 22 +- Source/cmExtraCodeBlocksGenerator.cxx | 144 +- Source/cmExtraCodeBlocksGenerator.h | 10 +- Source/cmExtraCodeLiteGenerator.cxx | 64 +- Source/cmExtraEclipseCDT4Generator.cxx | 144 +- Source/cmExtraEclipseCDT4Generator.h | 2 +- Source/cmExtraKateGenerator.cxx | 96 +- Source/cmExtraKateGenerator.h | 11 +- Source/cmExtraSublimeTextGenerator.cxx | 77 +- Source/cmExtraSublimeTextGenerator.h | 6 +- Source/cmFLTKWrapUICommand.cxx | 39 - Source/cmFileCommand.cxx | 5 +- Source/cmFileTimeComparison.cxx | 39 +- Source/cmFindPackageCommand.h | 2 +- Source/cmFortranLexer.cxx | 592 ++--- Source/cmFortranLexer.h | 16 +- Source/cmFortranLexer.in.l | 3 +- Source/cmFortranParser.cxx | 473 ++-- Source/cmFortranParser.h | 2 + Source/cmFortranParser.y | 10 +- Source/cmFortranParserImpl.cxx | 26 + Source/cmFortranParserTokens.h | 108 +- Source/cmFunctionBlocker.h | 2 +- Source/cmGeneratorExpression.cxx | 24 +- Source/cmGeneratorExpression.h | 32 +- Source/cmGeneratorExpressionContext.cxx | 9 +- Source/cmGeneratorExpressionContext.h | 27 +- Source/cmGeneratorExpressionDAGChecker.cxx | 8 +- Source/cmGeneratorExpressionEvaluationFile.cxx | 10 +- Source/cmGeneratorExpressionEvaluator.h | 6 +- Source/cmGeneratorExpressionNode.cxx | 146 +- Source/cmGeneratorExpressionNode.h | 7 +- Source/cmGeneratorExpressionParser.h | 2 - Source/cmGeneratorTarget.cxx | 2261 +++++++++++++++++--- Source/cmGeneratorTarget.h | 264 ++- Source/cmGetCMakePropertyCommand.cxx | 1 - Source/cmGetPropertyCommand.cxx | 1 - Source/cmGhsMultiTargetGenerator.cxx | 99 +- Source/cmGhsMultiTargetGenerator.h | 15 +- Source/cmGlobalGenerator.cxx | 406 ++-- Source/cmGlobalGenerator.h | 66 +- Source/cmGlobalGeneratorFactory.h | 6 + Source/cmGlobalGhsMultiGenerator.cxx | 21 +- Source/cmGlobalGhsMultiGenerator.h | 11 +- Source/cmGlobalKdevelopGenerator.cxx | 32 +- Source/cmGlobalNinjaGenerator.cxx | 96 +- Source/cmGlobalNinjaGenerator.h | 25 +- Source/cmGlobalUnixMakefileGenerator3.cxx | 201 +- Source/cmGlobalUnixMakefileGenerator3.h | 14 +- Source/cmGlobalVisualStudio10Generator.cxx | 26 +- Source/cmGlobalVisualStudio10Generator.h | 6 +- Source/cmGlobalVisualStudio11Generator.cxx | 8 +- Source/cmGlobalVisualStudio11Generator.h | 2 +- Source/cmGlobalVisualStudio12Generator.cxx | 2 + Source/cmGlobalVisualStudio14Generator.cxx | 2 + Source/cmGlobalVisualStudio6Generator.cxx | 29 +- Source/cmGlobalVisualStudio6Generator.h | 12 +- Source/cmGlobalVisualStudio71Generator.cxx | 14 +- Source/cmGlobalVisualStudio71Generator.h | 6 +- Source/cmGlobalVisualStudio7Generator.cxx | 70 +- Source/cmGlobalVisualStudio7Generator.h | 21 +- Source/cmGlobalVisualStudio8Generator.cxx | 60 +- Source/cmGlobalVisualStudio8Generator.h | 11 +- Source/cmGlobalVisualStudio9Generator.cxx | 2 + Source/cmGlobalVisualStudioGenerator.cxx | 123 +- Source/cmGlobalVisualStudioGenerator.h | 34 +- Source/cmGlobalXCodeGenerator.cxx | 808 +++---- Source/cmGlobalXCodeGenerator.h | 55 +- Source/cmGraphVizWriter.cxx | 73 +- Source/cmGraphVizWriter.h | 9 +- Source/cmIDEFlagTable.h | 1 + Source/cmIDEOptions.cxx | 10 +- Source/cmIfCommand.cxx | 1 + Source/cmIncludeExternalMSProjectCommand.cxx | 2 +- Source/cmInstallCommand.cxx | 35 +- Source/cmInstallDirectoryGenerator.cxx | 31 +- Source/cmInstallDirectoryGenerator.h | 3 +- Source/cmInstallExportGenerator.cxx | 3 +- Source/cmInstallFilesGenerator.cxx | 4 +- Source/cmInstallTargetGenerator.cxx | 158 +- Source/cmInstallTargetGenerator.h | 5 +- Source/cmLinkItem.h | 34 +- Source/cmLinkLibrariesCommand.cxx | 4 +- Source/cmListFileCache.cxx | 2 +- Source/cmListFileCache.h | 9 - Source/cmLocalGenerator.cxx | 312 ++- Source/cmLocalGenerator.h | 75 +- Source/cmLocalGhsMultiGenerator.cxx | 11 +- Source/cmLocalNinjaGenerator.cxx | 46 +- Source/cmLocalNinjaGenerator.h | 12 +- Source/cmLocalUnixMakefileGenerator3.cxx | 188 +- Source/cmLocalUnixMakefileGenerator3.h | 34 +- Source/cmLocalVisualStudio10Generator.cxx | 14 +- Source/cmLocalVisualStudio6Generator.cxx | 388 ++-- Source/cmLocalVisualStudio6Generator.h | 32 +- Source/cmLocalVisualStudio7Generator.cxx | 322 ++- Source/cmLocalVisualStudio7Generator.h | 38 +- Source/cmLocalVisualStudioGenerator.cxx | 12 +- Source/cmLocalVisualStudioGenerator.h | 6 +- Source/cmLocalXCodeGenerator.cxx | 16 +- Source/cmLocalXCodeGenerator.h | 3 +- Source/cmMacroCommand.cxx | 16 +- Source/cmMakeDepend.cxx | 361 ---- Source/cmMakeDepend.h | 150 -- Source/cmMakefile.cxx | 360 ++-- Source/cmMakefile.h | 69 +- Source/cmMakefileExecutableTargetGenerator.cxx | 45 +- Source/cmMakefileLibraryTargetGenerator.cxx | 123 +- Source/cmMakefileTargetGenerator.cxx | 123 +- Source/cmMakefileTargetGenerator.h | 3 - Source/cmMakefileUtilityTargetGenerator.cxx | 18 +- Source/cmMarkAsAdvancedCommand.cxx | 3 +- Source/cmMessageCommand.cxx | 22 +- Source/cmNinjaNormalTargetGenerator.cxx | 125 +- Source/cmNinjaTargetGenerator.cxx | 90 +- Source/cmNinjaTargetGenerator.h | 5 +- Source/cmNinjaUtilityTargetGenerator.cxx | 26 +- Source/cmOSXBundleGenerator.cxx | 25 +- Source/cmOrderDirectories.cxx | 4 +- Source/cmOutputRequiredFilesCommand.cxx | 598 +++++- Source/cmOutputRequiredFilesCommand.h | 3 +- Source/cmParseArgumentsCommand.cxx | 192 ++ Source/cmParseArgumentsCommand.h | 54 + Source/cmPolicies.h | 17 + Source/cmQtAutoGeneratorInitializer.cxx | 1700 ++++++++------- Source/cmQtAutoGeneratorInitializer.h | 41 +- Source/cmQtAutoGenerators.cxx | 8 +- Source/cmSetTargetPropertiesCommand.cxx | 1 - Source/cmSourceFile.cxx | 7 +- Source/cmSourceFileLocation.cxx | 13 +- Source/cmStandardIncludes.h | 8 +- Source/cmState.cxx | 271 ++- Source/cmState.h | 46 +- Source/cmSystemTools.cxx | 105 +- Source/cmSystemTools.h | 4 +- Source/cmTarget.cxx | 2034 +++--------------- Source/cmTarget.h | 239 +-- Source/cmTargetExport.h | 5 +- Source/cmTargetLinkLibrariesCommand.cxx | 43 +- Source/cmTargetLinkLibrariesCommand.h | 2 +- Source/cmTargetPropCommandBase.cxx | 14 +- Source/cmTestGenerator.cxx | 12 +- Source/cmUtilitySourceCommand.cxx | 10 +- Source/cmVS10LinkFlagTable.h | 3 +- Source/cmVS11LinkFlagTable.h | 3 +- Source/cmVS12LinkFlagTable.h | 3 +- Source/cmVS14LinkFlagTable.h | 5 +- Source/cmVersion.h | 2 +- Source/cmVisualStudio10TargetGenerator.cxx | 418 ++-- Source/cmVisualStudio10TargetGenerator.h | 4 +- Source/cmXCodeObject.cxx | 4 +- Source/cmXCodeObject.h | 12 +- Source/cm_sha2.c | 13 +- Source/cm_sha2.h | 10 +- Source/cmake.cxx | 637 +++++- Source/cmake.h | 102 +- Source/cmcmd.cxx | 144 +- Source/kwsys/CMakeLists.txt | 77 +- Source/kwsys/CPU.h.in | 141 -- Source/kwsys/Configure.h.in | 5 + Source/kwsys/Configure.hxx.in | 4 - Source/kwsys/EncodingCXX.cxx | 1 + Source/kwsys/FStream.cxx | 2 + Source/kwsys/FundamentalType.h.in | 146 -- Source/kwsys/MD5.c | 4 +- Source/kwsys/ProcessUNIX.c | 6 +- Source/kwsys/SharedForward.h.in | 6 + Source/kwsys/SystemTools.cxx | 133 +- Source/kwsys/SystemTools.hxx.in | 4 +- Source/kwsys/Terminal.c | 11 + Source/kwsys/kwsysPlatformTestsCXX.cxx | 126 +- Source/kwsys/testFStream.cxx | 79 +- Source/kwsys/testSystemTools.cxx | 188 ++ Tests/AliasTarget/CMakeLists.txt | 4 +- Tests/AliasTarget/subdir/CMakeLists.txt | 3 + Tests/AliasTarget/{ => subdir}/empty.cpp | 0 Tests/CMakeLists.txt | 48 +- Tests/CMakeOnly/CompilerIdC/CMakeLists.txt | 7 + Tests/CMakeOnly/CompilerIdCXX/CMakeLists.txt | 7 + Tests/CMakeOnly/CompilerIdFortran/CMakeLists.txt | 7 + .../MyLibCPackConfig-components-source.cmake.in | 33 + .../MyLibCPackConfig-compression.cmake.in | 11 + .../RunCPackVerifyResult-components-source.cmake | 75 + .../RunCPackVerifyResult-compression.cmake | 54 + .../CPackComponentsDEB/RunCPackVerifyResult.cmake | 6 +- Tests/CTestUpdateGIT.cmake.in | 30 +- Tests/CompileOptions/CMakeLists.txt | 2 +- ....pas).html => UTCovTest(UTCovTest.pas).html.in} | 0 Tests/ExportImport/Export/CMakeLists.txt | 18 +- Tests/ExportImport/Export/testLibDepends.c | 7 +- .../Export/testStaticLibRequiredPrivate.c | 1 + Tests/FindBoost/CMakeLists.txt | 10 + Tests/FindBoost/Test/CMakeLists.txt | 18 + Tests/FindBoost/Test/main.cxx | 26 + Tests/FindGTest/CMakeLists.txt | 10 + Tests/FindGTest/Test/CMakeLists.txt | 17 + Tests/FindGTest/Test/main.cxx | 6 + Tests/FindPNG/CMakeLists.txt | 10 + Tests/FindPNG/Test/CMakeLists.txt | 16 + Tests/FindPNG/Test/main.c | 20 + Tests/FindTIFF/CMakeLists.txt | 10 + Tests/FindTIFF/Test/CMakeLists.txt | 17 + Tests/FindTIFF/Test/main.c | 12 + Tests/FindXalanC/CMakeLists.txt | 10 + Tests/FindXalanC/Test/CMakeLists.txt | 17 + Tests/FindXalanC/Test/main.cxx | 10 + Tests/FindXercesC/CMakeLists.txt | 10 + Tests/FindXercesC/Test/CMakeLists.txt | 17 + Tests/FindXercesC/Test/main.cxx | 7 + Tests/JavaJavah/C.cpp | 10 + Tests/JavaJavah/C.java | 19 + Tests/JavaJavah/CMakeLists.txt | 9 +- Tests/JavaJavah/HelloWorld2.java | 5 + .../GenerateExportHeader/exportheader_test.cpp | 12 + Tests/RunCMake/BuildDepends/Custom-Always.cmake | 24 + Tests/RunCMake/BuildDepends/RunCMakeTest.cmake | 2 + .../CMP0040/CMP0040-NEW-missing-target-stderr.txt | 2 +- .../CMP0040/CMP0040-WARN-missing-target-stderr.txt | 2 +- Tests/RunCMake/CMakeLists.txt | 7 + .../DEB/PER_COMPONENT_FIELDS-ExpectedFiles.cmake | 9 + .../DEB/PER_COMPONENT_FIELDS-VerifyResult.cmake | 18 + .../CPack/DEB/PER_COMPONENT_FIELDS-specifics.cmake | 6 + Tests/RunCMake/CPack/PER_COMPONENT_FIELDS.cmake | 5 + Tests/RunCMake/CPack/RPM/Helpers.cmake | 9 + .../RPM/PER_COMPONENT_FIELDS-ExpectedFiles.cmake | 9 + .../RPM/PER_COMPONENT_FIELDS-VerifyResult.cmake | 18 + .../CPack/RPM/PER_COMPONENT_FIELDS-specifics.cmake | 5 + Tests/RunCMake/CPack/RunCMakeTest.cmake | 1 + Tests/RunCMake/CommandLine/E-no-arg-stderr.txt | 2 +- ...ource-directory-target-is-directory-result.txt} | 0 ...source-directory-target-is-directory-stderr.txt | 0 .../E_copy-one-source-file-result.txt} | 0 .../CommandLine/E_copy-one-source-file-stderr.txt | 1 + ...ee-source-files-target-is-directory-result.txt} | 0 ...ree-source-files-target-is-directory-stderr.txt | 0 ...y-three-source-files-target-is-file-result.txt} | 0 ...py-three-source-files-target-is-file-stderr.txt | 1 + ...ad-source-files-target-is-directory-result.txt} | 0 ...bad-source-files-target-is-directory-stderr.txt | 1 + ...ee-source-files-target-is-directory-result.txt} | 0 ...ree-source-files-target-is-directory-stderr.txt | 0 ...y-three-source-files-target-is-file-result.txt} | 0 ...ry-three-source-files-target-is-file-stderr.txt | 3 + ...ee-source-files-target-is-not-exist-result.txt} | 0 ...ree-source-files-target-is-not-exist-stderr.txt | 0 ...ource-directory-target-is-directory-result.txt} | 0 ...source-directory-target-is-directory-stderr.txt | 0 ...ee-source-files-target-is-directory-result.txt} | 0 ...ree-source-files-target-is-directory-stderr.txt | 0 ...t-three-source-files-target-is-file-result.txt} | 0 ...nt-three-source-files-target-is-file-stderr.txt | 1 + .../CommandLine/E_create_symlink-no-arg-stderr.txt | 2 +- ...ake_directory-directory-with-parent-result.txt} | 0 ...make_directory-directory-with-parent-stderr.txt | 0 ...irectory-three-directories-and-file-result.txt} | 0 ...directory-three-directories-and-file-stderr.txt | 1 + .../E_make_directory-three-directories-result.txt} | 0 .../E_make_directory-three-directories-stderr.txt | 0 .../CommandLine/E_rename-no-arg-stderr.txt | 2 +- .../E_time-no-arg-result.txt} | 0 ...-no-arg-stderr.txt => E_time-no-arg-stderr.txt} | 2 +- Tests/RunCMake/CommandLine/E_time-stdout.txt | 3 + .../CommandLine/E_touch_nocreate-no-arg-stderr.txt | 2 +- Tests/RunCMake/CommandLine/P_working-dir.cmake | 14 + Tests/RunCMake/CommandLine/RunCMakeTest.cmake | 123 ++ .../W_bad-arg1-result.txt} | 0 Tests/RunCMake/CommandLine/W_bad-arg1-stderr.txt | 2 + .../W_bad-arg2-result.txt} | 0 Tests/RunCMake/CommandLine/W_bad-arg2-stderr.txt | 2 + .../W_bad-arg3-result.txt} | 0 Tests/RunCMake/CommandLine/W_bad-arg3-stderr.txt | 2 + Tests/RunCMake/CommandLine/Wdeprecated-stderr.txt | 4 + Tests/RunCMake/CommandLine/Wdeprecated.cmake | 1 + Tests/RunCMake/CommandLine/Wdev-stderr.txt | 2 +- Tests/RunCMake/CommandLine/Wdev.cmake | 2 +- .../Werror_deprecated-result.txt} | 0 .../CommandLine/Werror_deprecated-stderr.txt | 4 + Tests/RunCMake/CommandLine/Werror_deprecated.cmake | 1 + .../Werror_dev-result.txt} | 0 Tests/RunCMake/CommandLine/Werror_dev-stderr.txt | 11 + Tests/RunCMake/CommandLine/Werror_dev.cmake | 7 + Tests/RunCMake/CommandLine/Wno-deprecated.cmake | 1 + Tests/RunCMake/CommandLine/Wno-dev.cmake | 2 +- .../CommandLine/Wno-error_deprecated-stderr.txt | 4 + .../CommandLine/Wno-error_deprecated.cmake | 2 + .../{Wdev-stderr.txt => Wno-error_dev-stderr.txt} | 6 +- Tests/RunCMake/CommandLine/Wno-error_dev.cmake | 7 + .../cache-bad-entry-result.txt} | 0 .../CommandLine/cache-bad-entry-stderr.txt | 1 + .../CommandLine/cache-bad-entry/CMakeCache.txt | 10 + .../cache-empty-entry-result.txt} | 0 .../CommandLine/cache-empty-entry-stderr.txt | 1 + .../CommandLine/cache-empty-entry/CMakeCache.txt | 7 + .../RunCMake/CommandLine/copy_input/d1/d1.txt | 0 .../RunCMake/CommandLine/copy_input/d2/d2.txt | 0 .../RunCMake/CommandLine/copy_input/d3/d3.txt | 0 .../RunCMake/CommandLine/copy_input/f1.txt | 0 .../RunCMake/CommandLine/copy_input/f2.txt | 0 .../RunCMake/CommandLine/copy_input/f3.txt | 0 .../FindPkgConfig_cache_variables.cmake | 16 + Tests/RunCMake/FindPkgConfig/RunCMakeTest.cmake | 1 + Tests/RunCMake/FindPkgConfig/dummy-pkg-config.sh | 5 +- Tests/RunCMake/Framework/CMakeLists.txt | 3 + Tests/RunCMake/Framework/FrameworkLayout.cmake | 11 + .../Framework/OSXFrameworkLayout-build-check.cmake | 35 + Tests/RunCMake/Framework/RunCMakeTest.cmake | 33 + Tests/RunCMake/Framework/foo.c | 1 + Tests/RunCMake/Framework/foo.h | 1 + .../Framework/iOSFrameworkLayout-build-check.cmake | 35 + Tests/RunCMake/Framework/ios.cmake | 25 + .../RunCMake/{XcodeProject => Framework}/osx.cmake | 0 .../hello.f => Tests/RunCMake/Framework/res.txt | 0 .../VisibilityPreset/CMP0063-WARN-exe-stderr.txt | 15 + ...P0063-WARN-yes.cmake => CMP0063-WARN-exe.cmake} | 5 +- .../VisibilityPreset/CMP0063-WARN-obj-stderr.txt | 15 + ...P0063-WARN-yes.cmake => CMP0063-WARN-obj.cmake} | 5 +- .../VisibilityPreset/CMP0063-WARN-sta-stderr.txt | 15 + ...P0063-WARN-yes.cmake => CMP0063-WARN-sta.cmake} | 5 +- .../VisibilityPreset/CMP0063-WARN-yes-stderr.txt | 50 - Tests/RunCMake/VisibilityPreset/RunCMakeTest.cmake | 4 +- Tests/RunCMake/XcodeProject/RunCMakeTest.cmake | 72 + .../XcodeProject/XcodeAttributeGenex-check.cmake | 48 + .../XcodeProject/XcodeAttributeGenex.cmake | 14 +- Tests/RunCMake/XcodeProject/XcodeBundles.cmake | 30 +- .../XcodeIOSInstallCombined-install-check.cmake | 30 + .../XcodeProject/XcodeIOSInstallCombined.cmake | 27 + ...codeIOSInstallCombinedPrune-install-check.cmake | 26 + ...XcodeIOSInstallCombinedPrune-install-stdout.txt | 2 + .../XcodeIOSInstallCombinedPrune.cmake | 36 + .../XcodeObjectNeedsEscape-check.cmake | 7 + .../XcodeProject/XcodeObjectNeedsEscape.cmake | 3 + .../XcodeOptimizationFlags-check.cmake | 7 + .../XcodeProject/XcodeOptimizationFlags.cmake | 20 + .../XcodePreserveNonOptimizationFlags-check.cmake | 8 + .../XcodePreserveNonOptimizationFlags.cmake | 12 + .../XcodeProject/XcodePreserveObjcFlag-check.cmake | 7 + .../XcodeProject/XcodePreserveObjcFlag.cmake | 6 + Tests/RunCMake/XcodeProject/main.cpp | 3 + .../RunCMake/add_custom_command/RunCMakeTest.cmake | 2 + .../TargetImported-result.txt} | 0 .../add_custom_command/TargetImported-stderr.txt | 4 + .../add_custom_command/TargetImported.cmake | 2 + .../TargetNotInDir-result.txt} | 0 .../add_custom_command/TargetNotInDir-stderr.txt | 4 + .../add_custom_command/TargetNotInDir.cmake | 2 + .../TargetNotInDir/CMakeLists.txt | 1 + .../RunCMake/cmake_parse_arguments/CMakeLists.txt | 3 + .../cmake_parse_arguments/CornerCases.cmake | 15 + .../Errors-result.txt} | 0 .../cmake_parse_arguments/Errors-stderr.txt | 44 + Tests/RunCMake/cmake_parse_arguments/Errors.cmake | 14 + .../cmake_parse_arguments/Initialization.cmake | 68 + Tests/RunCMake/cmake_parse_arguments/Mix.cmake | 24 + .../cmake_parse_arguments/RunCMakeTest.cmake | 7 + Tests/RunCMake/cmake_parse_arguments/Utils.cmake | 20 + .../cmake_parse_arguments/test_utils.cmake | 20 + Tests/RunCMake/ctest_test/RunCMakeTest.cmake | 1 + .../RunCMake/ctest_test/TestOutputSize-check.cmake | 10 +- Tests/RunCMake/if/MatchesSelf.cmake | 4 + Tests/RunCMake/if/RunCMakeTest.cmake | 2 + .../DIRECTORY-DIRECTORY-bad-result.txt} | 0 .../DIRECTORY-DIRECTORY-bad-stderr.txt} | 0 .../RunCMake/install/DIRECTORY-DIRECTORY-bad.cmake | 1 + Tests/RunCMake/install/RunCMakeTest.cmake | 1 + Tests/RunCMake/message/RunCMakeTest.cmake | 7 +- .../defaultmessage-result.txt} | 0 Tests/RunCMake/message/defaultmessage-stderr.txt | 11 + Tests/RunCMake/message/defaultmessage.cmake | 4 + Tests/RunCMake/message/errormessage-result.txt | 1 - Tests/RunCMake/message/errormessage-stderr.txt | 4 - Tests/RunCMake/message/errormessage.cmake | 4 - .../errormessage_deprecated-result.txt} | 0 .../message/errormessage_deprecated-stderr.txt | 4 + .../RunCMake/message/errormessage_deprecated.cmake | 3 + .../errormessage_dev-result.txt} | 0 Tests/RunCMake/message/errormessage_dev-stderr.txt | 5 + Tests/RunCMake/message/errormessage_dev.cmake | 3 + Tests/RunCMake/message/nomessage.cmake | 6 + Tests/RunCMake/message/warnmessage-stderr.txt | 11 +- Tests/RunCMake/message/warnmessage.cmake | 6 +- Tests/SimpleInstall/CMakeLists.txt | 4 +- Tests/SimpleInstallS2/CMakeLists.txt | 4 +- Tests/SubDir/CMakeLists.txt | 4 + Tests/SubDir/Executable/CMakeLists.txt | 12 + Tests/Wrapping/CMakeLists.txt | 10 +- .../hello.f => Tests/Wrapping/fltk2.fl | 0 .../main.c => Wrapping/wrapFLTK.c} | 0 Utilities/KWIML/.gitattributes | 1 + Utilities/KWIML/ABI.h.in | 506 ----- Utilities/KWIML/CMakeLists.txt | 145 +- Utilities/KWIML/Copyright.txt | 2 +- Utilities/KWIML/INT.h.in | 861 -------- Utilities/KWIML/README.md | 36 + Utilities/KWIML/README.txt | 29 - Utilities/KWIML/include/kwiml/abi.h | 562 +++++ Utilities/KWIML/include/kwiml/int.h | 1069 +++++++++ Utilities/KWIML/src/kwiml-config.cmake.in | 1 + Utilities/KWIML/src/version.h.in | 59 + Utilities/KWIML/test/CMakeLists.txt | 48 +- Utilities/KWIML/test/test.c | 32 +- Utilities/KWIML/test/test.cxx | 16 +- Utilities/KWIML/test/test.h | 31 +- Utilities/KWIML/test/test_ABI_C.c | 22 - Utilities/KWIML/test/test_ABI_endian.h.in | 47 - Utilities/KWIML/test/test_INT_C.c | 22 - Utilities/KWIML/test/test_INT_CXX.cxx | 22 - Utilities/KWIML/test/test_abi_C.c | 19 + Utilities/KWIML/test/test_abi_CXX.cxx | 19 + Utilities/KWIML/test/test_abi_endian.h | 41 + Utilities/KWIML/test/test_include_C.c | 20 +- Utilities/KWIML/test/test_include_CXX.cxx | 20 +- Utilities/KWIML/test/test_int_C.c | 19 + Utilities/KWIML/test/test_int_CXX.cxx | 19 + .../{test_INT_format.h.in => test_int_format.h} | 83 +- Utilities/Release/WiX/WIX.template.in | 46 + Utilities/Release/WiX/cmake_extra_dialog.wxs | 36 + Utilities/Release/WiX/install_dir.wxs | 61 + Utilities/Release/WiX/patch_desktop_shortcut.xml | 5 + Utilities/Release/WiX/patch_path_env.xml | 26 + .../{cpack_wix_ui_banner.jpg => WiX/ui_banner.jpg} | Bin 2607 -> 2607 bytes .../{cpack_wix_ui_dialog.jpg => WiX/ui_dialog.jpg} | Bin 13369 -> 13369 bytes Utilities/Release/create-cmake-release.cmake | 5 +- Utilities/Release/dash2win64_cygwin.cmake | 2 + ...win64_release.cmake => dash3win7_release.cmake} | 17 +- Utilities/Release/dashmacmini2_release.cmake | 25 - Utilities/Release/release_cmake.cmake | 37 +- Utilities/Release/release_cmake.sh.in | 1 + Utilities/Release/upload_release.cmake | 2 +- Utilities/Scripts/BoostScanDeps.cmake | 217 ++ Utilities/Scripts/update-kwiml.bash | 20 + Utilities/Scripts/update-kwsys.bash | 22 + Utilities/Scripts/update-third-party.bash | 146 ++ Utilities/cmThirdParty.h.in | 1 + .../cm_kwiml.h | 25 +- Utilities/cmjsoncpp/CMakeLists.txt | 1 + Utilities/cmlibarchive/CMakeLists.txt | 77 +- Utilities/cmlibarchive/COPYING | 5 +- Utilities/cmlibarchive/README-CMake.txt | 8 +- .../build/cmake/CreatePkgConfigFile.cmake | 6 +- Utilities/cmlibarchive/build/cmake/config.h.in | 41 +- Utilities/cmlibarchive/libarchive/CMakeLists.txt | 21 +- Utilities/cmlibarchive/libarchive/archive.h | 186 +- .../cmlibarchive/libarchive/archive_cryptor.c | 435 ++++ .../libarchive/archive_cryptor_private.h | 152 ++ .../{archive_crypto.c => archive_digest.c} | 10 +- ...e_crypto_private.h => archive_digest_private.h} | 42 +- Utilities/cmlibarchive/libarchive/archive_entry.3 | 2 +- Utilities/cmlibarchive/libarchive/archive_entry.c | 130 +- Utilities/cmlibarchive/libarchive/archive_entry.h | 59 +- .../cmlibarchive/libarchive/archive_entry_acl.3 | 2 +- .../cmlibarchive/libarchive/archive_entry_paths.3 | 2 +- .../cmlibarchive/libarchive/archive_entry_perms.3 | 2 +- .../cmlibarchive/libarchive/archive_entry_stat.3 | 4 +- .../cmlibarchive/libarchive/archive_entry_time.3 | 2 +- .../cmlibarchive/libarchive/archive_entry_xattr.c | 5 +- Utilities/cmlibarchive/libarchive/archive_hmac.c | 234 ++ .../cmlibarchive/libarchive/archive_hmac_private.h | 95 + Utilities/cmlibarchive/libarchive/archive_match.c | 9 +- .../cmlibarchive/libarchive/archive_pathmatch.c | 8 +- .../cmlibarchive/libarchive/archive_private.h | 19 + Utilities/cmlibarchive/libarchive/archive_random.c | 269 +++ ...write_add_filter.c => archive_random_private.h} | 50 +- Utilities/cmlibarchive/libarchive/archive_read.3 | 4 +- Utilities/cmlibarchive/libarchive/archive_read.c | 74 +- ..._write_data.3 => archive_read_add_passphrase.3} | 66 +- .../libarchive/archive_read_add_passphrase.c | 186 ++ .../libarchive/archive_read_append_filter.c | 6 +- .../cmlibarchive/libarchive/archive_read_data.3 | 2 +- .../libarchive/archive_read_disk_entry_from_file.c | 8 +- .../libarchive/archive_read_disk_posix.c | 23 +- .../libarchive/archive_read_disk_private.h | 5 + .../archive_read_disk_set_standard_lookup.c | 2 +- .../libarchive/archive_read_disk_windows.c | 19 +- .../cmlibarchive/libarchive/archive_read_extract.c | 17 - .../libarchive/archive_read_extract2.c | 21 +- .../cmlibarchive/libarchive/archive_read_filter.3 | 17 +- .../cmlibarchive/libarchive/archive_read_open.3 | 4 +- .../cmlibarchive/libarchive/archive_read_open_fd.c | 29 + .../libarchive/archive_read_open_memory.c | 12 +- .../cmlibarchive/libarchive/archive_read_private.h | 43 +- .../libarchive/archive_read_set_options.c | 7 +- .../libarchive/archive_read_support_filter_all.c | 2 + .../archive_read_support_filter_compress.c | 24 +- .../libarchive/archive_read_support_filter_lz4.c | 728 +++++++ .../libarchive/archive_read_support_filter_lzop.c | 7 + .../libarchive/archive_read_support_filter_uu.c | 3 +- .../libarchive/archive_read_support_filter_xz.c | 2 +- .../libarchive/archive_read_support_format_7zip.c | 48 +- .../libarchive/archive_read_support_format_all.c | 1 + .../libarchive/archive_read_support_format_ar.c | 21 +- .../libarchive/archive_read_support_format_cpio.c | 22 +- .../archive_read_support_format_iso9660.c | 72 +- .../libarchive/archive_read_support_format_lha.c | 480 +++-- .../libarchive/archive_read_support_format_mtree.c | 266 +-- .../libarchive/archive_read_support_format_rar.c | 34 +- .../libarchive/archive_read_support_format_tar.c | 44 +- .../libarchive/archive_read_support_format_warc.c | 794 +++++++ .../libarchive/archive_read_support_format_xar.c | 34 +- .../libarchive/archive_read_support_format_zip.c | 1074 ++++++++-- Utilities/cmlibarchive/libarchive/archive_string.c | 91 +- Utilities/cmlibarchive/libarchive/archive_util.c | 143 +- .../cmlibarchive/libarchive/archive_windows.h | 2 + Utilities/cmlibarchive/libarchive/archive_write.3 | 15 +- Utilities/cmlibarchive/libarchive/archive_write.c | 11 + .../libarchive/archive_write_add_filter.c | 1 + .../libarchive/archive_write_add_filter_by_name.c | 1 + .../libarchive/archive_write_add_filter_lz4.c | 646 ++++++ .../libarchive/archive_write_add_filter_xz.c | 44 +- .../cmlibarchive/libarchive/archive_write_data.3 | 14 +- .../cmlibarchive/libarchive/archive_write_disk.3 | 10 +- .../libarchive/archive_write_disk_posix.c | 87 +- .../archive_write_disk_set_standard_lookup.c | 7 +- .../libarchive/archive_write_disk_windows.c | 6 +- .../cmlibarchive/libarchive/archive_write_filter.3 | 18 +- .../libarchive/archive_write_finish_entry.3 | 2 +- .../cmlibarchive/libarchive/archive_write_format.3 | 16 +- .../cmlibarchive/libarchive/archive_write_open.3 | 2 +- .../libarchive/archive_write_open_filename.c | 5 +- .../libarchive/archive_write_private.h | 15 + .../libarchive/archive_write_set_format.c | 1 + .../libarchive/archive_write_set_format_by_name.c | 1 + .../archive_write_set_format_filter_by_ext.c | 142 ++ .../libarchive/archive_write_set_format_iso9660.c | 10 + .../libarchive/archive_write_set_format_mtree.c | 4 +- .../libarchive/archive_write_set_format_warc.c | 439 ++++ .../libarchive/archive_write_set_format_xar.c | 63 +- .../libarchive/archive_write_set_format_zip.c | 678 +++++- .../libarchive/archive_write_set_options.3 | 42 + ...write_data.3 => archive_write_set_passphrase.3} | 66 +- .../libarchive/archive_write_set_passphrase.c | 95 + ...archive_write_add_filter.c => archive_xxhash.h} | 55 +- Utilities/cmlibarchive/libarchive/libarchive.3 | 4 +- .../cmlibarchive/libarchive/libarchive_internals.3 | 2 +- Utilities/cmlibarchive/libarchive/mtree.5 | 18 - Utilities/cmlibarchive/libarchive/tar.5 | 2 +- Utilities/cmlibarchive/libarchive/xxhash.c | 500 +++++ bootstrap | 67 +- 762 files changed, 27672 insertions(+), 13017 deletions(-) create mode 100644 Help/command/cmake_parse_arguments.rst create mode 100644 Help/module/FindXalanC.rst create mode 100644 Help/prop_tgt/IOS_INSTALL_COMBINED.rst create mode 100644 Help/release/3.5.rst create mode 100644 Help/variable/CMAKE_EXPORT_COMPILE_COMMANDS.rst create mode 100644 Help/variable/CMAKE_IOS_INSTALL_COMBINED.rst create mode 100644 Modules/CMakeIOSInstallCombined.cmake create mode 100644 Modules/CMakeLanguageInformation.cmake create mode 100644 Modules/Compiler/ARMCC-ASM.cmake create mode 100644 Modules/Compiler/ARMCC-C.cmake create mode 100644 Modules/Compiler/ARMCC-CXX.cmake create mode 100644 Modules/Compiler/ARMCC-DetermineCompiler.cmake create mode 100644 Modules/Compiler/ARMCC.cmake create mode 100644 Modules/Compiler/CrayPrgEnv-C.cmake create mode 100644 Modules/Compiler/CrayPrgEnv-CXX.cmake create mode 100644 Modules/Compiler/CrayPrgEnv-Cray-C.cmake create mode 100644 Modules/Compiler/CrayPrgEnv-Cray-CXX.cmake create mode 100644 Modules/Compiler/CrayPrgEnv-Cray-Fortran.cmake create mode 100644 Modules/Compiler/CrayPrgEnv-Fortran.cmake create mode 100644 Modules/Compiler/CrayPrgEnv-GNU-C.cmake create mode 100644 Modules/Compiler/CrayPrgEnv-GNU-CXX.cmake create mode 100644 Modules/Compiler/CrayPrgEnv-GNU-Fortran.cmake create mode 100644 Modules/Compiler/CrayPrgEnv-Intel-C.cmake create mode 100644 Modules/Compiler/CrayPrgEnv-Intel-CXX.cmake create mode 100644 Modules/Compiler/CrayPrgEnv-Intel-Fortran.cmake create mode 100644 Modules/Compiler/CrayPrgEnv-PGI-C.cmake create mode 100644 Modules/Compiler/CrayPrgEnv-PGI-CXX.cmake create mode 100644 Modules/Compiler/CrayPrgEnv-PGI-Fortran.cmake create mode 100644 Modules/Compiler/CrayPrgEnv.cmake create mode 100644 Modules/FindXalanC.cmake create mode 100644 Modules/Platform/CrayLinuxEnvironment.cmake create mode 100644 Packaging/CMakeDMGBackground.tif create mode 100644 Packaging/CMakeDMGSetup.scpt create mode 100644 Source/QtDialog/RegexExplorer.cxx create mode 100644 Source/QtDialog/RegexExplorer.h create mode 100644 Source/QtDialog/RegexExplorer.ui create mode 100644 Source/QtDialog/WarningMessagesDialog.cxx create mode 100644 Source/QtDialog/WarningMessagesDialog.h create mode 100644 Source/QtDialog/WarningMessagesDialog.ui rename Utilities/KWIML/test/test_ABI_CXX.cxx => Source/bindexplib.h (54%) delete mode 100644 Source/cmMakeDepend.cxx delete mode 100644 Source/cmMakeDepend.h create mode 100644 Source/cmParseArgumentsCommand.cxx create mode 100644 Source/cmParseArgumentsCommand.h delete mode 100644 Source/kwsys/CPU.h.in delete mode 100644 Source/kwsys/FundamentalType.h.in create mode 100644 Tests/AliasTarget/subdir/CMakeLists.txt copy Tests/AliasTarget/{ => subdir}/empty.cpp (100%) create mode 100644 Tests/CPackComponentsDEB/MyLibCPackConfig-components-source.cmake.in create mode 100644 Tests/CPackComponentsDEB/MyLibCPackConfig-compression.cmake.in create mode 100644 Tests/CPackComponentsDEB/RunCPackVerifyResult-components-source.cmake create mode 100644 Tests/CPackComponentsDEB/RunCPackVerifyResult-compression.cmake rename Tests/DelphiCoverage/{UTCovTest(UTCovTest.pas).html => UTCovTest(UTCovTest.pas).html.in} (100%) create mode 100644 Tests/ExportImport/Export/testStaticLibRequiredPrivate.c create mode 100644 Tests/FindBoost/CMakeLists.txt create mode 100644 Tests/FindBoost/Test/CMakeLists.txt create mode 100644 Tests/FindBoost/Test/main.cxx create mode 100644 Tests/FindGTest/CMakeLists.txt create mode 100644 Tests/FindGTest/Test/CMakeLists.txt create mode 100644 Tests/FindGTest/Test/main.cxx create mode 100644 Tests/FindPNG/CMakeLists.txt create mode 100644 Tests/FindPNG/Test/CMakeLists.txt create mode 100644 Tests/FindPNG/Test/main.c create mode 100644 Tests/FindTIFF/CMakeLists.txt create mode 100644 Tests/FindTIFF/Test/CMakeLists.txt create mode 100644 Tests/FindTIFF/Test/main.c create mode 100644 Tests/FindXalanC/CMakeLists.txt create mode 100644 Tests/FindXalanC/Test/CMakeLists.txt create mode 100644 Tests/FindXalanC/Test/main.cxx create mode 100644 Tests/FindXercesC/CMakeLists.txt create mode 100644 Tests/FindXercesC/Test/CMakeLists.txt create mode 100644 Tests/FindXercesC/Test/main.cxx create mode 100644 Tests/JavaJavah/C.cpp create mode 100644 Tests/JavaJavah/C.java create mode 100644 Tests/RunCMake/BuildDepends/Custom-Always.cmake create mode 100644 Tests/RunCMake/CPack/DEB/PER_COMPONENT_FIELDS-ExpectedFiles.cmake create mode 100644 Tests/RunCMake/CPack/DEB/PER_COMPONENT_FIELDS-VerifyResult.cmake create mode 100644 Tests/RunCMake/CPack/DEB/PER_COMPONENT_FIELDS-specifics.cmake create mode 100644 Tests/RunCMake/CPack/PER_COMPONENT_FIELDS.cmake create mode 100644 Tests/RunCMake/CPack/RPM/PER_COMPONENT_FIELDS-ExpectedFiles.cmake create mode 100644 Tests/RunCMake/CPack/RPM/PER_COMPONENT_FIELDS-VerifyResult.cmake create mode 100644 Tests/RunCMake/CPack/RPM/PER_COMPONENT_FIELDS-specifics.cmake copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => CommandLine/E_copy-one-source-directory-target-is-directory-result.txt} (100%) copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/CommandLine/E_copy-one-source-directory-target-is-directory-stderr.txt (100%) copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLine/E_copy-one-source-file-result.txt} (100%) create mode 100644 Tests/RunCMake/CommandLine/E_copy-one-source-file-stderr.txt copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => CommandLine/E_copy-three-source-files-target-is-directory-result.txt} (100%) copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/CommandLine/E_copy-three-source-files-target-is-directory-stderr.txt (100%) copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLine/E_copy-three-source-files-target-is-file-result.txt} (100%) create mode 100644 Tests/RunCMake/CommandLine/E_copy-three-source-files-target-is-file-stderr.txt copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLine/E_copy-two-good-and-one-bad-source-files-target-is-directory-result.txt} (100%) create mode 100644 Tests/RunCMake/CommandLine/E_copy-two-good-and-one-bad-source-files-target-is-directory-stderr.txt copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => CommandLine/E_copy_directory-three-source-files-target-is-directory-result.txt} (100%) copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/CommandLine/E_copy_directory-three-source-files-target-is-directory-stderr.txt (100%) copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLine/E_copy_directory-three-source-files-target-is-file-result.txt} (100%) create mode 100644 Tests/RunCMake/CommandLine/E_copy_directory-three-source-files-target-is-file-stderr.txt copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => CommandLine/E_copy_directory-three-source-files-target-is-not-exist-result.txt} (100%) copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/CommandLine/E_copy_directory-three-source-files-target-is-not-exist-stderr.txt (100%) copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => CommandLine/E_copy_if_different-one-source-directory-target-is-directory-result.txt} (100%) copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/CommandLine/E_copy_if_different-one-source-directory-target-is-directory-stderr.txt (100%) copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => CommandLine/E_copy_if_different-three-source-files-target-is-directory-result.txt} (100%) copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/CommandLine/E_copy_if_different-three-source-files-target-is-directory-stderr.txt (100%) copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLine/E_copy_if_different-three-source-files-target-is-file-result.txt} (100%) create mode 100644 Tests/RunCMake/CommandLine/E_copy_if_different-three-source-files-target-is-file-stderr.txt copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => CommandLine/E_make_directory-directory-with-parent-result.txt} (100%) copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/CommandLine/E_make_directory-directory-with-parent-stderr.txt (100%) copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLine/E_make_directory-three-directories-and-file-result.txt} (100%) create mode 100644 Tests/RunCMake/CommandLine/E_make_directory-three-directories-and-file-stderr.txt copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => CommandLine/E_make_directory-three-directories-result.txt} (100%) copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/CommandLine/E_make_directory-three-directories-stderr.txt (100%) copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLine/E_time-no-arg-result.txt} (100%) copy Tests/RunCMake/CommandLine/{E-no-arg-stderr.txt => E_time-no-arg-stderr.txt} (54%) create mode 100644 Tests/RunCMake/CommandLine/E_time-stdout.txt create mode 100644 Tests/RunCMake/CommandLine/P_working-dir.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLine/W_bad-arg1-result.txt} (100%) create mode 100644 Tests/RunCMake/CommandLine/W_bad-arg1-stderr.txt copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLine/W_bad-arg2-result.txt} (100%) create mode 100644 Tests/RunCMake/CommandLine/W_bad-arg2-stderr.txt copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLine/W_bad-arg3-result.txt} (100%) create mode 100644 Tests/RunCMake/CommandLine/W_bad-arg3-stderr.txt create mode 100644 Tests/RunCMake/CommandLine/Wdeprecated-stderr.txt create mode 100644 Tests/RunCMake/CommandLine/Wdeprecated.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLine/Werror_deprecated-result.txt} (100%) create mode 100644 Tests/RunCMake/CommandLine/Werror_deprecated-stderr.txt create mode 100644 Tests/RunCMake/CommandLine/Werror_deprecated.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLine/Werror_dev-result.txt} (100%) create mode 100644 Tests/RunCMake/CommandLine/Werror_dev-stderr.txt create mode 100644 Tests/RunCMake/CommandLine/Werror_dev.cmake create mode 100644 Tests/RunCMake/CommandLine/Wno-deprecated.cmake create mode 100644 Tests/RunCMake/CommandLine/Wno-error_deprecated-stderr.txt create mode 100644 Tests/RunCMake/CommandLine/Wno-error_deprecated.cmake copy Tests/RunCMake/CommandLine/{Wdev-stderr.txt => Wno-error_dev-stderr.txt} (69%) create mode 100644 Tests/RunCMake/CommandLine/Wno-error_dev.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLine/cache-bad-entry-result.txt} (100%) create mode 100644 Tests/RunCMake/CommandLine/cache-bad-entry-stderr.txt create mode 100644 Tests/RunCMake/CommandLine/cache-bad-entry/CMakeCache.txt copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLine/cache-empty-entry-result.txt} (100%) create mode 100644 Tests/RunCMake/CommandLine/cache-empty-entry-stderr.txt create mode 100644 Tests/RunCMake/CommandLine/cache-empty-entry/CMakeCache.txt copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/CommandLine/copy_input/d1/d1.txt (100%) copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/CommandLine/copy_input/d2/d2.txt (100%) copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/CommandLine/copy_input/d3/d3.txt (100%) copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/CommandLine/copy_input/f1.txt (100%) copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/CommandLine/copy_input/f2.txt (100%) copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/CommandLine/copy_input/f3.txt (100%) create mode 100644 Tests/RunCMake/FindPkgConfig/FindPkgConfig_cache_variables.cmake create mode 100644 Tests/RunCMake/Framework/CMakeLists.txt create mode 100644 Tests/RunCMake/Framework/FrameworkLayout.cmake create mode 100644 Tests/RunCMake/Framework/OSXFrameworkLayout-build-check.cmake create mode 100644 Tests/RunCMake/Framework/RunCMakeTest.cmake create mode 100644 Tests/RunCMake/Framework/foo.c create mode 100644 Tests/RunCMake/Framework/foo.h create mode 100644 Tests/RunCMake/Framework/iOSFrameworkLayout-build-check.cmake create mode 100644 Tests/RunCMake/Framework/ios.cmake copy Tests/RunCMake/{XcodeProject => Framework}/osx.cmake (100%) copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/Framework/res.txt (100%) create mode 100644 Tests/RunCMake/VisibilityPreset/CMP0063-WARN-exe-stderr.txt copy Tests/RunCMake/VisibilityPreset/{CMP0063-WARN-yes.cmake => CMP0063-WARN-exe.cmake} (68%) create mode 100644 Tests/RunCMake/VisibilityPreset/CMP0063-WARN-obj-stderr.txt copy Tests/RunCMake/VisibilityPreset/{CMP0063-WARN-yes.cmake => CMP0063-WARN-obj.cmake} (67%) create mode 100644 Tests/RunCMake/VisibilityPreset/CMP0063-WARN-sta-stderr.txt rename Tests/RunCMake/VisibilityPreset/{CMP0063-WARN-yes.cmake => CMP0063-WARN-sta.cmake} (67%) delete mode 100644 Tests/RunCMake/VisibilityPreset/CMP0063-WARN-yes-stderr.txt create mode 100644 Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined-install-check.cmake create mode 100644 Tests/RunCMake/XcodeProject/XcodeIOSInstallCombined.cmake create mode 100644 Tests/RunCMake/XcodeProject/XcodeIOSInstallCombinedPrune-install-check.cmake create mode 100644 Tests/RunCMake/XcodeProject/XcodeIOSInstallCombinedPrune-install-stdout.txt create mode 100644 Tests/RunCMake/XcodeProject/XcodeIOSInstallCombinedPrune.cmake create mode 100644 Tests/RunCMake/XcodeProject/XcodeObjectNeedsEscape-check.cmake create mode 100644 Tests/RunCMake/XcodeProject/XcodeObjectNeedsEscape.cmake create mode 100644 Tests/RunCMake/XcodeProject/XcodeOptimizationFlags-check.cmake create mode 100644 Tests/RunCMake/XcodeProject/XcodeOptimizationFlags.cmake create mode 100644 Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags-check.cmake create mode 100644 Tests/RunCMake/XcodeProject/XcodePreserveNonOptimizationFlags.cmake create mode 100644 Tests/RunCMake/XcodeProject/XcodePreserveObjcFlag-check.cmake create mode 100644 Tests/RunCMake/XcodeProject/XcodePreserveObjcFlag.cmake create mode 100644 Tests/RunCMake/XcodeProject/main.cpp copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => add_custom_command/TargetImported-result.txt} (100%) create mode 100644 Tests/RunCMake/add_custom_command/TargetImported-stderr.txt create mode 100644 Tests/RunCMake/add_custom_command/TargetImported.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => add_custom_command/TargetNotInDir-result.txt} (100%) create mode 100644 Tests/RunCMake/add_custom_command/TargetNotInDir-stderr.txt create mode 100644 Tests/RunCMake/add_custom_command/TargetNotInDir.cmake create mode 100644 Tests/RunCMake/add_custom_command/TargetNotInDir/CMakeLists.txt create mode 100644 Tests/RunCMake/cmake_parse_arguments/CMakeLists.txt create mode 100644 Tests/RunCMake/cmake_parse_arguments/CornerCases.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => cmake_parse_arguments/Errors-result.txt} (100%) create mode 100644 Tests/RunCMake/cmake_parse_arguments/Errors-stderr.txt create mode 100644 Tests/RunCMake/cmake_parse_arguments/Errors.cmake create mode 100644 Tests/RunCMake/cmake_parse_arguments/Initialization.cmake create mode 100644 Tests/RunCMake/cmake_parse_arguments/Mix.cmake create mode 100644 Tests/RunCMake/cmake_parse_arguments/RunCMakeTest.cmake create mode 100644 Tests/RunCMake/cmake_parse_arguments/Utils.cmake create mode 100644 Tests/RunCMake/cmake_parse_arguments/test_utils.cmake create mode 100644 Tests/RunCMake/if/MatchesSelf.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => install/DIRECTORY-DIRECTORY-bad-result.txt} (100%) copy Tests/RunCMake/{XcodeProject/XcodeAttributeGenexError-stderr.txt => install/DIRECTORY-DIRECTORY-bad-stderr.txt} (100%) create mode 100644 Tests/RunCMake/install/DIRECTORY-DIRECTORY-bad.cmake copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => message/defaultmessage-result.txt} (100%) create mode 100644 Tests/RunCMake/message/defaultmessage-stderr.txt create mode 100644 Tests/RunCMake/message/defaultmessage.cmake delete mode 100644 Tests/RunCMake/message/errormessage-result.txt delete mode 100644 Tests/RunCMake/message/errormessage-stderr.txt delete mode 100644 Tests/RunCMake/message/errormessage.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => message/errormessage_deprecated-result.txt} (100%) create mode 100644 Tests/RunCMake/message/errormessage_deprecated-stderr.txt create mode 100644 Tests/RunCMake/message/errormessage_deprecated.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => message/errormessage_dev-result.txt} (100%) create mode 100644 Tests/RunCMake/message/errormessage_dev-stderr.txt create mode 100644 Tests/RunCMake/message/errormessage_dev.cmake copy Modules/IntelVSImplicitPath/hello.f => Tests/Wrapping/fltk2.fl (100%) copy Tests/{CMakeOnly/LinkInterfaceLoop/main.c => Wrapping/wrapFLTK.c} (100%) create mode 100644 Utilities/KWIML/.gitattributes delete mode 100644 Utilities/KWIML/ABI.h.in delete mode 100644 Utilities/KWIML/INT.h.in create mode 100644 Utilities/KWIML/README.md delete mode 100644 Utilities/KWIML/README.txt create mode 100644 Utilities/KWIML/include/kwiml/abi.h create mode 100644 Utilities/KWIML/include/kwiml/int.h create mode 100644 Utilities/KWIML/src/kwiml-config.cmake.in create mode 100644 Utilities/KWIML/src/version.h.in delete mode 100644 Utilities/KWIML/test/test_ABI_C.c delete mode 100644 Utilities/KWIML/test/test_ABI_endian.h.in delete mode 100644 Utilities/KWIML/test/test_INT_C.c delete mode 100644 Utilities/KWIML/test/test_INT_CXX.cxx create mode 100644 Utilities/KWIML/test/test_abi_C.c create mode 100644 Utilities/KWIML/test/test_abi_CXX.cxx create mode 100644 Utilities/KWIML/test/test_abi_endian.h create mode 100644 Utilities/KWIML/test/test_int_C.c create mode 100644 Utilities/KWIML/test/test_int_CXX.cxx rename Utilities/KWIML/test/{test_INT_format.h.in => test_int_format.h} (78%) create mode 100644 Utilities/Release/WiX/WIX.template.in create mode 100644 Utilities/Release/WiX/cmake_extra_dialog.wxs create mode 100644 Utilities/Release/WiX/install_dir.wxs create mode 100644 Utilities/Release/WiX/patch_desktop_shortcut.xml create mode 100644 Utilities/Release/WiX/patch_path_env.xml rename Utilities/Release/{cpack_wix_ui_banner.jpg => WiX/ui_banner.jpg} (100%) rename Utilities/Release/{cpack_wix_ui_dialog.jpg => WiX/ui_dialog.jpg} (100%) rename Utilities/Release/{dash2win64_release.cmake => dash3win7_release.cmake} (61%) delete mode 100644 Utilities/Release/dashmacmini2_release.cmake create mode 100644 Utilities/Scripts/BoostScanDeps.cmake create mode 100755 Utilities/Scripts/update-kwiml.bash create mode 100755 Utilities/Scripts/update-kwsys.bash create mode 100644 Utilities/Scripts/update-third-party.bash copy Source/cmEnableTestingCommand.cxx => Utilities/cm_kwiml.h (54%) create mode 100644 Utilities/cmlibarchive/libarchive/archive_cryptor.c create mode 100644 Utilities/cmlibarchive/libarchive/archive_cryptor_private.h rename Utilities/cmlibarchive/libarchive/{archive_crypto.c => archive_digest.c} (99%) rename Utilities/cmlibarchive/libarchive/{archive_crypto_private.h => archive_digest_private.h} (93%) create mode 100644 Utilities/cmlibarchive/libarchive/archive_hmac.c create mode 100644 Utilities/cmlibarchive/libarchive/archive_hmac_private.h create mode 100644 Utilities/cmlibarchive/libarchive/archive_random.c copy Utilities/cmlibarchive/libarchive/{archive_write_add_filter.c => archive_random_private.h} (50%) copy Utilities/cmlibarchive/libarchive/{archive_write_data.3 => archive_read_add_passphrase.3} (59%) create mode 100644 Utilities/cmlibarchive/libarchive/archive_read_add_passphrase.c create mode 100644 Utilities/cmlibarchive/libarchive/archive_read_support_filter_lz4.c create mode 100644 Utilities/cmlibarchive/libarchive/archive_read_support_format_warc.c create mode 100644 Utilities/cmlibarchive/libarchive/archive_write_add_filter_lz4.c create mode 100644 Utilities/cmlibarchive/libarchive/archive_write_set_format_filter_by_ext.c create mode 100644 Utilities/cmlibarchive/libarchive/archive_write_set_format_warc.c copy Utilities/cmlibarchive/libarchive/{archive_write_data.3 => archive_write_set_passphrase.3} (60%) create mode 100644 Utilities/cmlibarchive/libarchive/archive_write_set_passphrase.c copy Utilities/cmlibarchive/libarchive/{archive_write_add_filter.c => archive_xxhash.h} (50%) create mode 100644 Utilities/cmlibarchive/libarchive/xxhash.c hooks/post-receive -- CMake From robert.maynard at kitware.com Tue Feb 2 16:51:35 2016 From: robert.maynard at kitware.com (Robert Maynard) Date: Tue, 2 Feb 2016 16:51:35 -0500 (EST) Subject: [Cmake-commits] CMake annotated tag, v3.5.0-rc1, created. v3.5.0-rc1 Message-ID: <20160202215135.56A92E482F@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.5.0-rc1 has been created at d228cc3b6fbf6cfc71e3b611dde6c10f46d7bbe1 (tag) tagging 8a8d22cf1e5d20b7c3b32c1ec9b5f06b339c2a50 (commit) replaces v3.4.3 tagged by Brad King on Tue Feb 2 13:50:49 2016 -0500 - Log ----------------------------------------------------------------- CMake 3.5.0-rc1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJWsPqJAAoJEC0s7xA0khaEFoMP/2orNY+fxHn0tZZT9sc2Jmjg +bWnrdeaV8HIYIbKFgaVDVD+Ulz7ApoY7wvSQ9C3KKv9BgK2FKe/6rmxr0TaEzLD 4qBe6pi6AMeGXqVIdTmpxNuxuCd5/SSKxgVnKRI8q6B6Pcq5VcxnLMXnDS3n6UNd wXiFFbRu0W2LgLfLmtHf7lNqlqrnuGY4WzzExLppkfGpRqtzZzx8l64G+xhO79dE tNDTepPJ8H6yYK7ny2Pxg5F7mTgF/DCiW9BM6LSqvqQFn/XP/fGln63fQVLwldQ3 ZU9+L0gxaR6JwCOrNoefPD8TyR706RXLB+EPHszDhKWbs8+ZS1sqYZR7MZhO6wPP kFm0XuLsAQCypMLgtBI5cLz/xh1RNUc5MCm7+50RU95LD5akk8pPkzr+T57uCJ+K +9t4hXG2D/v3CcWqdpaezzMzwJZtYf392KI4kECPlcznYKzcjk3X0/mcmdHzwOQ4 7YVdmVHWa/osLb/uVktqrTSwnvilwR+yutkcO/NpE/hv4u6/d5+/Xkn9S5buDQtX TS6MOnSnYNPUK9QFFTOfR/AdzzJ++c+74cVMevl1yfuSrbGNwzMnejq5Jenwquxx qGob0ugsTp6y4lpoPJo/Z9HDXQTIY4bpqchAb7Efq+U1JirgcvLCdCWhBq3brFDG CvTmXsHdpWkfLcTDLtJp =sthe -----END PGP SIGNATURE----- Adam Rankin (1): ExternalProject: Add option to set `git clone -o` argument Adam Strzelecki (1): Improve appearance of CMake .dmg package on OS X Alexander Szakaly (1): FindCUDA: Add paths for crosscompiling to aarch64 Andrey Mishchenko (2): Graphviz: Fix handling of spaces in GRAPHVIZ_GRAPH_NAME CPack/DragNDrop: Fix handling of certain license file content (#15899) Andrey Pokrovskiy (1): cmExportInstallFileGenerator: Fix crash in FindNamespaces Andr? Klitzing (1): GetPrerequisites: Define api-ms-win-* files as system libraries (#15691) April Chin (1): SunOS: Remove obsolete Studio compiler library directories Ashley Whetter (1): Print line number of cache parse errors (#11109) Bartosz Kosiorek (15): Fix iOS Framework directory structure (#15833) Help: Update documentation to reflect support for iOS iOS: Fix framework resource directory layout (#15848) cmake: Improve '-E' help message formatting cmake: Teach -E copy[_if_different] to support multiple files (#15703) cmake: Refine -E chdir documentation cmake: Refine -E copy_if_different implementation indentation cmake: Refine -E copy[_if_different] documentation cmake: Teach -E copy_directory to support multiple input directories cmake: Teach -E make_directory to support multiple input directories Help: Improve markup in `get_target_property` documentation Help: Improve markup in `if` command documentation Help: Clarify scope of `if(TARGET)` expression Help: Clarify policy `CMP0040` documentation (#15681) Help: Clarify `add_custom_command(TARGET)` scope (#15681) Ben Boeckel (2): Add a script to help update third-party sources FindPkgConfig: set standard variables in the cache Benjamin Chr?tien (1): FindPkgConfig: return actual error when a package is not found (#15810) Bill Hoffman (2): De-duplicate symbols listed in generated module definition files Fix auto export symbols for Dlls containing /bigobj for 64bit builds. Brad King (357): Merge branch 'release' Begin post-3.4 development Merge branch 'release' Tests: Drop nightly OS X ppc/i386 binary Utilities/Release: Drop OS X ppc/i386 binary Tests: Rename OS X nightly release binary test Utilities/Release: Move cygwin packages to a subdirectory Merge branch 'upstream-kwsys' into update-kwsys Merge topic 'refactor-qt-autogen' Merge topic 'refactor-computation' Merge topic 'clean-up-cmLocalGenerator' Merge topic 'FindOpenSSL-msvc-static-rt' Merge topic 'cmGeneratorTarget-exports' Tests: Rename Linux nightly release binary test to Linux32 Tests: Add a nightly Linux 64-bit binary Merge topic 'release-no-old-osx' Merge topic 'release-cygwin-subdir' Merge topic 'release-nightly-linux64' Merge topic 'fix-spelling-typos' Merge topic 'update-kwsys' Merge topic 'cpack-nsis-bitmap' Merge topic 'cmake-script-mode-directory-vars' Merge topic 'refactor-current-dir-initialization' Merge topic 'cmGeneratorTarget-sources' Merge branch 'upstream-kwsys' into update-kwsys cmFileTimeComparison: Update for lack of cmsys_STAT_HAS_ST_MTIM bootstrap: Drop unnecessary KWSys platform check cmFileTimeComparison: Port to OS X nanosecond times (#15769) Merge topic 'FindOpenSSL-mingw' Merge topic 'FindGTK2_sigc++_c++11' Merge topic 'revert-compiler-features-solaris' Merge topic 'update-kwsys' Merge topic 'osx-file-times-ns-precision' Merge topic 'doc-clarify-shared-lib' Merge topic 'cpack-wix-typos' Merge topic 'emacs-mode-fix-accidental-indentation' Merge topic 'emacs-mode-unscreamify-more' Merge topic 'minor-cleanups' Merge topic 'add-cmLocalGenerator-API' Merge topic 'refactor-cache-manager' Merge topic 'use-generator-target' Merge topic 'ctest-submit-content-type' Merge branch 'release' Merge topic 'xcode-adjust-deployment-to-host-version' Merge topic 'FindPostgreSQL-v9.5' Merge topic 'doc-INCLUDES-relnote' Merge topic 'FindGit-Atlassian-SourceTree' Merge branch 'release' Merge topic 'refactor-state-initialization' Merge topic 'use-generator-target' Merge topic 'genex-generator-objects' Merge topic 'wix-text-node' Merge topic 'GetTargetDirectory-cmGeneratorTarget' Merge topic 'clean-up-cmTarget' Merge topic 'genex-consumers-generator-targets' Merge topic 'ExternalProject-fix-git-version' Merge topic 'ghs-drop-optgroup' Merge branch 'upstream-kwsys' into update-kwsys CMakeForceCompiler: Deprecate this module and its macros Merge topic 'doc-add_test-requirements' Merge branch 'release' Help: Add notes for topic 'FindFLEX-DEFINES_FILE' Merge topic 'update-kwsys' Merge topic 'fix_delphi_coverage' Merge topic 'FindFLEX-DEFINES_FILE' Merge topic 'use-generator-target' Ninja: Refactor selection of 'deps = ' value for MS-compatible toolchains Merge topic 'doc-file-GLOB-no-order' Merge topic 'fix-CMP0054-elseif-warning' Merge topic 'deprecate-CMakeForceCompiler' Merge topic 'ninja-refactor-deptype-selection' Merge topic 'cmLocalGenerator-generator-target-storage' Merge topic 'inline-cmMakeDepend-content' Merge topic 'use-generator-target' Merge branch 'release' Merge branch 'libarchive-upstream' into update-libarchive libarchive: Define version macro before first use libarchive: Drop CMake-specific Borland compiler workaround libarchive: Guard bcyrpt.h with HAVE_BCRYPT_H libarchive: Fix VS 7.1 Debug build Merge branch 'release' libarchive: Define O_CLOEXEC when missing libarchive: Use CommonCrypto APIs on OS X only when available libarchive: Avoid non-portable u_int8_t libarchive: Drop outdated CMake portability snprintf libarchive: Avoid using name 'hz' libarchive: Avoid using 'uint8_t' as bitfield type Merge topic 'doc-add_executable-typo' Merge topic 'fix-test-RUN_SERIAL-failure-regression' Merge topic 'cpack-deb-fakeroot-removal' Merge topic 'xcode-optimization-flags' Merge topic 'xcode-watch-and-tvos' Merge topic 'use-generator-target' Revert "cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)" Merge branch 'backport-revert-autorcc-qt-5.1' into revert-autorcc-qt-5.1 libarchive: Test for Clang builtin before using it libarchive: Do not use pthread.h API without header libarchive: Drop use of pthread.h for CMake build libarchive: Update README-CMake.txt for new snapshot Update libarchive configuration within CMake cmArchiveWrite: Preemptively adapt to future libarchive 4.0 changes cmSystemTools: Preemptively adapt to future libarchive 4.0 changes Merge topic 'update-libarchive' Merge topic 'fix-C-comment-syntax' Merge topic 'fix-ctest_test-parallel-execution' Merge topic 'use-generator-target' Merge topic 'minor-cleanups' QtAutogen: Fix rcc invocation for Qt 5.0 and 5.1 (#15644) CPack: Fix CPACK_OSX_SYSROOT with symbolic CMAKE_OSX_SYSROOT (#15816) bootstrap: Drop unused KWSys header directories Merge topic 'revert-autorcc-qt-5.1' Merge topic 'autorcc-qt-5.1-compat' Merge topic 'FindPkgConfig-better-error' Merge topic 'bootstrap-cleanup' Merge topic 'cpack-osx-sysroot' Merge topic 'vs-resw-files' Merge branch 'release' Merge topic 'README-fix-typo' Merge topic 'intel-fortran-2016' Merge branch 'release' Merge topic 'fix-find_program-regression' Merge topic 'xcode-lastupgradecheck' Merge topic 'doc-apple-info-plist-properties' Merge topic 'macosx_rpath-clarify-doc' Merge branch 'release' Merge branch 'release' cmFortranParser: Parse #line directives cmGlobalNinjaGenerator: Save path to 'ninja' tool very early cmGlobalNinjaGenerator: Save 'ninja' version very early cmFortranLexer: Populate empty doxygen @param comments cmGeneratorTarget: Fix IMPLEMENT_VISIT_IMPL for template data types Help: Add notes for topic 'add-armcc-toolchain' Merge topic 'add-armcc-toolchain' Merge topic 'vs-show-def-files' Merge topic 'find-cuda-dl' Merge topic 'cpack-deb-compression-scheme-test' Merge topic 'fortran-line-directives' Merge topic 'ninja-version-refactor' Merge topic 'cpack-deb-config-file-source-field' Merge topic 'FindGTK2_GTK2_TARGETS' Merge topic 'fix-alias-target-access' Merge topic 'cpack-deb-new-component-vars' Merge topic 'cpack-dmg-multilanguage-sla' Merge topic 'fix-install-rules' Merge topic 'wix-toplevel-feature-required' Merge topic 'fix-clang-Wdouble-promotion' Merge branch 'release' Merge branch 'release' Merge topic 'cray-fortran-version' Merge topic 'better_looking_mac_package' Merge topic 'jacoco_out_of_source' Merge topic 'add-cray-linux-platform' Merge topic 'non-xcode-framework-layout' Merge topic 'oracle-implicit-link-dirs' Merge topic 'fix-compute-default-dialect-lto' Merge topic 'cmake-gui-select-toolset' Merge branch 'release' Merge topic 'unique_def_symbols' Android: Restore generation of non-versioned soname (#15851) Merge branch 'backport-android-no-versioned-soname' into restore-android-no-versioned-soname Merge topic 'fix-ms-manifest-no-linker' Merge topic 'FindGTest-avoid-CMP0064' Merge topic 'add-cray-linux-platform' Ninja: Refactor generation of 'restat' on custom commands Ninja: Add 'restat' parameter to custom command generation method Ninja: Always re-run custom commands that have symbolic dependencies Merge branch 'backport-fix-autodef-bigobj-64' into fix-autodef-bigobj-64 Merge topic 'fix-forced-toolchain-dialect' Merge topic 'restore-android-no-versioned-soname' Merge topic 'avoid-divide-by-zero' Merge topic 'fix-autodef-bigobj-64' Merge topic 'ninja-symbolic-custom-command' Merge branch 'release' Help: Document CLEAN_NO_CUSTOM as for Makefile generators only (#15856) Merge topic 'expand_cobertura_search' Merge branch 'release' Merge topic 'doc-ios-support' Merge topic 'revert-compiler-links-statically' Merge topic 'cpack-dmg-multilanguage-sla' Merge topic 'test-add_subdirectory-in-function' Merge topic 'doc-CLEAN_NO_CUSTOM-makefile-only' Merge topic 'FindXercesC-imported-targets' Merge topic 'FindCUDA-aarch64' Merge topic 'test-cmake_policy-unmatched' Merge topic 'fix-find_package-version-file-error-stack' Merge branch 'reduce-cmState-accumulation' into reduce-cmState-accumulation-for-master Merge branch 'upstream-kwiml' into update-kwiml Merge topic 'reduce-cmState-accumulation-for-master' Merge branch 'release' Merge branch 'upstream-kwsys' into update-kwsys Merge topic 'update-kwiml' Merge topic 'update-kwsys' Merge topic 'reduce-realpath-calls' Merge topic 'include-for-mode_t' Merge topic 'cpack-dmg-multilanguage-sla' Merge topic 'backport-NIOS2-CPU' Merge topic 'cmake-W-options' Merge branch 'release' Help: Add notes for topic 'FindBoost-imported-targets.rst' Merge branch 'release' Merge topic 'ios-framework-resource-layout' Merge topic 'FindBoost-imported-targets' Merge topic 'improve-embarcadero' Merge topic 'regex-explorer' Merge branch 'upstream-kwsys' into update-kwsys Merge topic 'fix-java-idlj-jarsigner-typos' Merge topic 'UseJava-relative-manifest' Merge topic 'FindJNI-aix' Merge topic 'update-kwsys' Merge topic 'cmake-E-copy-multiple-inputs' Merge topic 'find-ftn-by-default' Merge topic 'FindTIFF-imported-targets' Merge topic 'cpack-rpm-percomponent-group-and-name' Merge topic 'detect-cray-wrappers' Merge topic 'cmake-E-copy-multiple-inputs' cmELF: Use KWIML ABI.h header to get endian-ness Help: Rename release notes for topic 'cmake-E-multiple-inputs' FindOpenAL: Detect Windows architecture-specific installation Merge topic 'cmELF-use-KWIML' Merge branch 'upstream-kwsys' into update-kwsys Tests: Simplify CTest.UpdateGIT repo path construction Utilities/Release: Avoid repeat copy of files with same suffix Utilities/Release: Add support for copying .msi files CMake: Fix WiX-generated .msi package file name convention Merge topic 'cmake-E-multiple-inputs' Merge topic 'FindOpenAL-win-arch' Merge topic 'graphviz-spaces' Merge topic 'cmake-W-options' Merge topic 'update-kwsys' Merge topic 'wix-fix-comp-install-prop' Merge topic 'FindOpenMP-clang' Merge topic 'release-wix-config' Merge topic 'simplify-CTest.UpdateGIT-test' Merge topic 'ios-universal' Help: Add notes for topic 'FindGTest-imported-targets' Merge topic 'fix-CMP0065-NEW-AIX-HP' Merge topic 'FindGTest-imported-targets' Merge topic 'FindProtobuf-fix-case' Merge branch 'release' Merge topic 'FindOpenGL-no-osx-AGL' Merge branch 'upstream-KWSys' into update-kwsys Add script to update KWSys from upstream Merge branch 'upstream-KWSys' into update-kwsys Utilities/KWIML: Drop sources to make room for fresh import Add script to update KWIML from upstream Merge branch 'upstream-KWIML' into import-kwiml Port CMake from cmIML to KWIML Add option to use a system-installed KWIML Merge topic 'CMakeParseArguments-native-impl' Merge topic 'BundleUtilities-fix-osx-rpath' Merge topic 'update-kwsys' Merge topic 'boost-1.60' Merge topic 'release-wix-config-ng' Merge topic 'fix-absolute-libs-for-cray-wrappers' Merge topic 'import-kwiml' Utilities/Release: Add optional remote launcher to ssh calls Utilities/Release: Optionally load environment on remote build server Utilities/Release: Switch to .msi builder for Windows binary Utilities/Release: Configure Windows binary to support Windows XP Copyright.txt: Update year range to end in 2016 Merge topic 'copyright-year' Merge branch 'upstream-KWSys' into update-kwsys Merge topic 'vs-compiler-id-itanium' Merge topic 'cray-prgev-cleanup' Merge topic 'install-xdgdata-dir' Merge topic 'fix-GenerateExportHeader-on-borland' Merge topic 'xcode-escape-backslash' Merge topic 'xcode-global-attribute-variant' Merge topic 'release-windows' CTestCustom: Suppress -Wshadow warning about Solaris 'single' typedef Merge topic 'update-kwsys' Merge topic 'suppress-Wshadow-single' Merge topic 'cpack-dmg-license-fixes' FindBLAS: Fix pattern matching on BLAS vendor name Merge topic 'FindBLAS-intel-64lp' Merge topic 'vs14-debug-enum' cmIDEOptions: Add support for case-insensitive flags VS: Drop unused condition in link debug flag generation VS: Map the link `/debug` to its IDE property Record compile features for MinGW Clang on Windows (#15897) Merge branch 'upstream-KWSys' into update-kwsys FindwxWidgets: Drop suppression of -isystem Merge topic 'vs-link-debug-property' Merge topic 'vs-global-properties' Merge topic 'mingw-clang-compile-features' Merge topic 'update-kwsys' Merge topic 'FindwxWidgets-use-isystem' Merge topic 'vs-win10-sdk' Merge branch 'release' Merge branch 'upstream-KWSys' into update-kwsys VS: Map link `/debug:fastlink` flag to VS 2015 IDE property (#15894) Merge topic 'update-kwsys' Merge topic 'FindPkgConfig-share-dir' Merge topic 'cmake-W-options' Merge topic 'vs-debug-fastlink' bootstrap: Add option to build with system liblzma (#15916) Merge topic 'install-DIRECTORY-genex' Merge topic 'bootstap-system-liblzma' Merge topic 'report_failed_tests' Merge topic 'FindDCMTK-update' FindCUDA: Support special characters in path (#15919) Tests: Isolate policy changes in ExportImport test Tests: Use CMP0022 NEW behavior in some ExportImport cases Fix export of STATIC library PRIVATE dependencies with CMP0022 NEW Windows: Find Program Files directories more robustly from environment Merge topic 'windows-program-files' Merge topic 'rpath-preserve-compiler-defined' Merge topic 'FindCUDA-verbatim' Merge topic 'doc-export-compile-commands' Merge topic 'ExternalProject-git-clone-o' Merge topic 'FindPkgConfig-fix-restore' Merge topic 'export-static-private-depend' Merge branch 'release' Merge branch 'release' cmake: Change `-E chdir` to pass through stdout/stderr directly cmcmd.cxx: Remove unused code in __run_iwyu implementation cmSystemTools: Rename OUTPUT_NORMAL to OUTPUT_FORWARD to clarify its purpose cmSystemTools: Drop redundant condition in RunSingleCommand cmSystemTools: Simplify RunSingleCommand output string construction cmSystemTools: Teach RunSingleCommand to merge child pipes when possible Merge topic 'FindPkgConfig-protect-semicolons' Merge topic 'java-updates' Merge topic 'cache-parse-error-line-number' Merge topic 'mfc-utility-targets' Merge topic 'cleanup-RunSingleCommand' ExternalProject: Simplify `cmake --build` configuration passing ExternalProject: Fix TEST_BEFORE_INSTALL for multi-config generators cmake: Fix `-E time` argument passing to child Tests: Cover fltk_wrap_ui on an executable that links libraries Merge topic 'GetPrerequisites-ms-ucrt' Merge topic 'ExternalProject-ctest-config' Merge topic 'cmake-E-time-quoting' Merge topic 'add-FindXalanC' Merge topic 'reduce-allocations' Merge topic 'fix-pkg_search_module-cache' Merge topic 'fix-use-generator-target' Merge topic 'FindPNG-imported-targets' Merge topic 'test-fltk_wrap_ui' Merge topic 'FindBoost-1.61' Merge topic 'vs-win10-sdk' Merge branch 'release' Merge branch 'release' UseJava: Fix documented name of `CLASSDIR` property (#15936) FindGit: Improve documentation formatting Merge topic 'UseJava-fix-doc-typo' add_custom_command: Clarify error when TARGET is out of scope (#15681) cmConditionEvaluator: Fix matching of `CMAKE_MATCH_*` values (#15944) Merge topic 'clarify-add_custom_command-TARGET-scope' Merge topic 'FindGit-updates' Merge topic 'doc-cmake-developer-typo' Help: Consolidate 3.5 release notes Help: Organize and revise 3.5 release notes Merge topic 'fix-CMAKE_MATCH-self-match' Merge topic 'remove-stray-semicolon' Merge topic 'doc-3.5-relnotes' Help: Drop development topic notes to prepare release CMake 3.5.0-rc1 version update Chris Davies (3): FindFLEX: Use CMAKE_PARSE_ARGUMENTS to parse arguments FindFLEX: Fix typo in ADD_FLEX_BISON_DEPENDENCY errors FindFLEX: Add a DEFINES_FILE option to specify flex-generated header (#15781) Chris Pavlina (1): FindOpenMP: Add Clang support Christoph Gr?ninger (2): FindGit: Document Git_FOUND, unset internal var cmAlgorithms.h: remove superfluous semicolon after method Chuck Atkins (9): Cray: New platform file for Cray Linux Environment and PrgEnv Cray: Added documentation for cross compiling on a Cray Cray: Fix static / dynamic detection logic and parse more driver flags Fortran: Add ftn, the Cray compiler wrapper, to the default search. Compiler: Add infrastructure for detecting compiler wrappers Cray: Add macro tests to detect the Cray compiler wrappers Cray: Refactor the Cray platform files to use compiler wrapper checks CrayPrgEnv: Don't use absolute paths for imlicit libraries CrayPrgEnv: Cleanup binaries from implicit compile flag detection Clinton Stimpson (2): Help: Clarify documentation for MACOSX_RPATH variable. Fix MFC setting on utility targets (#15867) Colin Tracey (1): CPackNSIS: Add options to set the bitmap for NSIS installer left side Daniele E. Domenichelli (2): FindGTK2: Enable c++11 for sigc++ 2.5.1 or later FindGTK2: Use targets in GTK2_LIBRARIES if GTK2_USE_IMPORTED_TARGETS is ON David Gobbi (1): FindOpenGL: Don't add AGL to OPENGL_LIBRARIES on OS X. Domen Vrankar (5): CPackDeb: additional CPACK_DEBIAN_PACKAGE_SECTION documentation CPackDeb: set priority control field per component CPackDeb: CPACK_DEBIAN_PACKAGE_NAME documentation improvement Help: Add notes for topic 'cpack-deb-new-component-vars' CPack: Added tests for package name and group controll fields Emilie Harquel (1): BundleUtilities: Fix handling of multiple RPATHs from OS X otool Geoff Viola (1): GHS: Remove extra flag to GHS MULTI compiler (#15771) Gregor Jasny (11): Xcode: Use regular expression to extract all optimisation flags (#15794) Xcode: Recognise Watch and TV OS as embedded platforms Xcode: Set LastUpgradeCheck to current Xcode version (#15817) Add test for OSX/iOS Framework directory structure (#15833) cmake-gui: Add regex explorer window iOS: Fix App Bundle layout Xcode: Factor out XCODE_ATTRIBUTE_ variant filter (#14947) Xcode: Make CMAKE_XCODE_ATTRIBUTE calculation last step (#14947) Xcode: Store configuration name along with XcodeObject (#14947) Xcode: Parse variant and genex for CMAKE_XCODE_ATTRIBUTE (#14947) Xcode: Escape all backslashes in strings (#15328) James Johnston (6): Embarcadero: Fix bug where duplicate Ninja job pools would be created. Embarcadero/Watcom: Properly skip VSResource test for other generators. Embarcadero: Check code using CMAKE_CXX_COMPILER_ID and CMAKE_C_COMPILER_ID. Compiler ID: Compiler versions must be a valid, numeric version string. Embarcadero: Fix erroneous interpretation of __CODEGEARC_VERSION__. GenerateExportHeader: Work around buggy std::getline behavior in BCB5. Jean-Christophe Fillion-Robin (1): FindDCMTK: Improve compatibility with DCMTKConfig.cmake. Joakim Andersson (1): Add support for the ARM Compiler (arm.com) Joseph Snyder (2): Tests: Fix DelphiCoverage test file selection CTest: Expand directories for Cobertura search KWIML Upstream (1): KWIML 2015-12-09 (43f9f8d0) KWSys Robot (6): KWSys 2015-10-06 (d79801bb) KWSys 2015-10-06 (ed82989c) KWSys 2015-10-16 (a7e5360f) KWSys 2015-12-01 (9596e98d) KWSys 2015-12-03 (6bfc1aef) KWSys 2015-12-09 (cdcf4c47) KWSys Upstream (5): KWSys 2015-12-09 (cdcf4c47) KWSys 2015-12-14 (c1149ef6) KWSys 2016-01-07 (2418443e) KWSys 2016-01-11 (e8bf616e) KWSys 2016-01-11 (bc07fbf7) Kevin Burge (1): cmake-mode.el: unscreamify symbols instead of words Kevin Wojniak (1): FindGit: Search in 'Atlassian SourceTree' user directory (#15758) Kitware Robot (120): CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp CMake Nightly Date Stamp LibArchive Upstream (1): libarchive 3.1.2-601-g3bfe5f1 (reduced) Lior Goldberg (1): install: Do not remove compiler-defined RPATH entries Marc Chevrier (4): CheckForPthreads.c: Do not use C++-style comments in C source UseJava: Allow relative path to manifest file just as with other sources FindJNI: Add support for AIX java sdk UseJava: Fix create_javah CLASSPATH handling on Windows Marek Vasut (1): KWIML: Teach ABI.h that NIOS2 CPU is little-endian Markus Rickert (3): CPackDeb: set section control field per component CPackDeb: set package control field per component CPackRPM: Configure RPM package group and name per component Matt McCormick (5): FindDCMTK: Obey QUIET option for find_package. FindDCMTK: Minor documentation grammatical issues. FindDCMTK: Keep original copyright notice. FindDCMTK: Add reStructuredText formatting. FindDCMTK: Simplify documentation. Matthias Maennich (3): CMakeParseArguments: add a RunCMake test suite CMakeParseArguments: replace by native cmake_parse_arguments command cmake_parse_arguments: consider duplicate keyword as warning Michael Scott (12): Tests: Revise message in RunCMake.CommandLine -Wdev case Make message suppression more consistent. Explicitly enable author (dev) warnings by default. Refactor the -W options parser to be generic. Add -W options to control deprecated warning messages. Consistent documentation for deprecation message variables. Modify dev warning options to affect deprecated warnings. Explicitly enable deprecated warnings by default. cmake-gui: Add options to control warning messages cmake: Deduplicate warning message control code Add -Werror and -Wno-error command-line options cmake-gui: Add options to control warning-as-error messages Mike Fitzgerald (1): VS: Implement VS_GLOBAL_* target properties in VS 2010+ (#13666) Milian Wolff (5): Remove temporary allocations when calling cmGeneratorTarget::GetName. Remove temporary allocations by extending the lifetime of the retval. Remove temporary allocations in cmMacroHelper::InvokeInitialPass. Optimize cmMakefile::ExpandVariablesInStringNew. Remove temporary allocations when calling cmHasLiteral{Suf,Pre}fix. Niels Ole Salscheider (1): QtDialog: Add option to control XDG file install destination Nils Gladitz (6): CPackWIX: Handle text nodes in XML patch content CPackWIX: Don't allow users to deselect the top-level feature (#15838) CPackWIX: Fix installed file property lookups when using components CPackWIX: Allow patching of shortcut components CPackWIX: Allow multiple patch files and diagnose if any are missing CMake: Mimic NSIS options dialog in WiX installer Prayag Verma (1): Help: Fix typo in `cmake-developer(7)` manual Raffi Enficiaud (3): CPackDeb: ctest tests for compression scheme leak CPackDEB: minor documentation and debug logging fixes CPackDEB: added config file optional Source field Rob Gowin (2): FindPkgConfig: Fix restoration of PKG_CONFIG_PATH in environment FindPkgConfig: Quote ${_pkgconfig_path} to protect semicolons on Windows Robert Dailey (1): cmake-gui: Add option to specify generator toolset Robert Maynard (4): CPack/DragNDrop: Use source file extension for background image CPack/DragNDrop: Place the background image file in a hidden folder CPack/DragNDrop: Optionally run an AppleScript when making a package CPack/DragNDrop: Update documentation to include new variables Roger Leigh (11): FindXercesC: Add imported targets and unit test Utilities: Add BoostScanDeps script FindBoost: Embed component dependency table FindBoost: Automatically add missing component dependencies FindBoost: Add imported targets Tests: Add FindBoost testcase for imported targets FindTIFF: Add imported targets and update documentation FindGTest: Add imported targets and update documentation Tests: Add tests for FindGTest FindBoost: Add support for Boost 1.60 FindXalanC: New module to find the Apache Xalan-C++ library Rolf Eike Beer (1): FindCUDA: drop CUDA_dl_LIBRARY Ruslan Baratov (1): Xcode: Add support for combined install on iOS Sam Thursfield (2): FindPkgConfig: add PREFIX/share/pkgconfig to PKG_CONFIG_PATH (#15910) FindPNG: Create an imported PNG::PNG target (#15911) Sean McBride (1): Fix trivial clang -Wdouble-promotion warnings Sebastian Schuberth (2): FindProtobuf: Set Protobuf_FOUND in addition to PROTOBUF_FOUND Help: Document the CMAKE_EXPORT_COMPILE_COMMANDS variable Sergei Nikulov (1): FindBoost: Add support for Boost 1.61 Simon Levermann (3): CPackDMG: Add support for multilingual SLAs CPack/DragNDrop: Use documented CPACK_DMG_SLA_LANGUAGES variable CPack/DragNDrop: Allow single license for multiple languages Stephen Kelly (281): cmExportFileGenerator: Evaluate genex with cmGeneratorTarget. cmExportTryCompileFileGenerator: Evaluate genex with cmGeneratorTarget. Xcode: Extract a AddExtraIDETargets method. cmGlobalGenerator: Call AddExtraIDETargets as a hook of Compute(). VisualStudio10: Initialize the LongestSource at generate time. VisualStudio: Replace Compute override with AddExtraIDETargets override. cmGlobalGenerator: De-virtualize Compute(). cmGlobalGenerator: Do more computation at compute time. cmGlobalGenerator: Move path computation to Compute. QtAutogen: Move SetupSourceFiles method. QtAutogen: Move GetCompileDefinitionsAndDirectories method. QtAutogen: Move SetupAutoMocTarget method. QtAutogen: Move GetUicOpts method. QtAutogen: Move SetupAutoUicTarget method. QtAutogen: Move GetRccExecutable method. QtAutogen: Move MergeRccOptions method. QtAutogen: Move SetupAutoRccTarget method. QtAutogen: Make some private statics file static. QtAutogen: Use a target type between loops. QtAutogen: Port global generator to cmGeneratorTarget. cmLocalGenerator: Constify target in API. CPack: Remove needless cmLocalGenerator creation. CTest: Remove needless cmLocalGenerator creation. CTest: Port away from cmLocalGenerator. cmake: Remove needless cmLocalGenerator creation. Add cmOutputConverter include where needed. Remove unused cmLocalGenerator include. QtAutogen: Port API to cmGeneratorTarget. cmFLTKWrapUI: Remove CMake 2.2 compat code. cmGeneratorTarget: Rename internal member. cmTarget: Join strings conditionally. Xcode: Port away from unnecessary CMP0049 compatibility. cmMakefile: Move invokation to initialize snapshot. GHS: Port API to cmGeneratorTarget. Access sources through cmGeneratorTarget. cmGeneratorTarget: Add methods for generate-time source addition. cmTarget: Add API for generate-time source addition. cmTarget: Add Compute API for sources. cmTarget: Split storage of sources from genexes. cmTarget: Remove a conditional for generate-time source addition. cmGeneratorTarget: Move AddInterfaceEntries method. cmGeneratorTarget: Inline GetSourceFiles from cmTarget. cmGeneratorTarget: Move computed sources from cmTarget. cmTarget: Remove Compute method. Set the current dirs on the snapshot before creating the cmMakefile. Remove now-unused directory setters. cmState: Internalize the initialization of a snapshot from its parent. cmLocalGenerator: Add cmake instance accessor. cmGeneratorTarget: Issue messages through the local generator. cmTarget: Split storage of link implementation from backtraces. cmGeneratorTarget: Move link implementation from cmTarget. cmTarget: Make OutputInfo definition public. cmMakefile: Inline initialization of project name. cmCPluginAPI: Inline code to get project name. cmLocalGenerator: Add GetProjectName method. cmMakefile: Remove unused GetProjectName calls. export: Port internal method to cmGeneratorTarget. Kate: Port API to cmLocalGenerator. Kate: Remove unused variables. Eclipse: Port API to cmLocalGenerator. cmLocalGenerator: Add Home directory accessors. cmLocalGenerator: Devirtualize method. C::B: Remove unused variables. cmMakefile: Remove unneeded container clears. cmGeneratorTarget: Use local GetProperty method. cmGeneratorTarget: Move GetDirectory from cmTarget. cmGeneratorTarget: Move GetPDBDirectory from cmTarget. cmGeneratorTarget: Move UsesDefaultOutputDir from cmTarget. cmGeneratorTarget: Move output info from cmTarget. cmGeneratorTarget: Move IsNullImpliedByLinkLibraries from cmTarget. cmGeneratorTarget: Move ComputePDBOutputDir from cmTarget. cmGeneratorTarget: Move HaveInstallTreeRPATH from cmTarget. cmComputeLinkDepends: Remove unused typedef. cmGeneratorTarget: Move HasMacOSXRpathInstallNameDir from cmTarget. cmGeneratorTarget: Move GetOutputTargetType from cmTarget. cmGeneratorTarget: Move IsImportedSharedLibWithoutSOName from cmTarget. cmLocalGenerator: Add current binary directory accessor. cmLocalGenerator: Add current source directory accessor. Remove some needless GetMakefile() calls. cmComputeLinkDepends: Port some API to cmGeneratorTarget. cmGeneratorTarget: Port processILibs away from cmTarget. cmGeneratorTarget: Port GetLinkInterfaceLibraries away from cmTarget. cmGeneratorTarget: Port cmTargetCollectLinkLanguages away from cmTarget. cmGeneratorTarget: Port GetLinkInterface away from cmTarget. cmGeneratorTarget: Port ComputeLinkInterfaceLibraries away from cmTarget. cmGeneratorTarget: Port ComputeLinkInterface away from cmTarget. cmGeneratorTarget: Port GetLinkImplementationLibrariesInternal. cmGeneratorTarget: Port handleSystemIncludesDep away from cmTarget. cmGeneratorTarget: Port ComputeLinkImplementationLibraries away from cmTarget. cmGeneratorTarget: Port GetImportLinkInterface away from cmTarget. cmake: Use existing cache API wrapper. cmake: Port away from trivial cmCacheManager use. Always cache entries through the cmake instance. cmCacheManager: Remove cmMakefile dependency. Inline unary LoadCache. cmState: Add cache file manipulation wrappers. cmCacheManager: Port away from cmake instance. cmState: Make AddCacheEntry method private. cmState: Externalize logic to caller. cmState: Add API for cache version. cmState: Move ParseCacheEntry from cmCacheManager. cmState: Port away from cmake instance. cmGeneratorTarget: Port ExpandLinkItems away from cmTarget. cmComputeLinkInformation: Port some implementation to cmGeneratorTarget. cmComputeLinkInformation: Port data interface to cmGeneratorTarget. cmComputeLinkInformation: Port result API to cmGeneratorTarget. cmComputeLinkDepends: Port result API to cmGeneratorTarget. cmGeneratorTarget: Move GetUtilityItems from cmTarget. cmHeadToLinkInterfaceMap: Port to cmGeneratorTarget. cmGeneratorTarget: Move FindTargetToLink from cmTarget. cmLinkItem: Port to cmGeneratorTarget. cmCommonTargetGenerator: Port implementation detail to cmGeneratorTarget. cmGeneratorTarget: Port LinkImplClosure to cmGeneratorTarget. cmGeneratorTarget: Port handleSystemIncludesDep to cmGeneratorTarget. cmGeneratorTarget: Port getTypedProperty to cmGeneratorTarget. cmGeneratorTarget: Port processILibs to cmGeneratorTarget. Sublime: Port some API to cmGeneratorTarget. cmGeneratorTarget: Move HasImplibGNUtoMS from cmTarget. cmGeneratorTarget: Move HasImportLibrary from cmTarget. cmGeneratorTarget: Move GetSupportDirectory from cmTarget. Genex: Port implementation detail to cmGeneratorTarget. cmGeneratorExpression: Port to cmLocalGenerator. cmGeneratorExpression: Port interface to cmGeneratorTarget. cmMakefile: Set internal definitions directly. cmMakefile: Set default internal definitions directly. cmState: Initialize top level source directories immediately. cmState: Initialize current directories immediately. cmState: Initialize default definitions immediately. cmState: Initialize properties immediately. Subdirs: Initialize from parent before configuring. cmMakefile: Store container of cmExportBuildFileGenerators. cmLocalGenerator: Store cmGeneratorTargets. cmLocalUnixMakefileGenerator3: Port API to cmGenertorTarget. cmLocalUnixMakefileGenerator3: Port another API to cmGeneratorTarget. cmLocalUnixMakefileGenerator3: Port AppendCleanCommand to cmGeneratorTarget. cmLocalGenerator: Port GetTargetDirectory to cmGeneratorTarget. Generators: Use GetType from the cmGeneratorTarget. cmTarget: Remove unneeded constructors. cmTarget: Move backtrace member out of internal class. cmTarget: Move ImportInfoMap out of internal class. cmTarget: Move link type enum out. cmState: Move TargetType enum from cmTarget. cmGeneratorTarget: Use enum for GetType. Remove now-obsolete casts. cmState: Move GetTargetTypeName from cmTarget. Genex: Port implementation to cmGeneratorTarget. Genex: Port some access API to cmGeneratorTarget. cmGeneratorTarget: Port internal class to cmGeneratorTarget. cmGeneratorTarget: Port object library handling to cmGeneratorTarget. cmGeneratorTarget: Port TraceDependencies to cmTarget. cmGeneratorTarget: Move GetObjectLibrariesCMP0026 from cmTarget. cmGeneratorTarget: Port language computation to cmGeneratorTarget. cmGeneratorTarget: Port implementation to cmGeneratorTarget. cmGeneratorTarget: Port Utility items to cmGeneratorTarget. cmGeneratorTarget: Access global state through LocalGenerator. cmGeneratorTarget: Move GetFullNameImported from cmTarget. cmGeneratorTarget: Move ImportedGetLocation from cmTarget. cmTarget: Inline the essential part of imported target location. cmGeneratorTarget: Move ImportInfo from cmTarget. cmGeneratorTarget: Move CheckCMP0004 from cmTarget. cmGeneratorTarget: Move GetTargetVersion from cmTarget. cmGeneratorTarget: Move ComputeVersionedName from cmTarget. Use IsImported from cmGeneratorTarget. Use GetName from cmGeneratorTarget. Use cmGeneratorTarget for property access. cmLocalGenerator: Port some API to cmGeneratorTarget. cmLocalGenerator: Port policy handling to cmGeneratorTarget. cmLocalGenerator: Port PList handling to cmGeneratorTarget. cmGlobalGenerator: Compute export() related classes early. cmExportSet: Store a cmGeneratorTarget. cmExportTryCompileFileGenerator: Port to cmGeneratorTarget. Export: Port interface to cmGeneratorTarget. cmInstallTargetGenerator: Port GetInstallFilename to cmGeneratorTarget. Export: Port some API to cmGlobalGenerator. Export: Port internal utility to cmGeneratorTarget. Export: Port internal API to cmGeneratorTarget. cmGeneratorTarget: Move GetExportName from cmTarget. Xcode: Port internal API to cmGeneratorTarget. cmGeneratorTarget: Move IsLinkable from cmTarget. cmGeneratorTarget: Copy IsFrameworkOnApple from cmTarget. cmGeneratorTarget: Copy IsAppBundleOnApple from cmTarget. cmGeneratorTarget: Move IsXCTestOnApple from cmTarget. cmGeneratorTarget: Move IsCFBundleOnApple from cmTarget. CMP0063: Split unit test by target type. cmLocalGenerator: Don't store imported generator targets cmLocalGenerator: Simplify semantic of adding generator targets. cmMakeDepend: Use public cmMakefile API. Remove vestigial declarations. cmGeneratorTarget: Copy IsExecutableWithExports from cmTarget. cmGlobalGenerator: Port IsRootOnlyTarget to cmGeneratorTarget. cmGeneratorTarget: Provide direct access to the backtrace. cmMakeDepend: Inline into header. cmMakeDepend: Inline into only user. cmMakeDepend: Inline into inheriting class. cmGeneratorTarget: Move GetExportMacro from cmTarget. cmGeneratorTarget: Move HaveWellDefinedOutputFiles from cmTarget. cmGeneratorTarget: Move IsDLLPlatform from cmTarget. Move ComputeLinkType out of cmTarget. cmCommonTargetGenerator: Use NameResolvesToFramework without cmTarget. cmTarget: Remove unused NameResolvesToFramework. cmGeneratorTarget: Copy the policy map from the cmTarget. Access policy status from cmGeneratorTarget at generate time. cmLocalGenerator: Remove cmGeneratorTargetsType from setter API. cmLocalGenerator: Store a vector of generator targets. cmGlobalGenerator: Move GeneratorTargetsType to usage site. cmInstallTargetGenerator: Get a cmGeneratorTarget directly. Makefiles: Port progress marks to cmGeneratorTarget. Port to GetGeneratorTargets. Use cmLocalGenerator at generate-time. Ninja: Port to cmGeneratorTarget. Makefiles: Port to cmGeneratorTarget. Xcode: Port loops to cmGeneratorTarget. Xcode: Port ForceLinkerLanguage to cmGeneratorTarget. Xcode: Re-order conditions. Xcode: Prefer to get target state from cmGeneratorTarget. Xcode: Port API to cmGeneratorTarget. Sublime: Port API to cmGeneratorTarget. GHS: Port to cmGeneratorTarget. C::B: Port API to cmGeneratorTarget. Graphviz: Port to cmGeneratorTarget. VS6: Port to cmGeneratorTarget. VS10: Port to cmGeneratorTarget. VS7: Port to cmGeneratorTarget VS: Port ComputeLongestObjectDirectory to cmGeneratorTarget VS: Port LinkClosure to cmGeneratorTarget VS: Port ImplibDir to cmGeneratorTarget VS: Port loop to cmGeneratorTarget VS: Port WriteProject to cmGeneratorTarget VS: Port TargetIsFortranOnly to cmGeneratorTarget VS: Port ProjectDepends to cmGeneratorTarget. VS: Port target depends to cmGeneratorTarget VS: Port utility depends to cmGeneratorTarget VS: Port WriteUtilityDepends to cmGeneratorTarget VS: Port interface to cmGeneratorTarget cmGeneratorTarget: Add API for target-relative commands. cmGeneratorTarget: Move GetFrameworkVersion from cmTarget cmGeneratorTarget: Add GetLinkDirectories API. Xcode: Remove trailing semicolon Xcode: Fix typo in comment cmFunctionBlocker: Constify method Export: Remove unused variable Makefiles: Remove some unneeded casts Use LocalGenerator when possible cmTarget: Make compatbility API explicit. cmGeneratorTarget: Add GetUtilities API cmGeneratorTarget: Add GetUtilityBacktrace API cmLocalGenerator: Add GetPolicyStatus API Genex: use cmGeneratorTarget policy API cmLocalGenerator: Add IsRootMakefile API cmGeneratorTarget: Move LinkLanguagePropagatesToDependents from cmTarget Export: Use existing IsDLLPlatform porcelain cmake: Store hardcoded lists of sources and headers VS7: Port remaining interface to cmGeneratorTarget VS7: Port some implementation details to cmGeneratorTarget cmLocalGenerator: Port internals to cmGeneratorTarget cmGeneratorTarget: Add API for property keys cmGeneratorTarget: Port cmOptionalLinkImplementation cmTargetCollectLinkLanguages: Remove cmMakefile dependency cmGlobalGenerator: Remove direct storage of targets cmGlobalGenerator: Remove unneeded GetGeneratorTarget cmTarget: Implement ALIAS in terms of name mapping cmLocalGenerator: Port FindGeneratorTarget away from GetGeneratorTarget cmLocalGenerator: Store imported targets in a separate container. Xcode: Port away from GetGeneratorTarget cmGeneratorTarget: Add API for globally visible IMPORTED cmGlobalGenerator: Add FindGeneratorTarget API CMP0026: Port away from GetGeneratorTarget cmMakefile: Add imported target accessor cmake: Port find_package mode away from GetGeneratorTarget VS6: Port to FindGeneratorTarget cmLocalGenerator: Port Find method away from GetGeneratorTarget cmGlobalGenerator: Remove map from cmTarget to cmGeneratorTarget Tests: Don't overwrite RunCMake_TEST_FAILED variable Tests: Disable parallel test execution while running ctest_test Remove some obsolete declarations cmTarget: Fix style cmTarget: Remove obsolete member Makefiles: Remove unused variable cmMakefile: Fix style cmMakefile: Fix typo in comment Alias: Fix access at generate-time (#15832) Tamas Kenez (1): Document and test CMAKE_[CURRENT_](BINARY|SOURCE)_DIR in script mode Terrell Russell (3): Modules: Fix spelling of "succeeded" in check messages bootstrap: Fix spelling of "succeeded" README: Fix typo in wording Thijs Wenker (1): FindOpenSSL: Add support for static MSVC runtime Tim Grothe (2): Refactor `.def` file lookup VS: Add module definition `.def` files to .vcxproj files (#15313) Wayne Stambaugh (2): FindOpenSSL: Tolerate tabs in header while parsing version (#15765) FindOpenSSL: Search for unix-named libraries first on MinGW (#15765) Yves Frederix (1): install: Allow generator expressions in DIRECTORY Zack Galbreath (2): ctest_coverage: Search for Jacoco files in the binary directory ctest_test: Report which tests failed even when QUIET is used ----------------------------------------------------------------------- hooks/post-receive -- CMake From kwrobot at kitware.com Wed Feb 3 00:01:06 2016 From: kwrobot at kitware.com (Kitware Robot) Date: Wed, 3 Feb 2016 00:01:06 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc1-3-ga58abc6 Message-ID: <20160203050106.5179BE4A79@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 a58abc69c23ef30fc2215eb72878af29f7e860fd (commit) from c84dfa7457e37324e417945c3848e38bdb9372fe (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=a58abc69c23ef30fc2215eb72878af29f7e860fd commit a58abc69c23ef30fc2215eb72878af29f7e860fd Author: Kitware Robot AuthorDate: Wed Feb 3 00:01:03 2016 -0500 Commit: Kitware Robot CommitDate: Wed Feb 3 00:01:03 2016 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index f44751e..9539c49 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 5) -set(CMake_VERSION_PATCH 20160202) +set(CMake_VERSION_PATCH 20160203) #set(CMake_VERSION_RC 1) ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 3 11:14:14 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 3 Feb 2016 11:14:14 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-6-g1d96c62 Message-ID: <20160203161414.AF23CE42AB@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, next has been updated via 1d96c624590700cbc8a6997e6149da5d2bca3a86 (commit) via 0205f882ae252998686f65b843a758268b4c62bc (commit) via a58abc69c23ef30fc2215eb72878af29f7e860fd (commit) from 0bbdcec3521d98ec9f3548b39b6705efd43fe4ee (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=1d96c624590700cbc8a6997e6149da5d2bca3a86 commit 1d96c624590700cbc8a6997e6149da5d2bca3a86 Merge: 0bbdcec 0205f88 Author: Brad King AuthorDate: Wed Feb 3 11:14:13 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 3 11:14:13 2016 -0500 Merge topic 'list-FILTER-command' into next 0205f882 list: Add FILTER subcommand (#3986) a58abc69 CMake Nightly Date Stamp https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0205f882ae252998686f65b843a758268b4c62bc commit 0205f882ae252998686f65b843a758268b4c62bc Author: Ashley Whetter AuthorDate: Thu Jan 28 21:29:10 2016 +0000 Commit: Brad King CommitDate: Wed Feb 3 11:13:17 2016 -0500 list: Add FILTER subcommand (#3986) Create a `list(FILTER)` command to filter lists by regular expression. diff --git a/Help/command/list.rst b/Help/command/list.rst index a7a05c7..f6b75bc 100644 --- a/Help/command/list.rst +++ b/Help/command/list.rst @@ -9,6 +9,7 @@ List operations. list(GET [ ...] ) list(APPEND [ ...]) + list(FILTER REGEX ) list(FIND ) list(INSERT [ ...]) list(REMOVE_ITEM [ ...]) @@ -23,6 +24,12 @@ List operations. ``APPEND`` will append elements to the list. +``FILTER`` will include or remove items from the list that match the +mode's pattern. +In ``REGEX`` mode, items will be matched against the given regular expression. +For more information on regular expressions see also the :command:`string` +command. + ``FIND`` will return the index of the element specified in the list or -1 if it wasn't found. @@ -38,9 +45,9 @@ difference is that ``REMOVE_ITEM`` will remove the given items, while ``SORT`` sorts the list in-place alphabetically. -The list subcommands ``APPEND``, ``INSERT``, ``REMOVE_AT``, ``REMOVE_ITEM``, -``REMOVE_DUPLICATES``, ``REVERSE`` and ``SORT`` may create new values for -the list within the current CMake variable scope. Similar to the +The list subcommands ``APPEND``, ``INSERT``, ``FILTER``, ``REMOVE_AT``, +``REMOVE_ITEM``, ``REMOVE_DUPLICATES``, ``REVERSE`` and ``SORT`` may create new +values for the list within the current CMake variable scope. Similar to the :command:`set` command, the LIST command creates new variable values in the current scope, even if the list itself is actually defined in a parent scope. To propagate the results of these operations upwards, use diff --git a/Help/release/dev/list-FILTER-command.rst b/Help/release/dev/list-FILTER-command.rst new file mode 100644 index 0000000..3fee4f0 --- /dev/null +++ b/Help/release/dev/list-FILTER-command.rst @@ -0,0 +1,5 @@ +list-FILTER-command +------------------- + +* The :command:`list` command gained a ``FILTER`` sub-command to filter + list elements by regular expression. diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx index 6041fb7..15a1af5 100644 --- a/Source/cmListCommand.cxx +++ b/Source/cmListCommand.cxx @@ -14,6 +14,7 @@ #include #include "cmAlgorithms.h" +#include #include // required for atoi #include #include @@ -68,6 +69,10 @@ bool cmListCommand { return this->HandleReverseCommand(args); } + if(subCommand == "FILTER") + { + return this->HandleFilterCommand(args); + } std::string e = "does not recognize sub-command "+subCommand; this->SetError(e); @@ -517,3 +522,107 @@ bool cmListCommand::HandleRemoveAtCommand( return true; } +//---------------------------------------------------------------------------- +bool cmListCommand::HandleFilterCommand( + std::vector const& args) +{ + if(args.size() < 2) + { + this->SetError("sub-command FILTER requires a list to be specified."); + return false; + } + + if(args.size() < 3) + { + this->SetError("sub-command FILTER requires an operator to be specified."); + return false; + } + + if(args.size() < 4) + { + this->SetError("sub-command FILTER requires a mode to be specified."); + return false; + } + + const std::string& listName = args[1]; + // expand the variable + std::vector varArgsExpanded; + if ( !this->GetList(varArgsExpanded, listName) ) + { + this->SetError("sub-command FILTER requires list to be present."); + return false; + } + + const std::string& op = args[2]; + bool includeMatches; + if(op == "INCLUDE") + { + includeMatches = true; + } + else if(op == "EXCLUDE") + { + includeMatches = false; + } + else + { + this->SetError("sub-command FILTER does not recognize operator " + op); + return false; + } + + const std::string& mode = args[3]; + if(mode == "REGEX") + { + if(args.size() != 5) + { + this->SetError("sub-command FILTER, mode REGEX " + "requires five arguments."); + return false; + } + return this->FilterRegex(args, includeMatches, listName, varArgsExpanded); + } + + this->SetError("sub-command FILTER does not recognize mode " + mode); + return false; +} + +//---------------------------------------------------------------------------- +class MatchesRegex { +public: + MatchesRegex(cmsys::RegularExpression& in_regex, bool in_includeMatches) + : regex(in_regex), includeMatches(in_includeMatches) {} + + bool operator()(const std::string& target) { + return regex.find(target) ^ includeMatches; + } + +private: + cmsys::RegularExpression& regex; + const bool includeMatches; +}; + +bool cmListCommand::FilterRegex(std::vector const& args, + bool includeMatches, + std::string const& listName, + std::vector& varArgsExpanded) +{ + const std::string& pattern = args[4]; + cmsys::RegularExpression regex(pattern); + if(!regex.is_valid()) + { + std::string error = "sub-command FILTER, mode REGEX "; + error += "failed to compile regex \""; + error += pattern; + error += "\"."; + this->SetError(error); + return false; + } + + std::vector::iterator argsBegin = varArgsExpanded.begin(); + std::vector::iterator argsEnd = varArgsExpanded.end(); + std::vector::iterator newArgsEnd = + std::remove_if(argsBegin, argsEnd, MatchesRegex(regex, includeMatches)); + + std::string value = cmJoin(cmMakeRange(argsBegin, newArgsEnd), ";"); + this->Makefile->AddDefinition(listName, value.c_str()); + return true; +} diff --git a/Source/cmListCommand.h b/Source/cmListCommand.h index 5ea1d9f..25edee8 100644 --- a/Source/cmListCommand.h +++ b/Source/cmListCommand.h @@ -58,6 +58,12 @@ protected: bool HandleRemoveDuplicatesCommand(std::vector const& args); bool HandleSortCommand(std::vector const& args); bool HandleReverseCommand(std::vector const& args); + bool HandleFilterCommand(std::vector const& args); + bool FilterRegex(std::vector const& args, + bool includeMatches, + std::string const& listName, + std::vector& varArgsExpanded + ); bool GetList(std::vector& list, const std::string& var); diff --git a/Tests/RunCMake/list/EmptyFilterRegex-result.txt b/Tests/RunCMake/list/EmptyFilterRegex-result.txt new file mode 100644 index 0000000..573541a --- /dev/null +++ b/Tests/RunCMake/list/EmptyFilterRegex-result.txt @@ -0,0 +1 @@ +0 diff --git a/Tests/RunCMake/list/EmptyFilterRegex-stderr.txt b/Tests/RunCMake/list/EmptyFilterRegex-stderr.txt new file mode 100644 index 0000000..e69de29 diff --git a/Tests/RunCMake/list/EmptyFilterRegex.cmake b/Tests/RunCMake/list/EmptyFilterRegex.cmake new file mode 100644 index 0000000..33849cd --- /dev/null +++ b/Tests/RunCMake/list/EmptyFilterRegex.cmake @@ -0,0 +1,2 @@ +set(mylist "") +list(FILTER mylist INCLUDE REGEX "^FILTER_THIS_.+") diff --git a/Tests/RunCMake/list/FILTER-NotList-result.txt b/Tests/RunCMake/list/FILTER-NotList-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/list/FILTER-NotList-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/list/FILTER-NotList-stderr.txt b/Tests/RunCMake/list/FILTER-NotList-stderr.txt new file mode 100644 index 0000000..159c28d --- /dev/null +++ b/Tests/RunCMake/list/FILTER-NotList-stderr.txt @@ -0,0 +1,4 @@ +^CMake Error at FILTER-NotList.cmake:2 \(list\): + list sub-command FILTER requires list to be present. +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/list/FILTER-NotList.cmake b/Tests/RunCMake/list/FILTER-NotList.cmake new file mode 100644 index 0000000..1e15635 --- /dev/null +++ b/Tests/RunCMake/list/FILTER-NotList.cmake @@ -0,0 +1,2 @@ +unset(nosuchlist) +list(FILTER nosuchlist EXCLUDE REGEX "^FILTER_THIS_.+") diff --git a/Tests/RunCMake/list/FILTER-REGEX-InvalidMode-result.txt b/Tests/RunCMake/list/FILTER-REGEX-InvalidMode-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/list/FILTER-REGEX-InvalidMode-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/list/FILTER-REGEX-InvalidMode-stderr.txt b/Tests/RunCMake/list/FILTER-REGEX-InvalidMode-stderr.txt new file mode 100644 index 0000000..7f783fa --- /dev/null +++ b/Tests/RunCMake/list/FILTER-REGEX-InvalidMode-stderr.txt @@ -0,0 +1,4 @@ +^CMake Error at FILTER-REGEX-InvalidMode.cmake:2 \(list\): + list sub-command FILTER does not recognize mode NOOP +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/list/FILTER-REGEX-InvalidMode.cmake b/Tests/RunCMake/list/FILTER-REGEX-InvalidMode.cmake new file mode 100644 index 0000000..e02b929 --- /dev/null +++ b/Tests/RunCMake/list/FILTER-REGEX-InvalidMode.cmake @@ -0,0 +1,2 @@ +set(mylist FILTER_THIS_BIT DO_NOT_FILTER_THIS thisisanitem FILTER_THIS_THING) +list(FILTER mylist EXCLUDE NOOP "^FILTER_THIS_.+") diff --git a/Tests/RunCMake/list/FILTER-REGEX-InvalidOperator-result.txt b/Tests/RunCMake/list/FILTER-REGEX-InvalidOperator-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/list/FILTER-REGEX-InvalidOperator-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/list/FILTER-REGEX-InvalidOperator-stderr.txt b/Tests/RunCMake/list/FILTER-REGEX-InvalidOperator-stderr.txt new file mode 100644 index 0000000..94f2427 --- /dev/null +++ b/Tests/RunCMake/list/FILTER-REGEX-InvalidOperator-stderr.txt @@ -0,0 +1,4 @@ +^CMake Error at FILTER-REGEX-InvalidOperator.cmake:2 \(list\): + list sub-command FILTER does not recognize operator RM +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/list/FILTER-REGEX-InvalidOperator.cmake b/Tests/RunCMake/list/FILTER-REGEX-InvalidOperator.cmake new file mode 100644 index 0000000..9624622 --- /dev/null +++ b/Tests/RunCMake/list/FILTER-REGEX-InvalidOperator.cmake @@ -0,0 +1,2 @@ +set(mylist FILTER_THIS_BIT DO_NOT_FILTER_THIS thisisanitem FILTER_THIS_THING) +list(FILTER mylist RM REGEX "^FILTER_THIS_.+") diff --git a/Tests/RunCMake/list/FILTER-REGEX-InvalidRegex-result.txt b/Tests/RunCMake/list/FILTER-REGEX-InvalidRegex-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/list/FILTER-REGEX-InvalidRegex-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/list/FILTER-REGEX-InvalidRegex-stderr.txt b/Tests/RunCMake/list/FILTER-REGEX-InvalidRegex-stderr.txt new file mode 100644 index 0000000..9e98cbf --- /dev/null +++ b/Tests/RunCMake/list/FILTER-REGEX-InvalidRegex-stderr.txt @@ -0,0 +1,4 @@ +^CMake Error at FILTER-REGEX-InvalidRegex.cmake:2 \(list\): + list sub-command FILTER, mode REGEX failed to compile regex "UHOH!\)\(". +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/list/FILTER-REGEX-InvalidRegex.cmake b/Tests/RunCMake/list/FILTER-REGEX-InvalidRegex.cmake new file mode 100644 index 0000000..0641062 --- /dev/null +++ b/Tests/RunCMake/list/FILTER-REGEX-InvalidRegex.cmake @@ -0,0 +1,2 @@ +set(mylist FILTER_THIS_BIT DO_NOT_FILTER_THIS thisisanitem FILTER_THIS_THING) +list(FILTER mylist EXCLUDE REGEX "UHOH!)(") diff --git a/Tests/RunCMake/list/FILTER-REGEX-TooManyArguments-result.txt b/Tests/RunCMake/list/FILTER-REGEX-TooManyArguments-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/list/FILTER-REGEX-TooManyArguments-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/list/FILTER-REGEX-TooManyArguments-stderr.txt b/Tests/RunCMake/list/FILTER-REGEX-TooManyArguments-stderr.txt new file mode 100644 index 0000000..ec7f41c --- /dev/null +++ b/Tests/RunCMake/list/FILTER-REGEX-TooManyArguments-stderr.txt @@ -0,0 +1,4 @@ +^CMake Error at FILTER-REGEX-TooManyArguments.cmake:2 \(list\): + list sub-command FILTER, mode REGEX requires five arguments. +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/list/FILTER-REGEX-TooManyArguments.cmake b/Tests/RunCMake/list/FILTER-REGEX-TooManyArguments.cmake new file mode 100644 index 0000000..d9cd8eb --- /dev/null +++ b/Tests/RunCMake/list/FILTER-REGEX-TooManyArguments.cmake @@ -0,0 +1,2 @@ +set(mylist FILTER_THIS_BIT DO_NOT_FILTER_THIS thisisanitem FILTER_THIS_THING) +list(FILTER mylist EXCLUDE REGEX "^FILTER_THIS_.+" one_too_many) diff --git a/Tests/RunCMake/list/FILTER-REGEX-Valid0-result.txt b/Tests/RunCMake/list/FILTER-REGEX-Valid0-result.txt new file mode 100644 index 0000000..573541a --- /dev/null +++ b/Tests/RunCMake/list/FILTER-REGEX-Valid0-result.txt @@ -0,0 +1 @@ +0 diff --git a/Tests/RunCMake/list/FILTER-REGEX-Valid0-stderr.txt b/Tests/RunCMake/list/FILTER-REGEX-Valid0-stderr.txt new file mode 100644 index 0000000..d9ba38d --- /dev/null +++ b/Tests/RunCMake/list/FILTER-REGEX-Valid0-stderr.txt @@ -0,0 +1,2 @@ +^mylist was: FILTER_THIS_BIT;DO_NOT_FILTER_THIS;thisisanitem;FILTER_THIS_THING +mylist is: DO_NOT_FILTER_THIS;thisisanitem$ diff --git a/Tests/RunCMake/list/FILTER-REGEX-Valid0.cmake b/Tests/RunCMake/list/FILTER-REGEX-Valid0.cmake new file mode 100644 index 0000000..f395e61 --- /dev/null +++ b/Tests/RunCMake/list/FILTER-REGEX-Valid0.cmake @@ -0,0 +1,4 @@ +set(mylist FILTER_THIS_BIT DO_NOT_FILTER_THIS thisisanitem FILTER_THIS_THING) +message("mylist was: ${mylist}") +list(FILTER mylist EXCLUDE REGEX "^FILTER_THIS_.+") +message("mylist is: ${mylist}") diff --git a/Tests/RunCMake/list/FILTER-REGEX-Valid1-result.txt b/Tests/RunCMake/list/FILTER-REGEX-Valid1-result.txt new file mode 100644 index 0000000..573541a --- /dev/null +++ b/Tests/RunCMake/list/FILTER-REGEX-Valid1-result.txt @@ -0,0 +1 @@ +0 diff --git a/Tests/RunCMake/list/FILTER-REGEX-Valid1-stderr.txt b/Tests/RunCMake/list/FILTER-REGEX-Valid1-stderr.txt new file mode 100644 index 0000000..5e5280d --- /dev/null +++ b/Tests/RunCMake/list/FILTER-REGEX-Valid1-stderr.txt @@ -0,0 +1,2 @@ +^mylist was: FILTER_THIS_BIT;DO_NOT_FILTER_THIS;thisisanitem;FILTER_THIS_THING +mylist is: FILTER_THIS_BIT;FILTER_THIS_THING$ diff --git a/Tests/RunCMake/list/FILTER-REGEX-Valid1.cmake b/Tests/RunCMake/list/FILTER-REGEX-Valid1.cmake new file mode 100644 index 0000000..e659281 --- /dev/null +++ b/Tests/RunCMake/list/FILTER-REGEX-Valid1.cmake @@ -0,0 +1,4 @@ +set(mylist FILTER_THIS_BIT DO_NOT_FILTER_THIS thisisanitem FILTER_THIS_THING) +message("mylist was: ${mylist}") +list(FILTER mylist INCLUDE REGEX "^FILTER_THIS_.+") +message("mylist is: ${mylist}") diff --git a/Tests/RunCMake/list/RunCMakeTest.cmake b/Tests/RunCMake/list/RunCMakeTest.cmake index 25d6a03..b002ab3 100644 --- a/Tests/RunCMake/list/RunCMakeTest.cmake +++ b/Tests/RunCMake/list/RunCMakeTest.cmake @@ -1,5 +1,6 @@ include(RunCMake) +run_cmake(EmptyFilterRegex) run_cmake(EmptyGet0) run_cmake(EmptyRemoveAt0) run_cmake(EmptyInsert-1) @@ -8,17 +9,25 @@ run_cmake(NoArguments) run_cmake(InvalidSubcommand) run_cmake(GET-CMP0007-WARN) +run_cmake(FILTER-REGEX-InvalidRegex) run_cmake(GET-InvalidIndex) run_cmake(INSERT-InvalidIndex) run_cmake(REMOVE_AT-InvalidIndex) +run_cmake(FILTER-REGEX-TooManyArguments) run_cmake(LENGTH-TooManyArguments) run_cmake(REMOVE_DUPLICATES-TooManyArguments) run_cmake(REVERSE-TooManyArguments) run_cmake(SORT-TooManyArguments) +run_cmake(FILTER-NotList) run_cmake(REMOVE_AT-NotList) run_cmake(REMOVE_DUPLICATES-NotList) run_cmake(REMOVE_ITEM-NotList) run_cmake(REVERSE-NotList) run_cmake(SORT-NotList) + +run_cmake(FILTER-REGEX-InvalidMode) +run_cmake(FILTER-REGEX-InvalidOperator) +run_cmake(FILTER-REGEX-Valid0) +run_cmake(FILTER-REGEX-Valid1) ----------------------------------------------------------------------- Summary of changes: Help/command/list.rst | 13 ++- Help/release/dev/list-FILTER-command.rst | 5 + Source/CMakeVersion.cmake | 2 +- Source/cmListCommand.cxx | 109 ++++++++++++++++++++ Source/cmListCommand.h | 6 ++ .../EmptyFilterRegex-result.txt} | 0 .../RunCMake/list/EmptyFilterRegex-stderr.txt | 0 Tests/RunCMake/list/EmptyFilterRegex.cmake | 2 + .../FILTER-NotList-result.txt} | 0 Tests/RunCMake/list/FILTER-NotList-stderr.txt | 4 + Tests/RunCMake/list/FILTER-NotList.cmake | 2 + .../FILTER-REGEX-InvalidMode-result.txt} | 0 .../list/FILTER-REGEX-InvalidMode-stderr.txt | 4 + Tests/RunCMake/list/FILTER-REGEX-InvalidMode.cmake | 2 + .../FILTER-REGEX-InvalidOperator-result.txt} | 0 .../list/FILTER-REGEX-InvalidOperator-stderr.txt | 4 + .../list/FILTER-REGEX-InvalidOperator.cmake | 2 + .../FILTER-REGEX-InvalidRegex-result.txt} | 0 .../list/FILTER-REGEX-InvalidRegex-stderr.txt | 4 + .../RunCMake/list/FILTER-REGEX-InvalidRegex.cmake | 2 + .../FILTER-REGEX-TooManyArguments-result.txt} | 0 .../list/FILTER-REGEX-TooManyArguments-stderr.txt | 4 + .../list/FILTER-REGEX-TooManyArguments.cmake | 2 + .../FILTER-REGEX-Valid0-result.txt} | 0 Tests/RunCMake/list/FILTER-REGEX-Valid0-stderr.txt | 2 + Tests/RunCMake/list/FILTER-REGEX-Valid0.cmake | 4 + .../FILTER-REGEX-Valid1-result.txt} | 0 Tests/RunCMake/list/FILTER-REGEX-Valid1-stderr.txt | 2 + Tests/RunCMake/list/FILTER-REGEX-Valid1.cmake | 4 + Tests/RunCMake/list/RunCMakeTest.cmake | 9 ++ 30 files changed, 184 insertions(+), 4 deletions(-) create mode 100644 Help/release/dev/list-FILTER-command.rst copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => list/EmptyFilterRegex-result.txt} (100%) copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/list/EmptyFilterRegex-stderr.txt (100%) create mode 100644 Tests/RunCMake/list/EmptyFilterRegex.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => list/FILTER-NotList-result.txt} (100%) create mode 100644 Tests/RunCMake/list/FILTER-NotList-stderr.txt create mode 100644 Tests/RunCMake/list/FILTER-NotList.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => list/FILTER-REGEX-InvalidMode-result.txt} (100%) create mode 100644 Tests/RunCMake/list/FILTER-REGEX-InvalidMode-stderr.txt create mode 100644 Tests/RunCMake/list/FILTER-REGEX-InvalidMode.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => list/FILTER-REGEX-InvalidOperator-result.txt} (100%) create mode 100644 Tests/RunCMake/list/FILTER-REGEX-InvalidOperator-stderr.txt create mode 100644 Tests/RunCMake/list/FILTER-REGEX-InvalidOperator.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => list/FILTER-REGEX-InvalidRegex-result.txt} (100%) create mode 100644 Tests/RunCMake/list/FILTER-REGEX-InvalidRegex-stderr.txt create mode 100644 Tests/RunCMake/list/FILTER-REGEX-InvalidRegex.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => list/FILTER-REGEX-TooManyArguments-result.txt} (100%) create mode 100644 Tests/RunCMake/list/FILTER-REGEX-TooManyArguments-stderr.txt create mode 100644 Tests/RunCMake/list/FILTER-REGEX-TooManyArguments.cmake copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => list/FILTER-REGEX-Valid0-result.txt} (100%) create mode 100644 Tests/RunCMake/list/FILTER-REGEX-Valid0-stderr.txt create mode 100644 Tests/RunCMake/list/FILTER-REGEX-Valid0.cmake copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => list/FILTER-REGEX-Valid1-result.txt} (100%) create mode 100644 Tests/RunCMake/list/FILTER-REGEX-Valid1-stderr.txt create mode 100644 Tests/RunCMake/list/FILTER-REGEX-Valid1.cmake hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 3 14:25:42 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 3 Feb 2016 14:25:42 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-10-g47bd1c7 Message-ID: <20160203192542.E192CE4D3E@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, next has been updated via 47bd1c7197d01ebca3239efc4223db2082be2340 (commit) via cee30e168b4e540866fa5e17f6b8d6d2916d8572 (commit) via 670fa89705023cd5709693464d827727f3aa738a (commit) via 0b6c47295d5ddf7b281ae0634414886b6207ae74 (commit) from 1d96c624590700cbc8a6997e6149da5d2bca3a86 (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=47bd1c7197d01ebca3239efc4223db2082be2340 commit 47bd1c7197d01ebca3239efc4223db2082be2340 Merge: 1d96c62 cee30e1 Author: Brad King AuthorDate: Wed Feb 3 14:25:41 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 3 14:25:41 2016 -0500 Merge topic 'install-EXCLUDE_FROM_ALL' into next cee30e16 Help: Add notes for topic 'install-EXCLUDE_FROM_ALL' 670fa897 Tests: Add cases for install() command EXCLUDE_FROM_ALL option 0b6c4729 install: Add EXCLUDE_FROM_ALL option (#14921) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cee30e168b4e540866fa5e17f6b8d6d2916d8572 commit cee30e168b4e540866fa5e17f6b8d6d2916d8572 Author: Brad King AuthorDate: Wed Feb 3 14:12:29 2016 -0500 Commit: Brad King CommitDate: Wed Feb 3 14:19:14 2016 -0500 Help: Add notes for topic 'install-EXCLUDE_FROM_ALL' diff --git a/Help/release/dev/install-EXCLUDE_FROM_ALL.rst b/Help/release/dev/install-EXCLUDE_FROM_ALL.rst new file mode 100644 index 0000000..a611eae --- /dev/null +++ b/Help/release/dev/install-EXCLUDE_FROM_ALL.rst @@ -0,0 +1,5 @@ +install-EXCLUDE_FROM_ALL +------------------------ + +* The :command:`install` command learned a new ``EXCLUDE_FROM_ALL`` option + to leave installation rules out of the default installation. https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=670fa89705023cd5709693464d827727f3aa738a commit 670fa89705023cd5709693464d827727f3aa738a Author: Brad King AuthorDate: Wed Feb 3 14:10:55 2016 -0500 Commit: Brad King CommitDate: Wed Feb 3 14:19:14 2016 -0500 Tests: Add cases for install() command EXCLUDE_FROM_ALL option diff --git a/Tests/RunCMake/install/EXCLUDE_FROM_ALL-FILES-install-stdout.txt b/Tests/RunCMake/install/EXCLUDE_FROM_ALL-FILES-install-stdout.txt new file mode 100644 index 0000000..517cee2 --- /dev/null +++ b/Tests/RunCMake/install/EXCLUDE_FROM_ALL-FILES-install-stdout.txt @@ -0,0 +1,3 @@ +-- Install configuration: "[^"]*" +-- Installing: [^ +]*/Tests/RunCMake/install/EXCLUDE_FROM_ALL-FILES-build/root/src-all/main\.c$ diff --git a/Tests/RunCMake/install/EXCLUDE_FROM_ALL-FILES.cmake b/Tests/RunCMake/install/EXCLUDE_FROM_ALL-FILES.cmake new file mode 100644 index 0000000..00db5d0 --- /dev/null +++ b/Tests/RunCMake/install/EXCLUDE_FROM_ALL-FILES.cmake @@ -0,0 +1,2 @@ +install(FILES main.c DESTINATION src-all) +install(FILES main.c DESTINATION src-exc EXCLUDE_FROM_ALL) diff --git a/Tests/RunCMake/install/EXCLUDE_FROM_ALL-TARGETS-install-stdout.txt b/Tests/RunCMake/install/EXCLUDE_FROM_ALL-TARGETS-install-stdout.txt new file mode 100644 index 0000000..17672f2 --- /dev/null +++ b/Tests/RunCMake/install/EXCLUDE_FROM_ALL-TARGETS-install-stdout.txt @@ -0,0 +1,3 @@ +-- Install configuration: "[^"]*" +-- Installing: [^ +]*/Tests/RunCMake/install/EXCLUDE_FROM_ALL-TARGETS-build/root/bin/myexe(\.exe)?$ diff --git a/Tests/RunCMake/install/EXCLUDE_FROM_ALL-TARGETS.cmake b/Tests/RunCMake/install/EXCLUDE_FROM_ALL-TARGETS.cmake new file mode 100644 index 0000000..16e8a90 --- /dev/null +++ b/Tests/RunCMake/install/EXCLUDE_FROM_ALL-TARGETS.cmake @@ -0,0 +1,5 @@ +enable_language(C) +add_executable(myexe main.c) +add_executable(mytest main.c) +install(TARGETS myexe DESTINATION bin) +install(TARGETS mytest DESTINATION bin EXCLUDE_FROM_ALL) diff --git a/Tests/RunCMake/install/RunCMakeTest.cmake b/Tests/RunCMake/install/RunCMakeTest.cmake index 2c1b29d..c57e5ec 100644 --- a/Tests/RunCMake/install/RunCMakeTest.cmake +++ b/Tests/RunCMake/install/RunCMakeTest.cmake @@ -13,3 +13,15 @@ run_cmake(TARGETS-DESTINATION-bad) run_cmake(CMP0062-OLD) run_cmake(CMP0062-NEW) run_cmake(CMP0062-WARN) + +function(run_install_test case) + set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${case}-build) + set(RunCMake_TEST_NO_CLEAN 1) + set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX:PATH=${RunCMake_TEST_BINARY_DIR}/root") + file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}") + file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}") + run_cmake(${case}) + run_cmake_command(${case}-install ${CMAKE_COMMAND} --build . --target install) +endfunction() +run_install_test(EXCLUDE_FROM_ALL-FILES) +run_install_test(EXCLUDE_FROM_ALL-TARGETS) diff --git a/Tests/RunCMake/install/main.c b/Tests/RunCMake/install/main.c new file mode 100644 index 0000000..78f2de1 --- /dev/null +++ b/Tests/RunCMake/install/main.c @@ -0,0 +1 @@ +int main(void) { return 0; } https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0b6c47295d5ddf7b281ae0634414886b6207ae74 commit 0b6c47295d5ddf7b281ae0634414886b6207ae74 Author: Nick Lewis AuthorDate: Mon Feb 1 10:01:39 2016 +0000 Commit: Brad King CommitDate: Wed Feb 3 11:16:36 2016 -0500 install: Add EXCLUDE_FROM_ALL option (#14921) Let us take an example of a project that has some tests in a component that need to be installed into a dedicated test package. The user expectation is that the result could be achieved by typing the following: make make tests make install DESTDIR=/testpkgs make install-tests However this results in test components in the default installation as well as the testpkg. Add an EXCLUDE_FROM_ALL option to the install() command to tell it that the installation rule should not be included unless its component is explicitly specified for installation. diff --git a/Help/command/install.rst b/Help/command/install.rst index 5d2add7..e0e18f2 100644 --- a/Help/command/install.rst +++ b/Help/command/install.rst @@ -45,9 +45,9 @@ signatures that specify them. The common options are: is associated, such as "runtime" or "development". During component-specific installation only install rules associated with the given component name will be executed. During a full installation - all components are installed. If ``COMPONENT`` is not provided a - default component "Unspecified" is created. The default component - name may be controlled with the + all components are installed unless marked with EXCLUDE_FROM_ALL. + If ``COMPONENT`` is not provided a default component "Unspecified" is + created. The default component name may be controlled with the :variable:`CMAKE_INSTALL_DEFAULT_COMPONENT_NAME` variable. ``RENAME`` @@ -76,7 +76,8 @@ Installing Targets [PERMISSIONS permissions...] [CONFIGURATIONS [Debug|Release|...]] [COMPONENT ] - [OPTIONAL] [NAMELINK_ONLY|NAMELINK_SKIP] + [OPTIONAL] [EXCLUDE_FROM_ALL] + [NAMELINK_ONLY|NAMELINK_SKIP] ] [...]) The ``TARGETS`` form specifies rules for installing targets from a diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx index 15a83ee..aa92d74 100644 --- a/Source/cmInstallCommand.cxx +++ b/Source/cmInstallCommand.cxx @@ -33,6 +33,7 @@ static cmInstallTargetGenerator* CreateInstallTargetGenerator(cmTarget& target, impLib, args.GetPermissions().c_str(), args.GetConfigurations(), args.GetComponent().c_str(), message, + args.GetExcludeFromAll(), args.GetOptional() || forceOpt); } @@ -48,7 +49,8 @@ static cmInstallFilesGenerator* CreateInstallFilesGenerator( programs, args.GetPermissions().c_str(), args.GetConfigurations(), args.GetComponent().c_str(), message, - args.GetRename().c_str(), args.GetOptional()); + args.GetExcludeFromAll(), args.GetRename().c_str(), + args.GetOptional()); } @@ -117,6 +119,7 @@ bool cmInstallCommand::HandleScriptMode(std::vector const& args) int componentCount = 0; bool doing_script = false; bool doing_code = false; + bool exclude_from_all = false; // Scan the args once for COMPONENT. Only allow one. // @@ -128,6 +131,10 @@ bool cmInstallCommand::HandleScriptMode(std::vector const& args) ++i; component = args[i]; } + if(args[i] == "EXCLUDE_FROM_ALL") + { + exclude_from_all = true; + } } if(componentCount>1) @@ -175,7 +182,7 @@ bool cmInstallCommand::HandleScriptMode(std::vector const& args) } this->Makefile->AddInstallGenerator( new cmInstallScriptGenerator(script.c_str(), false, - component.c_str())); + component.c_str(), exclude_from_all)); } else if(doing_code) { @@ -183,7 +190,7 @@ bool cmInstallCommand::HandleScriptMode(std::vector const& args) std::string code = args[i]; this->Makefile->AddInstallGenerator( new cmInstallScriptGenerator(code.c_str(), true, - component.c_str())); + component.c_str(), exclude_from_all)); } } @@ -949,6 +956,7 @@ cmInstallCommand::HandleDirectoryMode(std::vector const& args) Doing doing = DoingDirs; bool in_match_mode = false; bool optional = false; + bool exclude_from_all = false; bool message_never = false; std::vector dirs; const char* destination = 0; @@ -1130,6 +1138,19 @@ cmInstallCommand::HandleDirectoryMode(std::vector const& args) // Switch to setting the component property. doing = DoingComponent; } + else if(args[i] == "EXCLUDE_FROM_ALL") + { + if(in_match_mode) + { + std::ostringstream e; + e << args[0] << " does not allow \"" + << args[i] << "\" after PATTERN or REGEX."; + this->SetError(e.str().c_str()); + return false; + } + exclude_from_all = true; + doing = DoingNone; + } else if(doing == DoingDirs) { // Convert this directory to a full path. @@ -1273,6 +1294,7 @@ cmInstallCommand::HandleDirectoryMode(std::vector const& args) configurations, component.c_str(), message, + exclude_from_all, literal_args.c_str(), optional)); @@ -1401,7 +1423,8 @@ bool cmInstallCommand::HandleExportMode(std::vector const& args) exportSet, ica.GetDestination().c_str(), ica.GetPermissions().c_str(), ica.GetConfigurations(), - ica.GetComponent().c_str(), message, fname.c_str(), + ica.GetComponent().c_str(), message, + ica.GetExcludeFromAll(), fname.c_str(), name_space.GetCString(), exportOld.IsEnabled()); this->Makefile->AddInstallGenerator(exportGenerator); diff --git a/Source/cmInstallCommandArguments.cxx b/Source/cmInstallCommandArguments.cxx index 236ca1f..6ded365 100644 --- a/Source/cmInstallCommandArguments.cxx +++ b/Source/cmInstallCommandArguments.cxx @@ -27,14 +27,15 @@ cmInstallCommandArguments::cmInstallCommandArguments( const std::string& defaultComponent) :Parser() ,ArgumentGroup() -,Destination (&Parser, "DESTINATION" , &ArgumentGroup) -,Component (&Parser, "COMPONENT" , &ArgumentGroup) -,Rename (&Parser, "RENAME" , &ArgumentGroup) -,Permissions (&Parser, "PERMISSIONS" , &ArgumentGroup) -,Configurations(&Parser, "CONFIGURATIONS", &ArgumentGroup) -,Optional (&Parser, "OPTIONAL" , &ArgumentGroup) -,NamelinkOnly (&Parser, "NAMELINK_ONLY" , &ArgumentGroup) -,NamelinkSkip (&Parser, "NAMELINK_SKIP" , &ArgumentGroup) +,Destination (&Parser, "DESTINATION" , &ArgumentGroup) +,Component (&Parser, "COMPONENT" , &ArgumentGroup) +,ExcludeFromAll(&Parser, "EXCLUDE_FROM_ALL", &ArgumentGroup) +,Rename (&Parser, "RENAME" , &ArgumentGroup) +,Permissions (&Parser, "PERMISSIONS" , &ArgumentGroup) +,Configurations(&Parser, "CONFIGURATIONS" , &ArgumentGroup) +,Optional (&Parser, "OPTIONAL" , &ArgumentGroup) +,NamelinkOnly (&Parser, "NAMELINK_ONLY" , &ArgumentGroup) +,NamelinkSkip (&Parser, "NAMELINK_SKIP" , &ArgumentGroup) ,GenericArguments(0) ,DefaultComponentName(defaultComponent) { @@ -110,6 +111,19 @@ bool cmInstallCommandArguments::GetOptional() const return false; } +bool cmInstallCommandArguments::GetExcludeFromAll() const +{ + if (this->ExcludeFromAll.IsEnabled()) + { + return true; + } + if (this->GenericArguments!=0) + { + return this->GenericArguments->GetExcludeFromAll(); + } + return false; +} + bool cmInstallCommandArguments::GetNamelinkOnly() const { if (this->NamelinkOnly.IsEnabled()) diff --git a/Source/cmInstallCommandArguments.h b/Source/cmInstallCommandArguments.h index 90347e6..694f1ed 100644 --- a/Source/cmInstallCommandArguments.h +++ b/Source/cmInstallCommandArguments.h @@ -30,6 +30,7 @@ class cmInstallCommandArguments const std::string& GetDestination() const; const std::string& GetComponent() const; + bool GetExcludeFromAll() const; const std::string& GetRename() const; const std::string& GetPermissions() const; const std::vector& GetConfigurations() const; @@ -48,6 +49,7 @@ class cmInstallCommandArguments cmInstallCommandArguments(); // disabled cmCAString Destination; cmCAString Component; + cmCAEnabler ExcludeFromAll; cmCAString Rename; cmCAStringVector Permissions; cmCAStringVector Configurations; diff --git a/Source/cmInstallDirectoryGenerator.cxx b/Source/cmInstallDirectoryGenerator.cxx index f2e8609..6ad6c75 100644 --- a/Source/cmInstallDirectoryGenerator.cxx +++ b/Source/cmInstallDirectoryGenerator.cxx @@ -23,9 +23,11 @@ cmInstallDirectoryGenerator std::vector const& configurations, const char* component, MessageLevel message, + bool exclude_from_all, const char* literal_args, bool optional): - cmInstallGenerator(dest, configurations, component, message), + cmInstallGenerator(dest, configurations, component, message, + exclude_from_all), LocalGenerator(0), Directories(dirs), FilePermissions(file_permissions), DirPermissions(dir_permissions), diff --git a/Source/cmInstallDirectoryGenerator.h b/Source/cmInstallDirectoryGenerator.h index 9b732d3..b137f44 100644 --- a/Source/cmInstallDirectoryGenerator.h +++ b/Source/cmInstallDirectoryGenerator.h @@ -27,6 +27,7 @@ public: std::vector const& configurations, const char* component, MessageLevel message, + bool exclude_from_all, const char* literal_args, bool optional = false); virtual ~cmInstallDirectoryGenerator(); diff --git a/Source/cmInstallExportGenerator.cxx b/Source/cmInstallExportGenerator.cxx index 9570ba3..80fc054 100644 --- a/Source/cmInstallExportGenerator.cxx +++ b/Source/cmInstallExportGenerator.cxx @@ -33,9 +33,11 @@ cmInstallExportGenerator::cmInstallExportGenerator( std::vector const& configurations, const char* component, MessageLevel message, + bool exclude_from_all, const char* filename, const char* name_space, bool exportOld) - :cmInstallGenerator(destination, configurations, component, message) + :cmInstallGenerator(destination, configurations, component, message, + exclude_from_all) ,ExportSet(exportSet) ,FilePermissions(file_permissions) ,FileName(filename) diff --git a/Source/cmInstallExportGenerator.h b/Source/cmInstallExportGenerator.h index 885ed05..1b1c046 100644 --- a/Source/cmInstallExportGenerator.h +++ b/Source/cmInstallExportGenerator.h @@ -31,6 +31,7 @@ public: const std::vector& configurations, const char* component, MessageLevel message, + bool exclude_from_all, const char* filename, const char* name_space, bool exportOld); ~cmInstallExportGenerator(); diff --git a/Source/cmInstallFilesCommand.cxx b/Source/cmInstallFilesCommand.cxx index 68557bd..d3d258e 100644 --- a/Source/cmInstallFilesCommand.cxx +++ b/Source/cmInstallFilesCommand.cxx @@ -122,6 +122,7 @@ void cmInstallFilesCommand::CreateInstallGenerator() const // Use a file install generator. const char* no_permissions = ""; const char* no_rename = ""; + bool no_exclude_from_all = false; std::string no_component = this->Makefile->GetSafeDefinition( "CMAKE_INSTALL_DEFAULT_COMPONENT_NAME"); std::vector no_configurations; @@ -131,7 +132,8 @@ void cmInstallFilesCommand::CreateInstallGenerator() const new cmInstallFilesGenerator(this->Files, destination.c_str(), false, no_permissions, no_configurations, - no_component.c_str(), message, no_rename)); + no_component.c_str(), message, + no_exclude_from_all, no_rename)); } diff --git a/Source/cmInstallFilesGenerator.cxx b/Source/cmInstallFilesGenerator.cxx index 383031b..3dd5528 100644 --- a/Source/cmInstallFilesGenerator.cxx +++ b/Source/cmInstallFilesGenerator.cxx @@ -24,9 +24,11 @@ cmInstallFilesGenerator std::vector const& configurations, const char* component, MessageLevel message, + bool exclude_from_all, const char* rename, bool optional): - cmInstallGenerator(dest, configurations, component, message), + cmInstallGenerator(dest, configurations, component, message, + exclude_from_all), LocalGenerator(0), Files(files), FilePermissions(file_permissions), diff --git a/Source/cmInstallFilesGenerator.h b/Source/cmInstallFilesGenerator.h index bfe4039..efaf62b 100644 --- a/Source/cmInstallFilesGenerator.h +++ b/Source/cmInstallFilesGenerator.h @@ -26,6 +26,7 @@ public: std::vector const& configurations, const char* component, MessageLevel message, + bool exclude_from_all, const char* rename, bool optional = false); virtual ~cmInstallFilesGenerator(); diff --git a/Source/cmInstallGenerator.cxx b/Source/cmInstallGenerator.cxx index 2e1c5f0..660e44f 100644 --- a/Source/cmInstallGenerator.cxx +++ b/Source/cmInstallGenerator.cxx @@ -19,11 +19,13 @@ cmInstallGenerator ::cmInstallGenerator(const char* destination, std::vector const& configurations, const char* component, - MessageLevel message): + MessageLevel message, + bool exclude_from_all): cmScriptGenerator("CMAKE_INSTALL_CONFIG_NAME", configurations), Destination(destination? destination:""), Component(component? component:""), - Message(message) + Message(message), + ExcludeFromAll(exclude_from_all) { } @@ -146,12 +148,16 @@ void cmInstallGenerator //---------------------------------------------------------------------------- std::string -cmInstallGenerator::CreateComponentTest(const char* component) +cmInstallGenerator::CreateComponentTest(const char* component, + bool exclude_from_all) { - std::string result = "NOT CMAKE_INSTALL_COMPONENT OR " - "\"${CMAKE_INSTALL_COMPONENT}\" STREQUAL \""; + std::string result = "\"${CMAKE_INSTALL_COMPONENT}\" STREQUAL \""; result += component; result += "\""; + if(!exclude_from_all) + { + result += " OR NOT CMAKE_INSTALL_COMPONENT"; + } return result; } @@ -163,7 +169,7 @@ void cmInstallGenerator::GenerateScript(std::ostream& os) // Begin this block of installation. std::string component_test = - this->CreateComponentTest(this->Component.c_str()); + this->CreateComponentTest(this->Component.c_str(),this->ExcludeFromAll); os << indent << "if(" << component_test << ")\n"; // Generate the script possibly with per-configuration code. diff --git a/Source/cmInstallGenerator.h b/Source/cmInstallGenerator.h index b8e5b53..db89590 100644 --- a/Source/cmInstallGenerator.h +++ b/Source/cmInstallGenerator.h @@ -36,7 +36,8 @@ public: cmInstallGenerator(const char* destination, std::vector const& configurations, const char* component, - MessageLevel message); + MessageLevel message, + bool exclude_from_all); virtual ~cmInstallGenerator(); void AddInstallRule( @@ -67,12 +68,14 @@ public: protected: virtual void GenerateScript(std::ostream& os); - std::string CreateComponentTest(const char* component); + std::string CreateComponentTest(const char* component, + bool exclude_from_all); // Information shared by most generator types. std::string Destination; std::string Component; MessageLevel Message; + bool ExcludeFromAll; }; #endif diff --git a/Source/cmInstallProgramsCommand.cxx b/Source/cmInstallProgramsCommand.cxx index e6fbe88..b6d0c45 100644 --- a/Source/cmInstallProgramsCommand.cxx +++ b/Source/cmInstallProgramsCommand.cxx @@ -85,6 +85,7 @@ void cmInstallProgramsCommand::FinalPass() // Use a file install generator. const char* no_permissions = ""; const char* no_rename = ""; + bool no_exclude_from_all = false; std::string no_component = this->Makefile->GetSafeDefinition( "CMAKE_INSTALL_DEFAULT_COMPONENT_NAME"); std::vector no_configurations; @@ -94,7 +95,8 @@ void cmInstallProgramsCommand::FinalPass() new cmInstallFilesGenerator(this->Files, destination.c_str(), true, no_permissions, no_configurations, - no_component.c_str(), message, no_rename)); + no_component.c_str(), message, + no_exclude_from_all, no_rename)); } /** diff --git a/Source/cmInstallScriptGenerator.cxx b/Source/cmInstallScriptGenerator.cxx index 933aa07..d58d039 100644 --- a/Source/cmInstallScriptGenerator.cxx +++ b/Source/cmInstallScriptGenerator.cxx @@ -14,8 +14,9 @@ //---------------------------------------------------------------------------- cmInstallScriptGenerator ::cmInstallScriptGenerator(const char* script, bool code, - const char* component) : - cmInstallGenerator(0, std::vector(), component, MessageDefault), + const char* component, bool exclude_from_all) : + cmInstallGenerator(0, std::vector(), component, MessageDefault, + exclude_from_all), Script(script), Code(code) { } @@ -31,7 +32,7 @@ void cmInstallScriptGenerator::GenerateScript(std::ostream& os) { Indent indent; std::string component_test = - this->CreateComponentTest(this->Component.c_str()); + this->CreateComponentTest(this->Component.c_str(), this->ExcludeFromAll); os << indent << "if(" << component_test << ")\n"; if(this->Code) diff --git a/Source/cmInstallScriptGenerator.h b/Source/cmInstallScriptGenerator.h index 54a7b21..7e7c0c8 100644 --- a/Source/cmInstallScriptGenerator.h +++ b/Source/cmInstallScriptGenerator.h @@ -21,7 +21,7 @@ class cmInstallScriptGenerator: public cmInstallGenerator { public: cmInstallScriptGenerator(const char* script, bool code, - const char* component); + const char* component, bool exclude_from_all); virtual ~cmInstallScriptGenerator(); protected: diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx index 5e88fa2..3d44fe2 100644 --- a/Source/cmInstallTargetGenerator.cxx +++ b/Source/cmInstallTargetGenerator.cxx @@ -30,8 +30,10 @@ cmInstallTargetGenerator std::vector const& configurations, const char* component, MessageLevel message, + bool exclude_from_all, bool optional): - cmInstallGenerator(dest, configurations, component, message), + cmInstallGenerator(dest, configurations, component, message, + exclude_from_all), TargetName(targetName), Target(0), FilePermissions(file_permissions), diff --git a/Source/cmInstallTargetGenerator.h b/Source/cmInstallTargetGenerator.h index 18b3130..46b4532 100644 --- a/Source/cmInstallTargetGenerator.h +++ b/Source/cmInstallTargetGenerator.h @@ -28,6 +28,7 @@ public: std::vector const& configurations, const char* component, MessageLevel message, + bool exclude_from_all, bool optional ); virtual ~cmInstallTargetGenerator(); diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 1d17032..6b73987 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -2557,7 +2557,7 @@ public: cmInstallTargetGenerator( t, dest, implib, "", std::vector(), "Unspecified", cmInstallGenerator::SelectMessageLevel(lg->GetMakefile()), - false) + false, false) { this->Compute(lg); } @@ -2584,7 +2584,7 @@ cmLocalGenerator // Include the user-specified pre-install script for this target. if(const char* preinstall = (*l)->GetProperty("PRE_INSTALL_SCRIPT")) { - cmInstallScriptGenerator g(preinstall, false, 0); + cmInstallScriptGenerator g(preinstall, false, 0, false); g.Generate(os, config, configurationTypes); } @@ -2645,7 +2645,7 @@ cmLocalGenerator // Include the user-specified post-install script for this target. if(const char* postinstall = (*l)->GetProperty("POST_INSTALL_SCRIPT")) { - cmInstallScriptGenerator g(postinstall, false, 0); + cmInstallScriptGenerator g(postinstall, false, 0, false); g.Generate(os, config, configurationTypes); } } ----------------------------------------------------------------------- Summary of changes: Help/command/install.rst | 9 +++--- Help/release/dev/install-EXCLUDE_FROM_ALL.rst | 5 ++++ Source/cmInstallCommand.cxx | 31 +++++++++++++++++--- Source/cmInstallCommandArguments.cxx | 30 ++++++++++++++----- Source/cmInstallCommandArguments.h | 2 ++ Source/cmInstallDirectoryGenerator.cxx | 4 ++- Source/cmInstallDirectoryGenerator.h | 1 + Source/cmInstallExportGenerator.cxx | 4 ++- Source/cmInstallExportGenerator.h | 1 + Source/cmInstallFilesCommand.cxx | 4 ++- Source/cmInstallFilesGenerator.cxx | 4 ++- Source/cmInstallFilesGenerator.h | 1 + Source/cmInstallGenerator.cxx | 18 ++++++++---- Source/cmInstallGenerator.h | 7 +++-- Source/cmInstallProgramsCommand.cxx | 4 ++- Source/cmInstallScriptGenerator.cxx | 7 +++-- Source/cmInstallScriptGenerator.h | 2 +- Source/cmInstallTargetGenerator.cxx | 4 ++- Source/cmInstallTargetGenerator.h | 1 + Source/cmLocalGenerator.cxx | 6 ++-- .../EXCLUDE_FROM_ALL-FILES-install-stdout.txt | 3 ++ .../RunCMake/install/EXCLUDE_FROM_ALL-FILES.cmake | 2 ++ .../EXCLUDE_FROM_ALL-TARGETS-install-stdout.txt | 3 ++ .../install/EXCLUDE_FROM_ALL-TARGETS.cmake | 5 ++++ Tests/RunCMake/install/RunCMakeTest.cmake | 12 ++++++++ .../LinkInterfaceLoop => RunCMake/install}/main.c | 0 26 files changed, 133 insertions(+), 37 deletions(-) create mode 100644 Help/release/dev/install-EXCLUDE_FROM_ALL.rst create mode 100644 Tests/RunCMake/install/EXCLUDE_FROM_ALL-FILES-install-stdout.txt create mode 100644 Tests/RunCMake/install/EXCLUDE_FROM_ALL-FILES.cmake create mode 100644 Tests/RunCMake/install/EXCLUDE_FROM_ALL-TARGETS-install-stdout.txt create mode 100644 Tests/RunCMake/install/EXCLUDE_FROM_ALL-TARGETS.cmake copy Tests/{CMakeOnly/LinkInterfaceLoop => RunCMake/install}/main.c (100%) hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 3 14:36:00 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 3 Feb 2016 14:36:00 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-12-g72a585d Message-ID: <20160203193600.611C4E4E0D@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, next has been updated via 72a585d3534616b0cf4b241d3b6eeb50f44da79a (commit) via 99a9c7e51a3980807c60a9ec7532db0ca9495e5f (commit) from 47bd1c7197d01ebca3239efc4223db2082be2340 (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=72a585d3534616b0cf4b241d3b6eeb50f44da79a commit 72a585d3534616b0cf4b241d3b6eeb50f44da79a Merge: 47bd1c7 99a9c7e Author: Brad King AuthorDate: Wed Feb 3 14:35:59 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 3 14:35:59 2016 -0500 Merge topic 'iar_ninja_support' into next 99a9c7e5 IAR: Add support for using this compiler with the Ninja generator https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=99a9c7e51a3980807c60a9ec7532db0ca9495e5f commit 99a9c7e51a3980807c60a9ec7532db0ca9495e5f Author: Juhani Simola AuthorDate: Sat Jan 30 20:54:26 2016 +0200 Commit: Brad King CommitDate: Wed Feb 3 14:35:06 2016 -0500 IAR: Add support for using this compiler with the Ninja generator The dependency flags require recent versions of `iccarm` and `iccavr`. The multi-rule dependency generated with `--dependencies=m` does not work well with Ninja, so use `--dependencies=ns` instead. diff --git a/Modules/Compiler/IAR-C.cmake b/Modules/Compiler/IAR-C.cmake index d2c7df9..f1b6ff7 100644 --- a/Modules/Compiler/IAR-C.cmake +++ b/Modules/Compiler/IAR-C.cmake @@ -7,6 +7,9 @@ set(CMAKE_C_COMPILE_OBJECT " --preprocess=cnl ") set(CMAKE_C_CREATE_ASSEMBLY_SOURCE " -lAH -o .dummy") +set(CMAKE_C_RESPONSE_FILE_LINK_FLAG "-f") +set(CMAKE_DEPFILE_FLAGS_C "--dependencies=ns ") + # The toolchains for ARM and AVR are quite different: if("${IAR_TARGET_ARCHITECTURE}" STREQUAL "ARM") diff --git a/Modules/Compiler/IAR-CXX.cmake b/Modules/Compiler/IAR-CXX.cmake index 03ecdf1..ffb144f 100644 --- a/Modules/Compiler/IAR-CXX.cmake +++ b/Modules/Compiler/IAR-CXX.cmake @@ -7,7 +7,8 @@ set(CMAKE_CXX_COMPILE_OBJECT " --preprocess=cnl ") set(CMAKE_CXX_CREATE_ASSEMBLY_SOURCE " -lAH -o .dummy") - +set(CMAKE_CXX_RESPONSE_FILE_LINK_FLAG "-f") +set(CMAKE_DEPFILE_FLAGS_CXX "--dependencies=ns ") if("${IAR_TARGET_ARCHITECTURE}" STREQUAL "ARM") ----------------------------------------------------------------------- Summary of changes: Modules/Compiler/IAR-C.cmake | 3 +++ Modules/Compiler/IAR-CXX.cmake | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 3 16:14:01 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 3 Feb 2016 16:14:01 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-14-gc29302b Message-ID: <20160203211401.4FDC3E432C@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, next has been updated via c29302b3f3ff6ca0822afe0a19c66bad12542ac9 (commit) via 8e0dd2f2b1a9fb315475914d1716c34acf4ce9db (commit) from 72a585d3534616b0cf4b241d3b6eeb50f44da79a (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=c29302b3f3ff6ca0822afe0a19c66bad12542ac9 commit c29302b3f3ff6ca0822afe0a19c66bad12542ac9 Merge: 72a585d 8e0dd2f Author: Brad King AuthorDate: Wed Feb 3 16:13:59 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 3 16:13:59 2016 -0500 Merge topic 'install-EXCLUDE_FROM_ALL' into next 8e0dd2f2 Revert topic 'install-EXCLUDE_FROM_ALL' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8e0dd2f2b1a9fb315475914d1716c34acf4ce9db commit 8e0dd2f2b1a9fb315475914d1716c34acf4ce9db Author: Brad King AuthorDate: Wed Feb 3 16:13:26 2016 -0500 Commit: Brad King CommitDate: Wed Feb 3 16:13:34 2016 -0500 Revert topic 'install-EXCLUDE_FROM_ALL' The test infrastructure needs more work to pass everywhere. diff --git a/Help/command/install.rst b/Help/command/install.rst index e0e18f2..5d2add7 100644 --- a/Help/command/install.rst +++ b/Help/command/install.rst @@ -45,9 +45,9 @@ signatures that specify them. The common options are: is associated, such as "runtime" or "development". During component-specific installation only install rules associated with the given component name will be executed. During a full installation - all components are installed unless marked with EXCLUDE_FROM_ALL. - If ``COMPONENT`` is not provided a default component "Unspecified" is - created. The default component name may be controlled with the + all components are installed. If ``COMPONENT`` is not provided a + default component "Unspecified" is created. The default component + name may be controlled with the :variable:`CMAKE_INSTALL_DEFAULT_COMPONENT_NAME` variable. ``RENAME`` @@ -76,8 +76,7 @@ Installing Targets [PERMISSIONS permissions...] [CONFIGURATIONS [Debug|Release|...]] [COMPONENT ] - [OPTIONAL] [EXCLUDE_FROM_ALL] - [NAMELINK_ONLY|NAMELINK_SKIP] + [OPTIONAL] [NAMELINK_ONLY|NAMELINK_SKIP] ] [...]) The ``TARGETS`` form specifies rules for installing targets from a diff --git a/Help/release/dev/install-EXCLUDE_FROM_ALL.rst b/Help/release/dev/install-EXCLUDE_FROM_ALL.rst deleted file mode 100644 index a611eae..0000000 --- a/Help/release/dev/install-EXCLUDE_FROM_ALL.rst +++ /dev/null @@ -1,5 +0,0 @@ -install-EXCLUDE_FROM_ALL ------------------------- - -* The :command:`install` command learned a new ``EXCLUDE_FROM_ALL`` option - to leave installation rules out of the default installation. diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx index aa92d74..15a83ee 100644 --- a/Source/cmInstallCommand.cxx +++ b/Source/cmInstallCommand.cxx @@ -33,7 +33,6 @@ static cmInstallTargetGenerator* CreateInstallTargetGenerator(cmTarget& target, impLib, args.GetPermissions().c_str(), args.GetConfigurations(), args.GetComponent().c_str(), message, - args.GetExcludeFromAll(), args.GetOptional() || forceOpt); } @@ -49,8 +48,7 @@ static cmInstallFilesGenerator* CreateInstallFilesGenerator( programs, args.GetPermissions().c_str(), args.GetConfigurations(), args.GetComponent().c_str(), message, - args.GetExcludeFromAll(), args.GetRename().c_str(), - args.GetOptional()); + args.GetRename().c_str(), args.GetOptional()); } @@ -119,7 +117,6 @@ bool cmInstallCommand::HandleScriptMode(std::vector const& args) int componentCount = 0; bool doing_script = false; bool doing_code = false; - bool exclude_from_all = false; // Scan the args once for COMPONENT. Only allow one. // @@ -131,10 +128,6 @@ bool cmInstallCommand::HandleScriptMode(std::vector const& args) ++i; component = args[i]; } - if(args[i] == "EXCLUDE_FROM_ALL") - { - exclude_from_all = true; - } } if(componentCount>1) @@ -182,7 +175,7 @@ bool cmInstallCommand::HandleScriptMode(std::vector const& args) } this->Makefile->AddInstallGenerator( new cmInstallScriptGenerator(script.c_str(), false, - component.c_str(), exclude_from_all)); + component.c_str())); } else if(doing_code) { @@ -190,7 +183,7 @@ bool cmInstallCommand::HandleScriptMode(std::vector const& args) std::string code = args[i]; this->Makefile->AddInstallGenerator( new cmInstallScriptGenerator(code.c_str(), true, - component.c_str(), exclude_from_all)); + component.c_str())); } } @@ -956,7 +949,6 @@ cmInstallCommand::HandleDirectoryMode(std::vector const& args) Doing doing = DoingDirs; bool in_match_mode = false; bool optional = false; - bool exclude_from_all = false; bool message_never = false; std::vector dirs; const char* destination = 0; @@ -1138,19 +1130,6 @@ cmInstallCommand::HandleDirectoryMode(std::vector const& args) // Switch to setting the component property. doing = DoingComponent; } - else if(args[i] == "EXCLUDE_FROM_ALL") - { - if(in_match_mode) - { - std::ostringstream e; - e << args[0] << " does not allow \"" - << args[i] << "\" after PATTERN or REGEX."; - this->SetError(e.str().c_str()); - return false; - } - exclude_from_all = true; - doing = DoingNone; - } else if(doing == DoingDirs) { // Convert this directory to a full path. @@ -1294,7 +1273,6 @@ cmInstallCommand::HandleDirectoryMode(std::vector const& args) configurations, component.c_str(), message, - exclude_from_all, literal_args.c_str(), optional)); @@ -1423,8 +1401,7 @@ bool cmInstallCommand::HandleExportMode(std::vector const& args) exportSet, ica.GetDestination().c_str(), ica.GetPermissions().c_str(), ica.GetConfigurations(), - ica.GetComponent().c_str(), message, - ica.GetExcludeFromAll(), fname.c_str(), + ica.GetComponent().c_str(), message, fname.c_str(), name_space.GetCString(), exportOld.IsEnabled()); this->Makefile->AddInstallGenerator(exportGenerator); diff --git a/Source/cmInstallCommandArguments.cxx b/Source/cmInstallCommandArguments.cxx index 6ded365..236ca1f 100644 --- a/Source/cmInstallCommandArguments.cxx +++ b/Source/cmInstallCommandArguments.cxx @@ -27,15 +27,14 @@ cmInstallCommandArguments::cmInstallCommandArguments( const std::string& defaultComponent) :Parser() ,ArgumentGroup() -,Destination (&Parser, "DESTINATION" , &ArgumentGroup) -,Component (&Parser, "COMPONENT" , &ArgumentGroup) -,ExcludeFromAll(&Parser, "EXCLUDE_FROM_ALL", &ArgumentGroup) -,Rename (&Parser, "RENAME" , &ArgumentGroup) -,Permissions (&Parser, "PERMISSIONS" , &ArgumentGroup) -,Configurations(&Parser, "CONFIGURATIONS" , &ArgumentGroup) -,Optional (&Parser, "OPTIONAL" , &ArgumentGroup) -,NamelinkOnly (&Parser, "NAMELINK_ONLY" , &ArgumentGroup) -,NamelinkSkip (&Parser, "NAMELINK_SKIP" , &ArgumentGroup) +,Destination (&Parser, "DESTINATION" , &ArgumentGroup) +,Component (&Parser, "COMPONENT" , &ArgumentGroup) +,Rename (&Parser, "RENAME" , &ArgumentGroup) +,Permissions (&Parser, "PERMISSIONS" , &ArgumentGroup) +,Configurations(&Parser, "CONFIGURATIONS", &ArgumentGroup) +,Optional (&Parser, "OPTIONAL" , &ArgumentGroup) +,NamelinkOnly (&Parser, "NAMELINK_ONLY" , &ArgumentGroup) +,NamelinkSkip (&Parser, "NAMELINK_SKIP" , &ArgumentGroup) ,GenericArguments(0) ,DefaultComponentName(defaultComponent) { @@ -111,19 +110,6 @@ bool cmInstallCommandArguments::GetOptional() const return false; } -bool cmInstallCommandArguments::GetExcludeFromAll() const -{ - if (this->ExcludeFromAll.IsEnabled()) - { - return true; - } - if (this->GenericArguments!=0) - { - return this->GenericArguments->GetExcludeFromAll(); - } - return false; -} - bool cmInstallCommandArguments::GetNamelinkOnly() const { if (this->NamelinkOnly.IsEnabled()) diff --git a/Source/cmInstallCommandArguments.h b/Source/cmInstallCommandArguments.h index 694f1ed..90347e6 100644 --- a/Source/cmInstallCommandArguments.h +++ b/Source/cmInstallCommandArguments.h @@ -30,7 +30,6 @@ class cmInstallCommandArguments const std::string& GetDestination() const; const std::string& GetComponent() const; - bool GetExcludeFromAll() const; const std::string& GetRename() const; const std::string& GetPermissions() const; const std::vector& GetConfigurations() const; @@ -49,7 +48,6 @@ class cmInstallCommandArguments cmInstallCommandArguments(); // disabled cmCAString Destination; cmCAString Component; - cmCAEnabler ExcludeFromAll; cmCAString Rename; cmCAStringVector Permissions; cmCAStringVector Configurations; diff --git a/Source/cmInstallDirectoryGenerator.cxx b/Source/cmInstallDirectoryGenerator.cxx index 6ad6c75..f2e8609 100644 --- a/Source/cmInstallDirectoryGenerator.cxx +++ b/Source/cmInstallDirectoryGenerator.cxx @@ -23,11 +23,9 @@ cmInstallDirectoryGenerator std::vector const& configurations, const char* component, MessageLevel message, - bool exclude_from_all, const char* literal_args, bool optional): - cmInstallGenerator(dest, configurations, component, message, - exclude_from_all), + cmInstallGenerator(dest, configurations, component, message), LocalGenerator(0), Directories(dirs), FilePermissions(file_permissions), DirPermissions(dir_permissions), diff --git a/Source/cmInstallDirectoryGenerator.h b/Source/cmInstallDirectoryGenerator.h index b137f44..9b732d3 100644 --- a/Source/cmInstallDirectoryGenerator.h +++ b/Source/cmInstallDirectoryGenerator.h @@ -27,7 +27,6 @@ public: std::vector const& configurations, const char* component, MessageLevel message, - bool exclude_from_all, const char* literal_args, bool optional = false); virtual ~cmInstallDirectoryGenerator(); diff --git a/Source/cmInstallExportGenerator.cxx b/Source/cmInstallExportGenerator.cxx index 80fc054..9570ba3 100644 --- a/Source/cmInstallExportGenerator.cxx +++ b/Source/cmInstallExportGenerator.cxx @@ -33,11 +33,9 @@ cmInstallExportGenerator::cmInstallExportGenerator( std::vector const& configurations, const char* component, MessageLevel message, - bool exclude_from_all, const char* filename, const char* name_space, bool exportOld) - :cmInstallGenerator(destination, configurations, component, message, - exclude_from_all) + :cmInstallGenerator(destination, configurations, component, message) ,ExportSet(exportSet) ,FilePermissions(file_permissions) ,FileName(filename) diff --git a/Source/cmInstallExportGenerator.h b/Source/cmInstallExportGenerator.h index 1b1c046..885ed05 100644 --- a/Source/cmInstallExportGenerator.h +++ b/Source/cmInstallExportGenerator.h @@ -31,7 +31,6 @@ public: const std::vector& configurations, const char* component, MessageLevel message, - bool exclude_from_all, const char* filename, const char* name_space, bool exportOld); ~cmInstallExportGenerator(); diff --git a/Source/cmInstallFilesCommand.cxx b/Source/cmInstallFilesCommand.cxx index d3d258e..68557bd 100644 --- a/Source/cmInstallFilesCommand.cxx +++ b/Source/cmInstallFilesCommand.cxx @@ -122,7 +122,6 @@ void cmInstallFilesCommand::CreateInstallGenerator() const // Use a file install generator. const char* no_permissions = ""; const char* no_rename = ""; - bool no_exclude_from_all = false; std::string no_component = this->Makefile->GetSafeDefinition( "CMAKE_INSTALL_DEFAULT_COMPONENT_NAME"); std::vector no_configurations; @@ -132,8 +131,7 @@ void cmInstallFilesCommand::CreateInstallGenerator() const new cmInstallFilesGenerator(this->Files, destination.c_str(), false, no_permissions, no_configurations, - no_component.c_str(), message, - no_exclude_from_all, no_rename)); + no_component.c_str(), message, no_rename)); } diff --git a/Source/cmInstallFilesGenerator.cxx b/Source/cmInstallFilesGenerator.cxx index 3dd5528..383031b 100644 --- a/Source/cmInstallFilesGenerator.cxx +++ b/Source/cmInstallFilesGenerator.cxx @@ -24,11 +24,9 @@ cmInstallFilesGenerator std::vector const& configurations, const char* component, MessageLevel message, - bool exclude_from_all, const char* rename, bool optional): - cmInstallGenerator(dest, configurations, component, message, - exclude_from_all), + cmInstallGenerator(dest, configurations, component, message), LocalGenerator(0), Files(files), FilePermissions(file_permissions), diff --git a/Source/cmInstallFilesGenerator.h b/Source/cmInstallFilesGenerator.h index efaf62b..bfe4039 100644 --- a/Source/cmInstallFilesGenerator.h +++ b/Source/cmInstallFilesGenerator.h @@ -26,7 +26,6 @@ public: std::vector const& configurations, const char* component, MessageLevel message, - bool exclude_from_all, const char* rename, bool optional = false); virtual ~cmInstallFilesGenerator(); diff --git a/Source/cmInstallGenerator.cxx b/Source/cmInstallGenerator.cxx index 660e44f..2e1c5f0 100644 --- a/Source/cmInstallGenerator.cxx +++ b/Source/cmInstallGenerator.cxx @@ -19,13 +19,11 @@ cmInstallGenerator ::cmInstallGenerator(const char* destination, std::vector const& configurations, const char* component, - MessageLevel message, - bool exclude_from_all): + MessageLevel message): cmScriptGenerator("CMAKE_INSTALL_CONFIG_NAME", configurations), Destination(destination? destination:""), Component(component? component:""), - Message(message), - ExcludeFromAll(exclude_from_all) + Message(message) { } @@ -148,16 +146,12 @@ void cmInstallGenerator //---------------------------------------------------------------------------- std::string -cmInstallGenerator::CreateComponentTest(const char* component, - bool exclude_from_all) +cmInstallGenerator::CreateComponentTest(const char* component) { - std::string result = "\"${CMAKE_INSTALL_COMPONENT}\" STREQUAL \""; + std::string result = "NOT CMAKE_INSTALL_COMPONENT OR " + "\"${CMAKE_INSTALL_COMPONENT}\" STREQUAL \""; result += component; result += "\""; - if(!exclude_from_all) - { - result += " OR NOT CMAKE_INSTALL_COMPONENT"; - } return result; } @@ -169,7 +163,7 @@ void cmInstallGenerator::GenerateScript(std::ostream& os) // Begin this block of installation. std::string component_test = - this->CreateComponentTest(this->Component.c_str(),this->ExcludeFromAll); + this->CreateComponentTest(this->Component.c_str()); os << indent << "if(" << component_test << ")\n"; // Generate the script possibly with per-configuration code. diff --git a/Source/cmInstallGenerator.h b/Source/cmInstallGenerator.h index db89590..b8e5b53 100644 --- a/Source/cmInstallGenerator.h +++ b/Source/cmInstallGenerator.h @@ -36,8 +36,7 @@ public: cmInstallGenerator(const char* destination, std::vector const& configurations, const char* component, - MessageLevel message, - bool exclude_from_all); + MessageLevel message); virtual ~cmInstallGenerator(); void AddInstallRule( @@ -68,14 +67,12 @@ public: protected: virtual void GenerateScript(std::ostream& os); - std::string CreateComponentTest(const char* component, - bool exclude_from_all); + std::string CreateComponentTest(const char* component); // Information shared by most generator types. std::string Destination; std::string Component; MessageLevel Message; - bool ExcludeFromAll; }; #endif diff --git a/Source/cmInstallProgramsCommand.cxx b/Source/cmInstallProgramsCommand.cxx index b6d0c45..e6fbe88 100644 --- a/Source/cmInstallProgramsCommand.cxx +++ b/Source/cmInstallProgramsCommand.cxx @@ -85,7 +85,6 @@ void cmInstallProgramsCommand::FinalPass() // Use a file install generator. const char* no_permissions = ""; const char* no_rename = ""; - bool no_exclude_from_all = false; std::string no_component = this->Makefile->GetSafeDefinition( "CMAKE_INSTALL_DEFAULT_COMPONENT_NAME"); std::vector no_configurations; @@ -95,8 +94,7 @@ void cmInstallProgramsCommand::FinalPass() new cmInstallFilesGenerator(this->Files, destination.c_str(), true, no_permissions, no_configurations, - no_component.c_str(), message, - no_exclude_from_all, no_rename)); + no_component.c_str(), message, no_rename)); } /** diff --git a/Source/cmInstallScriptGenerator.cxx b/Source/cmInstallScriptGenerator.cxx index d58d039..933aa07 100644 --- a/Source/cmInstallScriptGenerator.cxx +++ b/Source/cmInstallScriptGenerator.cxx @@ -14,9 +14,8 @@ //---------------------------------------------------------------------------- cmInstallScriptGenerator ::cmInstallScriptGenerator(const char* script, bool code, - const char* component, bool exclude_from_all) : - cmInstallGenerator(0, std::vector(), component, MessageDefault, - exclude_from_all), + const char* component) : + cmInstallGenerator(0, std::vector(), component, MessageDefault), Script(script), Code(code) { } @@ -32,7 +31,7 @@ void cmInstallScriptGenerator::GenerateScript(std::ostream& os) { Indent indent; std::string component_test = - this->CreateComponentTest(this->Component.c_str(), this->ExcludeFromAll); + this->CreateComponentTest(this->Component.c_str()); os << indent << "if(" << component_test << ")\n"; if(this->Code) diff --git a/Source/cmInstallScriptGenerator.h b/Source/cmInstallScriptGenerator.h index 7e7c0c8..54a7b21 100644 --- a/Source/cmInstallScriptGenerator.h +++ b/Source/cmInstallScriptGenerator.h @@ -21,7 +21,7 @@ class cmInstallScriptGenerator: public cmInstallGenerator { public: cmInstallScriptGenerator(const char* script, bool code, - const char* component, bool exclude_from_all); + const char* component); virtual ~cmInstallScriptGenerator(); protected: diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx index 3d44fe2..5e88fa2 100644 --- a/Source/cmInstallTargetGenerator.cxx +++ b/Source/cmInstallTargetGenerator.cxx @@ -30,10 +30,8 @@ cmInstallTargetGenerator std::vector const& configurations, const char* component, MessageLevel message, - bool exclude_from_all, bool optional): - cmInstallGenerator(dest, configurations, component, message, - exclude_from_all), + cmInstallGenerator(dest, configurations, component, message), TargetName(targetName), Target(0), FilePermissions(file_permissions), diff --git a/Source/cmInstallTargetGenerator.h b/Source/cmInstallTargetGenerator.h index 46b4532..18b3130 100644 --- a/Source/cmInstallTargetGenerator.h +++ b/Source/cmInstallTargetGenerator.h @@ -28,7 +28,6 @@ public: std::vector const& configurations, const char* component, MessageLevel message, - bool exclude_from_all, bool optional ); virtual ~cmInstallTargetGenerator(); diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 6b73987..1d17032 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -2557,7 +2557,7 @@ public: cmInstallTargetGenerator( t, dest, implib, "", std::vector(), "Unspecified", cmInstallGenerator::SelectMessageLevel(lg->GetMakefile()), - false, false) + false) { this->Compute(lg); } @@ -2584,7 +2584,7 @@ cmLocalGenerator // Include the user-specified pre-install script for this target. if(const char* preinstall = (*l)->GetProperty("PRE_INSTALL_SCRIPT")) { - cmInstallScriptGenerator g(preinstall, false, 0, false); + cmInstallScriptGenerator g(preinstall, false, 0); g.Generate(os, config, configurationTypes); } @@ -2645,7 +2645,7 @@ cmLocalGenerator // Include the user-specified post-install script for this target. if(const char* postinstall = (*l)->GetProperty("POST_INSTALL_SCRIPT")) { - cmInstallScriptGenerator g(postinstall, false, 0, false); + cmInstallScriptGenerator g(postinstall, false, 0); g.Generate(os, config, configurationTypes); } } diff --git a/Tests/RunCMake/install/EXCLUDE_FROM_ALL-FILES-install-stdout.txt b/Tests/RunCMake/install/EXCLUDE_FROM_ALL-FILES-install-stdout.txt deleted file mode 100644 index 517cee2..0000000 --- a/Tests/RunCMake/install/EXCLUDE_FROM_ALL-FILES-install-stdout.txt +++ /dev/null @@ -1,3 +0,0 @@ --- Install configuration: "[^"]*" --- Installing: [^ -]*/Tests/RunCMake/install/EXCLUDE_FROM_ALL-FILES-build/root/src-all/main\.c$ diff --git a/Tests/RunCMake/install/EXCLUDE_FROM_ALL-FILES.cmake b/Tests/RunCMake/install/EXCLUDE_FROM_ALL-FILES.cmake deleted file mode 100644 index 00db5d0..0000000 --- a/Tests/RunCMake/install/EXCLUDE_FROM_ALL-FILES.cmake +++ /dev/null @@ -1,2 +0,0 @@ -install(FILES main.c DESTINATION src-all) -install(FILES main.c DESTINATION src-exc EXCLUDE_FROM_ALL) diff --git a/Tests/RunCMake/install/EXCLUDE_FROM_ALL-TARGETS-install-stdout.txt b/Tests/RunCMake/install/EXCLUDE_FROM_ALL-TARGETS-install-stdout.txt deleted file mode 100644 index 17672f2..0000000 --- a/Tests/RunCMake/install/EXCLUDE_FROM_ALL-TARGETS-install-stdout.txt +++ /dev/null @@ -1,3 +0,0 @@ --- Install configuration: "[^"]*" --- Installing: [^ -]*/Tests/RunCMake/install/EXCLUDE_FROM_ALL-TARGETS-build/root/bin/myexe(\.exe)?$ diff --git a/Tests/RunCMake/install/EXCLUDE_FROM_ALL-TARGETS.cmake b/Tests/RunCMake/install/EXCLUDE_FROM_ALL-TARGETS.cmake deleted file mode 100644 index 16e8a90..0000000 --- a/Tests/RunCMake/install/EXCLUDE_FROM_ALL-TARGETS.cmake +++ /dev/null @@ -1,5 +0,0 @@ -enable_language(C) -add_executable(myexe main.c) -add_executable(mytest main.c) -install(TARGETS myexe DESTINATION bin) -install(TARGETS mytest DESTINATION bin EXCLUDE_FROM_ALL) diff --git a/Tests/RunCMake/install/RunCMakeTest.cmake b/Tests/RunCMake/install/RunCMakeTest.cmake index c57e5ec..2c1b29d 100644 --- a/Tests/RunCMake/install/RunCMakeTest.cmake +++ b/Tests/RunCMake/install/RunCMakeTest.cmake @@ -13,15 +13,3 @@ run_cmake(TARGETS-DESTINATION-bad) run_cmake(CMP0062-OLD) run_cmake(CMP0062-NEW) run_cmake(CMP0062-WARN) - -function(run_install_test case) - set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${case}-build) - set(RunCMake_TEST_NO_CLEAN 1) - set(RunCMake_TEST_OPTIONS "-DCMAKE_INSTALL_PREFIX:PATH=${RunCMake_TEST_BINARY_DIR}/root") - file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}") - file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}") - run_cmake(${case}) - run_cmake_command(${case}-install ${CMAKE_COMMAND} --build . --target install) -endfunction() -run_install_test(EXCLUDE_FROM_ALL-FILES) -run_install_test(EXCLUDE_FROM_ALL-TARGETS) diff --git a/Tests/RunCMake/install/main.c b/Tests/RunCMake/install/main.c deleted file mode 100644 index 78f2de1..0000000 --- a/Tests/RunCMake/install/main.c +++ /dev/null @@ -1 +0,0 @@ -int main(void) { return 0; } ----------------------------------------------------------------------- Summary of changes: Help/command/install.rst | 9 +++--- Help/release/dev/install-EXCLUDE_FROM_ALL.rst | 5 ---- Source/cmInstallCommand.cxx | 31 +++----------------- Source/cmInstallCommandArguments.cxx | 30 +++++-------------- Source/cmInstallCommandArguments.h | 2 -- Source/cmInstallDirectoryGenerator.cxx | 4 +-- Source/cmInstallDirectoryGenerator.h | 1 - Source/cmInstallExportGenerator.cxx | 4 +-- Source/cmInstallExportGenerator.h | 1 - Source/cmInstallFilesCommand.cxx | 4 +-- Source/cmInstallFilesGenerator.cxx | 4 +-- Source/cmInstallFilesGenerator.h | 1 - Source/cmInstallGenerator.cxx | 18 ++++-------- Source/cmInstallGenerator.h | 7 ++--- Source/cmInstallProgramsCommand.cxx | 4 +-- Source/cmInstallScriptGenerator.cxx | 7 ++--- Source/cmInstallScriptGenerator.h | 2 +- Source/cmInstallTargetGenerator.cxx | 4 +-- Source/cmInstallTargetGenerator.h | 1 - Source/cmLocalGenerator.cxx | 6 ++-- .../EXCLUDE_FROM_ALL-FILES-install-stdout.txt | 3 -- .../RunCMake/install/EXCLUDE_FROM_ALL-FILES.cmake | 2 -- .../EXCLUDE_FROM_ALL-TARGETS-install-stdout.txt | 3 -- .../install/EXCLUDE_FROM_ALL-TARGETS.cmake | 5 ---- Tests/RunCMake/install/RunCMakeTest.cmake | 12 -------- Tests/RunCMake/install/main.c | 1 - 26 files changed, 37 insertions(+), 134 deletions(-) delete mode 100644 Help/release/dev/install-EXCLUDE_FROM_ALL.rst delete mode 100644 Tests/RunCMake/install/EXCLUDE_FROM_ALL-FILES-install-stdout.txt delete mode 100644 Tests/RunCMake/install/EXCLUDE_FROM_ALL-FILES.cmake delete mode 100644 Tests/RunCMake/install/EXCLUDE_FROM_ALL-TARGETS-install-stdout.txt delete mode 100644 Tests/RunCMake/install/EXCLUDE_FROM_ALL-TARGETS.cmake delete mode 100644 Tests/RunCMake/install/main.c hooks/post-receive -- CMake From kwrobot at kitware.com Thu Feb 4 00:01:06 2016 From: kwrobot at kitware.com (Kitware Robot) Date: Thu, 4 Feb 2016 00:01:06 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc1-4-gbfd1b3a Message-ID: <20160204050106.B9502E4CC4@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 bfd1b3aabaa9a2ec46ca6ebfa50d56dfa8846fb3 (commit) from a58abc69c23ef30fc2215eb72878af29f7e860fd (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=bfd1b3aabaa9a2ec46ca6ebfa50d56dfa8846fb3 commit bfd1b3aabaa9a2ec46ca6ebfa50d56dfa8846fb3 Author: Kitware Robot AuthorDate: Thu Feb 4 00:01:04 2016 -0500 Commit: Kitware Robot CommitDate: Thu Feb 4 00:01:04 2016 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 9539c49..fc7bd9f 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 5) -set(CMake_VERSION_PATCH 20160203) +set(CMake_VERSION_PATCH 20160204) #set(CMake_VERSION_RC 1) ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 4 10:53:13 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 4 Feb 2016 10:53:13 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc1-6-g4402728 Message-ID: <20160204155313.44930E4870@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 4402728a0a99d3b271f5fa10f09e864291cc5de7 (commit) via 99a9c7e51a3980807c60a9ec7532db0ca9495e5f (commit) from bfd1b3aabaa9a2ec46ca6ebfa50d56dfa8846fb3 (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=4402728a0a99d3b271f5fa10f09e864291cc5de7 commit 4402728a0a99d3b271f5fa10f09e864291cc5de7 Merge: bfd1b3a 99a9c7e Author: Brad King AuthorDate: Thu Feb 4 10:53:11 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Feb 4 10:53:11 2016 -0500 Merge topic 'iar_ninja_support' 99a9c7e5 IAR: Add support for using this compiler with the Ninja generator ----------------------------------------------------------------------- Summary of changes: Modules/Compiler/IAR-C.cmake | 3 +++ Modules/Compiler/IAR-CXX.cmake | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 4 10:53:16 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 4 Feb 2016 10:53:16 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc1-8-g7b1fbcc Message-ID: <20160204155316.0BD9CE4870@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 7b1fbcc4b035c591491c5033cbfbfc0aabd80fde (commit) via 0205f882ae252998686f65b843a758268b4c62bc (commit) from 4402728a0a99d3b271f5fa10f09e864291cc5de7 (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=7b1fbcc4b035c591491c5033cbfbfc0aabd80fde commit 7b1fbcc4b035c591491c5033cbfbfc0aabd80fde Merge: 4402728 0205f88 Author: Brad King AuthorDate: Thu Feb 4 10:53:14 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Feb 4 10:53:14 2016 -0500 Merge topic 'list-FILTER-command' 0205f882 list: Add FILTER subcommand (#3986) ----------------------------------------------------------------------- Summary of changes: Help/command/list.rst | 13 ++- Help/release/dev/list-FILTER-command.rst | 5 + Source/cmListCommand.cxx | 109 ++++++++++++++++++++ Source/cmListCommand.h | 6 ++ .../EmptyFilterRegex-result.txt} | 0 .../RunCMake/list/EmptyFilterRegex-stderr.txt | 0 Tests/RunCMake/list/EmptyFilterRegex.cmake | 2 + .../FILTER-NotList-result.txt} | 0 Tests/RunCMake/list/FILTER-NotList-stderr.txt | 4 + Tests/RunCMake/list/FILTER-NotList.cmake | 2 + .../FILTER-REGEX-InvalidMode-result.txt} | 0 .../list/FILTER-REGEX-InvalidMode-stderr.txt | 4 + Tests/RunCMake/list/FILTER-REGEX-InvalidMode.cmake | 2 + .../FILTER-REGEX-InvalidOperator-result.txt} | 0 .../list/FILTER-REGEX-InvalidOperator-stderr.txt | 4 + .../list/FILTER-REGEX-InvalidOperator.cmake | 2 + .../FILTER-REGEX-InvalidRegex-result.txt} | 0 .../list/FILTER-REGEX-InvalidRegex-stderr.txt | 4 + .../RunCMake/list/FILTER-REGEX-InvalidRegex.cmake | 2 + .../FILTER-REGEX-TooManyArguments-result.txt} | 0 .../list/FILTER-REGEX-TooManyArguments-stderr.txt | 4 + .../list/FILTER-REGEX-TooManyArguments.cmake | 2 + .../FILTER-REGEX-Valid0-result.txt} | 0 Tests/RunCMake/list/FILTER-REGEX-Valid0-stderr.txt | 2 + Tests/RunCMake/list/FILTER-REGEX-Valid0.cmake | 4 + .../FILTER-REGEX-Valid1-result.txt} | 0 Tests/RunCMake/list/FILTER-REGEX-Valid1-stderr.txt | 2 + Tests/RunCMake/list/FILTER-REGEX-Valid1.cmake | 4 + Tests/RunCMake/list/RunCMakeTest.cmake | 9 ++ 29 files changed, 183 insertions(+), 3 deletions(-) create mode 100644 Help/release/dev/list-FILTER-command.rst copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => list/EmptyFilterRegex-result.txt} (100%) copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/list/EmptyFilterRegex-stderr.txt (100%) create mode 100644 Tests/RunCMake/list/EmptyFilterRegex.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => list/FILTER-NotList-result.txt} (100%) create mode 100644 Tests/RunCMake/list/FILTER-NotList-stderr.txt create mode 100644 Tests/RunCMake/list/FILTER-NotList.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => list/FILTER-REGEX-InvalidMode-result.txt} (100%) create mode 100644 Tests/RunCMake/list/FILTER-REGEX-InvalidMode-stderr.txt create mode 100644 Tests/RunCMake/list/FILTER-REGEX-InvalidMode.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => list/FILTER-REGEX-InvalidOperator-result.txt} (100%) create mode 100644 Tests/RunCMake/list/FILTER-REGEX-InvalidOperator-stderr.txt create mode 100644 Tests/RunCMake/list/FILTER-REGEX-InvalidOperator.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => list/FILTER-REGEX-InvalidRegex-result.txt} (100%) create mode 100644 Tests/RunCMake/list/FILTER-REGEX-InvalidRegex-stderr.txt create mode 100644 Tests/RunCMake/list/FILTER-REGEX-InvalidRegex.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => list/FILTER-REGEX-TooManyArguments-result.txt} (100%) create mode 100644 Tests/RunCMake/list/FILTER-REGEX-TooManyArguments-stderr.txt create mode 100644 Tests/RunCMake/list/FILTER-REGEX-TooManyArguments.cmake copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => list/FILTER-REGEX-Valid0-result.txt} (100%) create mode 100644 Tests/RunCMake/list/FILTER-REGEX-Valid0-stderr.txt create mode 100644 Tests/RunCMake/list/FILTER-REGEX-Valid0.cmake copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt => list/FILTER-REGEX-Valid1-result.txt} (100%) create mode 100644 Tests/RunCMake/list/FILTER-REGEX-Valid1-stderr.txt create mode 100644 Tests/RunCMake/list/FILTER-REGEX-Valid1.cmake hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 4 10:54:34 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 4 Feb 2016 10:54:34 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-18-ga6c5a60 Message-ID: <20160204155434.B3FF3E48A0@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, next has been updated via a6c5a6007f3ad4ce479fdddcccbcbce9300ce5cc (commit) via 7b1fbcc4b035c591491c5033cbfbfc0aabd80fde (commit) via 4402728a0a99d3b271f5fa10f09e864291cc5de7 (commit) via bfd1b3aabaa9a2ec46ca6ebfa50d56dfa8846fb3 (commit) from c29302b3f3ff6ca0822afe0a19c66bad12542ac9 (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=a6c5a6007f3ad4ce479fdddcccbcbce9300ce5cc commit a6c5a6007f3ad4ce479fdddcccbcbce9300ce5cc Merge: c29302b 7b1fbcc Author: Brad King AuthorDate: Thu Feb 4 10:53:53 2016 -0500 Commit: Brad King CommitDate: Thu Feb 4 10:53:53 2016 -0500 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 4 10:54:52 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 4 Feb 2016 10:54:52 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-22-g9270188 Message-ID: <20160204155452.91BECE3A16@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, next has been updated via 92701885ff148e94a05823d72559a31a9a8085b0 (commit) via 586e56d0ef8c9bda2e5c24371ad7bb0b95a4395f (commit) via d321c196a0bfb58ff8a32ed14552d1b78b24cf8a (commit) via 18ce97c4a20b7da4e11006ad80f17cb55e128db1 (commit) from a6c5a6007f3ad4ce479fdddcccbcbce9300ce5cc (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=92701885ff148e94a05823d72559a31a9a8085b0 commit 92701885ff148e94a05823d72559a31a9a8085b0 Merge: a6c5a60 586e56d Author: Brad King AuthorDate: Thu Feb 4 10:54:51 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Feb 4 10:54:51 2016 -0500 Merge topic 'install-EXCLUDE_FROM_ALL' into next 586e56d0 Help: Add notes for topic 'install-EXCLUDE_FROM_ALL' d321c196 Tests: Add cases for install() command EXCLUDE_FROM_ALL option 18ce97c4 install: Add EXCLUDE_FROM_ALL option (#14921) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=586e56d0ef8c9bda2e5c24371ad7bb0b95a4395f commit 586e56d0ef8c9bda2e5c24371ad7bb0b95a4395f Author: Brad King AuthorDate: Wed Feb 3 14:12:29 2016 -0500 Commit: Brad King CommitDate: Thu Feb 4 09:48:37 2016 -0500 Help: Add notes for topic 'install-EXCLUDE_FROM_ALL' diff --git a/Help/release/dev/install-EXCLUDE_FROM_ALL.rst b/Help/release/dev/install-EXCLUDE_FROM_ALL.rst new file mode 100644 index 0000000..a611eae --- /dev/null +++ b/Help/release/dev/install-EXCLUDE_FROM_ALL.rst @@ -0,0 +1,5 @@ +install-EXCLUDE_FROM_ALL +------------------------ + +* The :command:`install` command learned a new ``EXCLUDE_FROM_ALL`` option + to leave installation rules out of the default installation. https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d321c196a0bfb58ff8a32ed14552d1b78b24cf8a commit d321c196a0bfb58ff8a32ed14552d1b78b24cf8a Author: Brad King AuthorDate: Wed Feb 3 14:10:55 2016 -0500 Commit: Brad King CommitDate: Thu Feb 4 09:47:57 2016 -0500 Tests: Add cases for install() command EXCLUDE_FROM_ALL option diff --git a/Tests/RunCMake/install/FILES-EXCLUDE_FROM_ALL-all-check.cmake b/Tests/RunCMake/install/FILES-EXCLUDE_FROM_ALL-all-check.cmake new file mode 100644 index 0000000..0368df1 --- /dev/null +++ b/Tests/RunCMake/install/FILES-EXCLUDE_FROM_ALL-all-check.cmake @@ -0,0 +1 @@ +check_installed([[^src-all;src-all/main\.c$]]) diff --git a/Tests/RunCMake/install/FILES-EXCLUDE_FROM_ALL-exc-check.cmake b/Tests/RunCMake/install/FILES-EXCLUDE_FROM_ALL-exc-check.cmake new file mode 100644 index 0000000..41a816f --- /dev/null +++ b/Tests/RunCMake/install/FILES-EXCLUDE_FROM_ALL-exc-check.cmake @@ -0,0 +1 @@ +check_installed([[^src-exc;src-exc/main\.c$]]) diff --git a/Tests/RunCMake/install/FILES-EXCLUDE_FROM_ALL-uns-check.cmake b/Tests/RunCMake/install/FILES-EXCLUDE_FROM_ALL-uns-check.cmake new file mode 100644 index 0000000..68a1378 --- /dev/null +++ b/Tests/RunCMake/install/FILES-EXCLUDE_FROM_ALL-uns-check.cmake @@ -0,0 +1 @@ +check_installed([[^src-all;src-all/main\.c;src-uns;src-uns/main\.c$]]) diff --git a/Tests/RunCMake/install/FILES-EXCLUDE_FROM_ALL.cmake b/Tests/RunCMake/install/FILES-EXCLUDE_FROM_ALL.cmake new file mode 100644 index 0000000..720299b --- /dev/null +++ b/Tests/RunCMake/install/FILES-EXCLUDE_FROM_ALL.cmake @@ -0,0 +1,3 @@ +install(FILES main.c DESTINATION src-all) +install(FILES main.c DESTINATION src-uns EXCLUDE_FROM_ALL) +install(FILES main.c DESTINATION src-exc EXCLUDE_FROM_ALL COMPONENT exc) diff --git a/Tests/RunCMake/install/RunCMakeTest.cmake b/Tests/RunCMake/install/RunCMakeTest.cmake index 2c1b29d..4d91f92 100644 --- a/Tests/RunCMake/install/RunCMakeTest.cmake +++ b/Tests/RunCMake/install/RunCMakeTest.cmake @@ -1,4 +1,46 @@ +cmake_minimum_required(VERSION 3.4) include(RunCMake) + +# Function to build and install a project. The latter step *-check.cmake +# scripts can check installed files using the check_installed function. +function(run_install_test case) + set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/${case}-build) + set(RunCMake_TEST_NO_CLEAN 1) + file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}") + file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}") + run_cmake(${case}) + run_cmake_command(${case}-build ${CMAKE_COMMAND} --build . --config Debug) + # Check "all" components. + set(CMAKE_INSTALL_PREFIX ${RunCMake_TEST_BINARY_DIR}/root-all) + run_cmake_command(${case}-all ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DBUILD_TYPE=Debug -P cmake_install.cmake) + # Check unspecified component. + set(CMAKE_INSTALL_PREFIX ${RunCMake_TEST_BINARY_DIR}/root-uns) + run_cmake_command(${case}-uns ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DBUILD_TYPE=Debug -DCOMPONENT=Unspecified -P cmake_install.cmake) + # Check explicit component. + set(CMAKE_INSTALL_PREFIX ${RunCMake_TEST_BINARY_DIR}/root-exc) + run_cmake_command(${case}-exc ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DBUILD_TYPE=Debug -DCOMPONENT=exc -P cmake_install.cmake) +endfunction() + +# Function called in *-check.cmake scripts to check installed files. +function(check_installed expect) + file(GLOB_RECURSE actual + LIST_DIRECTORIES TRUE + RELATIVE ${CMAKE_INSTALL_PREFIX} + ${CMAKE_INSTALL_PREFIX}/* + ) + if(actual) + list(SORT actual) + endif() + if(NOT "${actual}" MATCHES "${expect}") + set(RunCMake_TEST_FAILED "Installed files: + ${actual} +do not match what we expected: + ${expect} +in directory: + ${CMAKE_INSTALL_PREFIX}" PARENT_SCOPE) + endif() +endfunction() + run_cmake(DIRECTORY-MESSAGE_NEVER) run_cmake(DIRECTORY-PATTERN-MESSAGE_NEVER) run_cmake(DIRECTORY-message) @@ -13,3 +55,6 @@ run_cmake(TARGETS-DESTINATION-bad) run_cmake(CMP0062-OLD) run_cmake(CMP0062-NEW) run_cmake(CMP0062-WARN) + +run_install_test(FILES-EXCLUDE_FROM_ALL) +run_install_test(TARGETS-EXCLUDE_FROM_ALL) diff --git a/Tests/RunCMake/install/TARGETS-EXCLUDE_FROM_ALL-all-check.cmake b/Tests/RunCMake/install/TARGETS-EXCLUDE_FROM_ALL-all-check.cmake new file mode 100644 index 0000000..9b538bb --- /dev/null +++ b/Tests/RunCMake/install/TARGETS-EXCLUDE_FROM_ALL-all-check.cmake @@ -0,0 +1 @@ +check_installed([[^bin-all;bin-all/myexe(\.exe)?$]]) diff --git a/Tests/RunCMake/install/TARGETS-EXCLUDE_FROM_ALL-exc-check.cmake b/Tests/RunCMake/install/TARGETS-EXCLUDE_FROM_ALL-exc-check.cmake new file mode 100644 index 0000000..aef0d27 --- /dev/null +++ b/Tests/RunCMake/install/TARGETS-EXCLUDE_FROM_ALL-exc-check.cmake @@ -0,0 +1 @@ +check_installed([[^bin-exc;bin-exc/myexe(\.exe)?$]]) diff --git a/Tests/RunCMake/install/TARGETS-EXCLUDE_FROM_ALL-uns-check.cmake b/Tests/RunCMake/install/TARGETS-EXCLUDE_FROM_ALL-uns-check.cmake new file mode 100644 index 0000000..56fd264 --- /dev/null +++ b/Tests/RunCMake/install/TARGETS-EXCLUDE_FROM_ALL-uns-check.cmake @@ -0,0 +1 @@ +check_installed([[^bin-all;bin-all/myexe(\.exe)?;bin-uns;bin-uns/myexe(\.exe)?$]]) diff --git a/Tests/RunCMake/install/TARGETS-EXCLUDE_FROM_ALL.cmake b/Tests/RunCMake/install/TARGETS-EXCLUDE_FROM_ALL.cmake new file mode 100644 index 0000000..6fb2036 --- /dev/null +++ b/Tests/RunCMake/install/TARGETS-EXCLUDE_FROM_ALL.cmake @@ -0,0 +1,5 @@ +enable_language(C) +add_executable(myexe main.c) +install(TARGETS myexe DESTINATION bin-all) +install(TARGETS myexe DESTINATION bin-uns EXCLUDE_FROM_ALL) +install(TARGETS myexe DESTINATION bin-exc EXCLUDE_FROM_ALL COMPONENT exc) diff --git a/Tests/RunCMake/install/main.c b/Tests/RunCMake/install/main.c new file mode 100644 index 0000000..78f2de1 --- /dev/null +++ b/Tests/RunCMake/install/main.c @@ -0,0 +1 @@ +int main(void) { return 0; } https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=18ce97c4a20b7da4e11006ad80f17cb55e128db1 commit 18ce97c4a20b7da4e11006ad80f17cb55e128db1 Author: Nick Lewis AuthorDate: Mon Feb 1 10:01:39 2016 +0000 Commit: Brad King CommitDate: Thu Feb 4 09:16:56 2016 -0500 install: Add EXCLUDE_FROM_ALL option (#14921) Let us take an example of a project that has some tests in a component that need to be installed into a dedicated test package. The user expectation is that the result could be achieved by typing the following: make make tests make install DESTDIR=/testpkgs make install-tests However this results in test components in the default installation as well as the testpkg. Add an EXCLUDE_FROM_ALL option to the install() command to tell it that the installation rule should not be included unless its component is explicitly specified for installation. diff --git a/Help/command/install.rst b/Help/command/install.rst index 5d2add7..189b51c 100644 --- a/Help/command/install.rst +++ b/Help/command/install.rst @@ -45,11 +45,15 @@ signatures that specify them. The common options are: is associated, such as "runtime" or "development". During component-specific installation only install rules associated with the given component name will be executed. During a full installation - all components are installed. If ``COMPONENT`` is not provided a - default component "Unspecified" is created. The default component - name may be controlled with the + all components are installed unless marked with ``EXCLUDE_FROM_ALL``. + If ``COMPONENT`` is not provided a default component "Unspecified" is + created. The default component name may be controlled with the :variable:`CMAKE_INSTALL_DEFAULT_COMPONENT_NAME` variable. +``EXCLUDE_FROM_ALL`` + Specify that the file is excluded from a full installation and only + installed as part of a component-specific installation + ``RENAME`` Specify a name for an installed file that may be different from the original file. Renaming is allowed only when a single file is @@ -76,7 +80,8 @@ Installing Targets [PERMISSIONS permissions...] [CONFIGURATIONS [Debug|Release|...]] [COMPONENT ] - [OPTIONAL] [NAMELINK_ONLY|NAMELINK_SKIP] + [OPTIONAL] [EXCLUDE_FROM_ALL] + [NAMELINK_ONLY|NAMELINK_SKIP] ] [...]) The ``TARGETS`` form specifies rules for installing targets from a @@ -172,7 +177,7 @@ Installing Files [PERMISSIONS permissions...] [CONFIGURATIONS [Debug|Release|...]] [COMPONENT ] - [RENAME ] [OPTIONAL]) + [RENAME ] [OPTIONAL] [EXCLUDE_FROM_ALL]) The ``FILES`` form specifies rules for installing files for a project. File names given as relative paths are interpreted with respect to the @@ -206,7 +211,8 @@ Installing Directories [DIRECTORY_PERMISSIONS permissions...] [USE_SOURCE_PERMISSIONS] [OPTIONAL] [MESSAGE_NEVER] [CONFIGURATIONS [Debug|Release|...]] - [COMPONENT ] [FILES_MATCHING] + [COMPONENT ] [EXCLUDE_FROM_ALL] + [FILES_MATCHING] [[PATTERN | REGEX ] [EXCLUDE] [PERMISSIONS permissions...]] [...]) @@ -282,7 +288,7 @@ Custom Installation Logic :: install([[SCRIPT ] [CODE ]] - [COMPONENT ] [...]) + [COMPONENT ] [EXCLUDE_FROM_ALL] [...]) The ``SCRIPT`` form will invoke the given CMake script files during installation. If the script file name is a relative path it will be @@ -307,7 +313,8 @@ Installing Exports [PERMISSIONS permissions...] [CONFIGURATIONS [Debug|Release|...]] [EXPORT_LINK_INTERFACE_LIBRARIES] - [COMPONENT ]) + [COMPONENT ] + [EXCLUDE_FROM_ALL]) The ``EXPORT`` form generates and installs a CMake file containing code to import targets from the installation tree into another project. diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx index 15a83ee..aa92d74 100644 --- a/Source/cmInstallCommand.cxx +++ b/Source/cmInstallCommand.cxx @@ -33,6 +33,7 @@ static cmInstallTargetGenerator* CreateInstallTargetGenerator(cmTarget& target, impLib, args.GetPermissions().c_str(), args.GetConfigurations(), args.GetComponent().c_str(), message, + args.GetExcludeFromAll(), args.GetOptional() || forceOpt); } @@ -48,7 +49,8 @@ static cmInstallFilesGenerator* CreateInstallFilesGenerator( programs, args.GetPermissions().c_str(), args.GetConfigurations(), args.GetComponent().c_str(), message, - args.GetRename().c_str(), args.GetOptional()); + args.GetExcludeFromAll(), args.GetRename().c_str(), + args.GetOptional()); } @@ -117,6 +119,7 @@ bool cmInstallCommand::HandleScriptMode(std::vector const& args) int componentCount = 0; bool doing_script = false; bool doing_code = false; + bool exclude_from_all = false; // Scan the args once for COMPONENT. Only allow one. // @@ -128,6 +131,10 @@ bool cmInstallCommand::HandleScriptMode(std::vector const& args) ++i; component = args[i]; } + if(args[i] == "EXCLUDE_FROM_ALL") + { + exclude_from_all = true; + } } if(componentCount>1) @@ -175,7 +182,7 @@ bool cmInstallCommand::HandleScriptMode(std::vector const& args) } this->Makefile->AddInstallGenerator( new cmInstallScriptGenerator(script.c_str(), false, - component.c_str())); + component.c_str(), exclude_from_all)); } else if(doing_code) { @@ -183,7 +190,7 @@ bool cmInstallCommand::HandleScriptMode(std::vector const& args) std::string code = args[i]; this->Makefile->AddInstallGenerator( new cmInstallScriptGenerator(code.c_str(), true, - component.c_str())); + component.c_str(), exclude_from_all)); } } @@ -949,6 +956,7 @@ cmInstallCommand::HandleDirectoryMode(std::vector const& args) Doing doing = DoingDirs; bool in_match_mode = false; bool optional = false; + bool exclude_from_all = false; bool message_never = false; std::vector dirs; const char* destination = 0; @@ -1130,6 +1138,19 @@ cmInstallCommand::HandleDirectoryMode(std::vector const& args) // Switch to setting the component property. doing = DoingComponent; } + else if(args[i] == "EXCLUDE_FROM_ALL") + { + if(in_match_mode) + { + std::ostringstream e; + e << args[0] << " does not allow \"" + << args[i] << "\" after PATTERN or REGEX."; + this->SetError(e.str().c_str()); + return false; + } + exclude_from_all = true; + doing = DoingNone; + } else if(doing == DoingDirs) { // Convert this directory to a full path. @@ -1273,6 +1294,7 @@ cmInstallCommand::HandleDirectoryMode(std::vector const& args) configurations, component.c_str(), message, + exclude_from_all, literal_args.c_str(), optional)); @@ -1401,7 +1423,8 @@ bool cmInstallCommand::HandleExportMode(std::vector const& args) exportSet, ica.GetDestination().c_str(), ica.GetPermissions().c_str(), ica.GetConfigurations(), - ica.GetComponent().c_str(), message, fname.c_str(), + ica.GetComponent().c_str(), message, + ica.GetExcludeFromAll(), fname.c_str(), name_space.GetCString(), exportOld.IsEnabled()); this->Makefile->AddInstallGenerator(exportGenerator); diff --git a/Source/cmInstallCommandArguments.cxx b/Source/cmInstallCommandArguments.cxx index 236ca1f..6ded365 100644 --- a/Source/cmInstallCommandArguments.cxx +++ b/Source/cmInstallCommandArguments.cxx @@ -27,14 +27,15 @@ cmInstallCommandArguments::cmInstallCommandArguments( const std::string& defaultComponent) :Parser() ,ArgumentGroup() -,Destination (&Parser, "DESTINATION" , &ArgumentGroup) -,Component (&Parser, "COMPONENT" , &ArgumentGroup) -,Rename (&Parser, "RENAME" , &ArgumentGroup) -,Permissions (&Parser, "PERMISSIONS" , &ArgumentGroup) -,Configurations(&Parser, "CONFIGURATIONS", &ArgumentGroup) -,Optional (&Parser, "OPTIONAL" , &ArgumentGroup) -,NamelinkOnly (&Parser, "NAMELINK_ONLY" , &ArgumentGroup) -,NamelinkSkip (&Parser, "NAMELINK_SKIP" , &ArgumentGroup) +,Destination (&Parser, "DESTINATION" , &ArgumentGroup) +,Component (&Parser, "COMPONENT" , &ArgumentGroup) +,ExcludeFromAll(&Parser, "EXCLUDE_FROM_ALL", &ArgumentGroup) +,Rename (&Parser, "RENAME" , &ArgumentGroup) +,Permissions (&Parser, "PERMISSIONS" , &ArgumentGroup) +,Configurations(&Parser, "CONFIGURATIONS" , &ArgumentGroup) +,Optional (&Parser, "OPTIONAL" , &ArgumentGroup) +,NamelinkOnly (&Parser, "NAMELINK_ONLY" , &ArgumentGroup) +,NamelinkSkip (&Parser, "NAMELINK_SKIP" , &ArgumentGroup) ,GenericArguments(0) ,DefaultComponentName(defaultComponent) { @@ -110,6 +111,19 @@ bool cmInstallCommandArguments::GetOptional() const return false; } +bool cmInstallCommandArguments::GetExcludeFromAll() const +{ + if (this->ExcludeFromAll.IsEnabled()) + { + return true; + } + if (this->GenericArguments!=0) + { + return this->GenericArguments->GetExcludeFromAll(); + } + return false; +} + bool cmInstallCommandArguments::GetNamelinkOnly() const { if (this->NamelinkOnly.IsEnabled()) diff --git a/Source/cmInstallCommandArguments.h b/Source/cmInstallCommandArguments.h index 90347e6..694f1ed 100644 --- a/Source/cmInstallCommandArguments.h +++ b/Source/cmInstallCommandArguments.h @@ -30,6 +30,7 @@ class cmInstallCommandArguments const std::string& GetDestination() const; const std::string& GetComponent() const; + bool GetExcludeFromAll() const; const std::string& GetRename() const; const std::string& GetPermissions() const; const std::vector& GetConfigurations() const; @@ -48,6 +49,7 @@ class cmInstallCommandArguments cmInstallCommandArguments(); // disabled cmCAString Destination; cmCAString Component; + cmCAEnabler ExcludeFromAll; cmCAString Rename; cmCAStringVector Permissions; cmCAStringVector Configurations; diff --git a/Source/cmInstallDirectoryGenerator.cxx b/Source/cmInstallDirectoryGenerator.cxx index f2e8609..6ad6c75 100644 --- a/Source/cmInstallDirectoryGenerator.cxx +++ b/Source/cmInstallDirectoryGenerator.cxx @@ -23,9 +23,11 @@ cmInstallDirectoryGenerator std::vector const& configurations, const char* component, MessageLevel message, + bool exclude_from_all, const char* literal_args, bool optional): - cmInstallGenerator(dest, configurations, component, message), + cmInstallGenerator(dest, configurations, component, message, + exclude_from_all), LocalGenerator(0), Directories(dirs), FilePermissions(file_permissions), DirPermissions(dir_permissions), diff --git a/Source/cmInstallDirectoryGenerator.h b/Source/cmInstallDirectoryGenerator.h index 9b732d3..b137f44 100644 --- a/Source/cmInstallDirectoryGenerator.h +++ b/Source/cmInstallDirectoryGenerator.h @@ -27,6 +27,7 @@ public: std::vector const& configurations, const char* component, MessageLevel message, + bool exclude_from_all, const char* literal_args, bool optional = false); virtual ~cmInstallDirectoryGenerator(); diff --git a/Source/cmInstallExportGenerator.cxx b/Source/cmInstallExportGenerator.cxx index 9570ba3..80fc054 100644 --- a/Source/cmInstallExportGenerator.cxx +++ b/Source/cmInstallExportGenerator.cxx @@ -33,9 +33,11 @@ cmInstallExportGenerator::cmInstallExportGenerator( std::vector const& configurations, const char* component, MessageLevel message, + bool exclude_from_all, const char* filename, const char* name_space, bool exportOld) - :cmInstallGenerator(destination, configurations, component, message) + :cmInstallGenerator(destination, configurations, component, message, + exclude_from_all) ,ExportSet(exportSet) ,FilePermissions(file_permissions) ,FileName(filename) diff --git a/Source/cmInstallExportGenerator.h b/Source/cmInstallExportGenerator.h index 885ed05..1b1c046 100644 --- a/Source/cmInstallExportGenerator.h +++ b/Source/cmInstallExportGenerator.h @@ -31,6 +31,7 @@ public: const std::vector& configurations, const char* component, MessageLevel message, + bool exclude_from_all, const char* filename, const char* name_space, bool exportOld); ~cmInstallExportGenerator(); diff --git a/Source/cmInstallFilesCommand.cxx b/Source/cmInstallFilesCommand.cxx index 68557bd..d3d258e 100644 --- a/Source/cmInstallFilesCommand.cxx +++ b/Source/cmInstallFilesCommand.cxx @@ -122,6 +122,7 @@ void cmInstallFilesCommand::CreateInstallGenerator() const // Use a file install generator. const char* no_permissions = ""; const char* no_rename = ""; + bool no_exclude_from_all = false; std::string no_component = this->Makefile->GetSafeDefinition( "CMAKE_INSTALL_DEFAULT_COMPONENT_NAME"); std::vector no_configurations; @@ -131,7 +132,8 @@ void cmInstallFilesCommand::CreateInstallGenerator() const new cmInstallFilesGenerator(this->Files, destination.c_str(), false, no_permissions, no_configurations, - no_component.c_str(), message, no_rename)); + no_component.c_str(), message, + no_exclude_from_all, no_rename)); } diff --git a/Source/cmInstallFilesGenerator.cxx b/Source/cmInstallFilesGenerator.cxx index 383031b..3dd5528 100644 --- a/Source/cmInstallFilesGenerator.cxx +++ b/Source/cmInstallFilesGenerator.cxx @@ -24,9 +24,11 @@ cmInstallFilesGenerator std::vector const& configurations, const char* component, MessageLevel message, + bool exclude_from_all, const char* rename, bool optional): - cmInstallGenerator(dest, configurations, component, message), + cmInstallGenerator(dest, configurations, component, message, + exclude_from_all), LocalGenerator(0), Files(files), FilePermissions(file_permissions), diff --git a/Source/cmInstallFilesGenerator.h b/Source/cmInstallFilesGenerator.h index bfe4039..efaf62b 100644 --- a/Source/cmInstallFilesGenerator.h +++ b/Source/cmInstallFilesGenerator.h @@ -26,6 +26,7 @@ public: std::vector const& configurations, const char* component, MessageLevel message, + bool exclude_from_all, const char* rename, bool optional = false); virtual ~cmInstallFilesGenerator(); diff --git a/Source/cmInstallGenerator.cxx b/Source/cmInstallGenerator.cxx index 2e1c5f0..660e44f 100644 --- a/Source/cmInstallGenerator.cxx +++ b/Source/cmInstallGenerator.cxx @@ -19,11 +19,13 @@ cmInstallGenerator ::cmInstallGenerator(const char* destination, std::vector const& configurations, const char* component, - MessageLevel message): + MessageLevel message, + bool exclude_from_all): cmScriptGenerator("CMAKE_INSTALL_CONFIG_NAME", configurations), Destination(destination? destination:""), Component(component? component:""), - Message(message) + Message(message), + ExcludeFromAll(exclude_from_all) { } @@ -146,12 +148,16 @@ void cmInstallGenerator //---------------------------------------------------------------------------- std::string -cmInstallGenerator::CreateComponentTest(const char* component) +cmInstallGenerator::CreateComponentTest(const char* component, + bool exclude_from_all) { - std::string result = "NOT CMAKE_INSTALL_COMPONENT OR " - "\"${CMAKE_INSTALL_COMPONENT}\" STREQUAL \""; + std::string result = "\"${CMAKE_INSTALL_COMPONENT}\" STREQUAL \""; result += component; result += "\""; + if(!exclude_from_all) + { + result += " OR NOT CMAKE_INSTALL_COMPONENT"; + } return result; } @@ -163,7 +169,7 @@ void cmInstallGenerator::GenerateScript(std::ostream& os) // Begin this block of installation. std::string component_test = - this->CreateComponentTest(this->Component.c_str()); + this->CreateComponentTest(this->Component.c_str(),this->ExcludeFromAll); os << indent << "if(" << component_test << ")\n"; // Generate the script possibly with per-configuration code. diff --git a/Source/cmInstallGenerator.h b/Source/cmInstallGenerator.h index b8e5b53..db89590 100644 --- a/Source/cmInstallGenerator.h +++ b/Source/cmInstallGenerator.h @@ -36,7 +36,8 @@ public: cmInstallGenerator(const char* destination, std::vector const& configurations, const char* component, - MessageLevel message); + MessageLevel message, + bool exclude_from_all); virtual ~cmInstallGenerator(); void AddInstallRule( @@ -67,12 +68,14 @@ public: protected: virtual void GenerateScript(std::ostream& os); - std::string CreateComponentTest(const char* component); + std::string CreateComponentTest(const char* component, + bool exclude_from_all); // Information shared by most generator types. std::string Destination; std::string Component; MessageLevel Message; + bool ExcludeFromAll; }; #endif diff --git a/Source/cmInstallProgramsCommand.cxx b/Source/cmInstallProgramsCommand.cxx index e6fbe88..b6d0c45 100644 --- a/Source/cmInstallProgramsCommand.cxx +++ b/Source/cmInstallProgramsCommand.cxx @@ -85,6 +85,7 @@ void cmInstallProgramsCommand::FinalPass() // Use a file install generator. const char* no_permissions = ""; const char* no_rename = ""; + bool no_exclude_from_all = false; std::string no_component = this->Makefile->GetSafeDefinition( "CMAKE_INSTALL_DEFAULT_COMPONENT_NAME"); std::vector no_configurations; @@ -94,7 +95,8 @@ void cmInstallProgramsCommand::FinalPass() new cmInstallFilesGenerator(this->Files, destination.c_str(), true, no_permissions, no_configurations, - no_component.c_str(), message, no_rename)); + no_component.c_str(), message, + no_exclude_from_all, no_rename)); } /** diff --git a/Source/cmInstallScriptGenerator.cxx b/Source/cmInstallScriptGenerator.cxx index 933aa07..d58d039 100644 --- a/Source/cmInstallScriptGenerator.cxx +++ b/Source/cmInstallScriptGenerator.cxx @@ -14,8 +14,9 @@ //---------------------------------------------------------------------------- cmInstallScriptGenerator ::cmInstallScriptGenerator(const char* script, bool code, - const char* component) : - cmInstallGenerator(0, std::vector(), component, MessageDefault), + const char* component, bool exclude_from_all) : + cmInstallGenerator(0, std::vector(), component, MessageDefault, + exclude_from_all), Script(script), Code(code) { } @@ -31,7 +32,7 @@ void cmInstallScriptGenerator::GenerateScript(std::ostream& os) { Indent indent; std::string component_test = - this->CreateComponentTest(this->Component.c_str()); + this->CreateComponentTest(this->Component.c_str(), this->ExcludeFromAll); os << indent << "if(" << component_test << ")\n"; if(this->Code) diff --git a/Source/cmInstallScriptGenerator.h b/Source/cmInstallScriptGenerator.h index 54a7b21..7e7c0c8 100644 --- a/Source/cmInstallScriptGenerator.h +++ b/Source/cmInstallScriptGenerator.h @@ -21,7 +21,7 @@ class cmInstallScriptGenerator: public cmInstallGenerator { public: cmInstallScriptGenerator(const char* script, bool code, - const char* component); + const char* component, bool exclude_from_all); virtual ~cmInstallScriptGenerator(); protected: diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx index 5e88fa2..3d44fe2 100644 --- a/Source/cmInstallTargetGenerator.cxx +++ b/Source/cmInstallTargetGenerator.cxx @@ -30,8 +30,10 @@ cmInstallTargetGenerator std::vector const& configurations, const char* component, MessageLevel message, + bool exclude_from_all, bool optional): - cmInstallGenerator(dest, configurations, component, message), + cmInstallGenerator(dest, configurations, component, message, + exclude_from_all), TargetName(targetName), Target(0), FilePermissions(file_permissions), diff --git a/Source/cmInstallTargetGenerator.h b/Source/cmInstallTargetGenerator.h index 18b3130..46b4532 100644 --- a/Source/cmInstallTargetGenerator.h +++ b/Source/cmInstallTargetGenerator.h @@ -28,6 +28,7 @@ public: std::vector const& configurations, const char* component, MessageLevel message, + bool exclude_from_all, bool optional ); virtual ~cmInstallTargetGenerator(); diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 1d17032..6b73987 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -2557,7 +2557,7 @@ public: cmInstallTargetGenerator( t, dest, implib, "", std::vector(), "Unspecified", cmInstallGenerator::SelectMessageLevel(lg->GetMakefile()), - false) + false, false) { this->Compute(lg); } @@ -2584,7 +2584,7 @@ cmLocalGenerator // Include the user-specified pre-install script for this target. if(const char* preinstall = (*l)->GetProperty("PRE_INSTALL_SCRIPT")) { - cmInstallScriptGenerator g(preinstall, false, 0); + cmInstallScriptGenerator g(preinstall, false, 0, false); g.Generate(os, config, configurationTypes); } @@ -2645,7 +2645,7 @@ cmLocalGenerator // Include the user-specified post-install script for this target. if(const char* postinstall = (*l)->GetProperty("POST_INSTALL_SCRIPT")) { - cmInstallScriptGenerator g(postinstall, false, 0); + cmInstallScriptGenerator g(postinstall, false, 0, false); g.Generate(os, config, configurationTypes); } } ----------------------------------------------------------------------- Summary of changes: Help/command/install.rst | 23 ++++++---- Help/release/dev/install-EXCLUDE_FROM_ALL.rst | 5 +++ Source/cmInstallCommand.cxx | 31 ++++++++++++-- Source/cmInstallCommandArguments.cxx | 30 +++++++++---- Source/cmInstallCommandArguments.h | 2 + Source/cmInstallDirectoryGenerator.cxx | 4 +- Source/cmInstallDirectoryGenerator.h | 1 + Source/cmInstallExportGenerator.cxx | 4 +- Source/cmInstallExportGenerator.h | 1 + Source/cmInstallFilesCommand.cxx | 4 +- Source/cmInstallFilesGenerator.cxx | 4 +- Source/cmInstallFilesGenerator.h | 1 + Source/cmInstallGenerator.cxx | 18 +++++--- Source/cmInstallGenerator.h | 7 ++- Source/cmInstallProgramsCommand.cxx | 4 +- Source/cmInstallScriptGenerator.cxx | 7 +-- Source/cmInstallScriptGenerator.h | 2 +- Source/cmInstallTargetGenerator.cxx | 4 +- Source/cmInstallTargetGenerator.h | 1 + Source/cmLocalGenerator.cxx | 6 +-- .../install/FILES-EXCLUDE_FROM_ALL-all-check.cmake | 1 + .../install/FILES-EXCLUDE_FROM_ALL-exc-check.cmake | 1 + .../install/FILES-EXCLUDE_FROM_ALL-uns-check.cmake | 1 + .../RunCMake/install/FILES-EXCLUDE_FROM_ALL.cmake | 3 ++ Tests/RunCMake/install/RunCMakeTest.cmake | 45 ++++++++++++++++++++ .../TARGETS-EXCLUDE_FROM_ALL-all-check.cmake | 1 + .../TARGETS-EXCLUDE_FROM_ALL-exc-check.cmake | 1 + .../TARGETS-EXCLUDE_FROM_ALL-uns-check.cmake | 1 + .../install/TARGETS-EXCLUDE_FROM_ALL.cmake | 5 +++ .../LinkInterfaceLoop => RunCMake/install}/main.c | 0 30 files changed, 177 insertions(+), 41 deletions(-) create mode 100644 Help/release/dev/install-EXCLUDE_FROM_ALL.rst create mode 100644 Tests/RunCMake/install/FILES-EXCLUDE_FROM_ALL-all-check.cmake create mode 100644 Tests/RunCMake/install/FILES-EXCLUDE_FROM_ALL-exc-check.cmake create mode 100644 Tests/RunCMake/install/FILES-EXCLUDE_FROM_ALL-uns-check.cmake create mode 100644 Tests/RunCMake/install/FILES-EXCLUDE_FROM_ALL.cmake create mode 100644 Tests/RunCMake/install/TARGETS-EXCLUDE_FROM_ALL-all-check.cmake create mode 100644 Tests/RunCMake/install/TARGETS-EXCLUDE_FROM_ALL-exc-check.cmake create mode 100644 Tests/RunCMake/install/TARGETS-EXCLUDE_FROM_ALL-uns-check.cmake create mode 100644 Tests/RunCMake/install/TARGETS-EXCLUDE_FROM_ALL.cmake copy Tests/{CMakeOnly/LinkInterfaceLoop => RunCMake/install}/main.c (100%) hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 4 11:19:19 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 4 Feb 2016 11:19:19 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-24-g186352a Message-ID: <20160204161919.ED3DEE48E0@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, next has been updated via 186352a2c7090d03eabde1919200bc1daadb9e4c (commit) via 58a4a7713233bebb5feca5985d0850d170703122 (commit) from 92701885ff148e94a05823d72559a31a9a8085b0 (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=186352a2c7090d03eabde1919200bc1daadb9e4c commit 186352a2c7090d03eabde1919200bc1daadb9e4c Merge: 9270188 58a4a77 Author: Brad King AuthorDate: Thu Feb 4 11:19:19 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Feb 4 11:19:19 2016 -0500 Merge topic 'fix-pedantic-warnings' into next 58a4a771 Make cmLinkInterface:: and cmGeneratorTarget::Multiplicity unsigned ints https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=58a4a7713233bebb5feca5985d0850d170703122 commit 58a4a7713233bebb5feca5985d0850d170703122 Author: Christoph Gr?ninger AuthorDate: Wed Feb 3 23:22:38 2016 +0100 Commit: Brad King CommitDate: Thu Feb 4 10:57:02 2016 -0500 Make cmLinkInterface:: and cmGeneratorTarget::Multiplicity unsigned ints diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx index 13098ad..2796fdf 100644 --- a/Source/cmComputeLinkDepends.cxx +++ b/Source/cmComputeLinkDepends.cxx @@ -931,7 +931,7 @@ cmComputeLinkDepends::MakePendingComponent(unsigned int component) //---------------------------------------------------------------------------- int cmComputeLinkDepends::ComputeComponentCount(NodeList const& nl) { - int count = 2; + unsigned int count = 2; for(NodeList::const_iterator ni = nl.begin(); ni != nl.end(); ++ni) { if(cmGeneratorTarget const* target = this->EntryList[*ni].Target) diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h index d96a32c..65c29f5 100644 --- a/Source/cmGeneratorTarget.h +++ b/Source/cmGeneratorTarget.h @@ -599,7 +599,7 @@ private: { ImportInfo(): NoSOName(false), Multiplicity(0) {} bool NoSOName; - int Multiplicity; + unsigned int Multiplicity; std::string Location; std::string SOName; std::string ImportLibrary; diff --git a/Source/cmLinkItem.h b/Source/cmLinkItem.h index b603bcc..561293e 100644 --- a/Source/cmLinkItem.h +++ b/Source/cmLinkItem.h @@ -73,7 +73,7 @@ struct cmLinkInterface: public cmLinkInterfaceLibraries // Number of repetitions of a strongly connected component of two // or more static libraries. - int Multiplicity; + unsigned int Multiplicity; // Libraries listed for other configurations. // Needed only for OLD behavior of CMP0003. ----------------------------------------------------------------------- Summary of changes: Source/cmComputeLinkDepends.cxx | 2 +- Source/cmGeneratorTarget.h | 2 +- Source/cmLinkItem.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 4 12:53:55 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 4 Feb 2016 12:53:55 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-26-gd57db1d Message-ID: <20160204175355.ACC4DE4883@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, next has been updated via d57db1d14df72ff5a13aa169a5334a453121ca2c (commit) via 290fb8b987324dc8fda52d9f2ebbc51d6d9abbac (commit) from 186352a2c7090d03eabde1919200bc1daadb9e4c (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=d57db1d14df72ff5a13aa169a5334a453121ca2c commit d57db1d14df72ff5a13aa169a5334a453121ca2c Merge: 186352a 290fb8b Author: Brad King AuthorDate: Thu Feb 4 12:53:54 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Feb 4 12:53:54 2016 -0500 Merge topic 'fix-install-EXPORT-crash' into next 290fb8b9 install(EXPORT): Fix crash on target in another directory https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=290fb8b987324dc8fda52d9f2ebbc51d6d9abbac commit 290fb8b987324dc8fda52d9f2ebbc51d6d9abbac Author: Brad King AuthorDate: Thu Feb 4 11:45:54 2016 -0500 Commit: Brad King CommitDate: Thu Feb 4 12:51:49 2016 -0500 install(EXPORT): Fix crash on target in another directory Refactoring merged by commit 9afbb733ec (Merge topic 'use-generator-target', 2015-10-20) in and around commit 381e7afd (cmExportSet: Store a cmGeneratorTarget, 2015-10-17) changed export sets to delay looking up actual targets and stores only their names. However, in InstallCommand::HandleExportMode we need to lookup targets immediately to check them for EXPORT_LINK_INTERFACE_LIBRARIES. The check was accidentally made local to the current directory, so if an export set contains a target from another directory the lookup fails and CMake crashes. Fix the check to look up the target name globally, and tolerate when no target is found just in case. Reported-by: Kelly Thompson diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx index 15a83ee..2d78a41 100644 --- a/Source/cmInstallCommand.cxx +++ b/Source/cmInstallCommand.cxx @@ -1374,10 +1374,12 @@ bool cmInstallCommand::HandleExportMode(std::vector const& args) tei != exportSet->GetTargetExports()->end(); ++tei) { cmTargetExport const* te = *tei; - cmTarget* tgt = this->Makefile->FindTarget(te->TargetName); + cmTarget* tgt = + this->Makefile->GetGlobalGenerator()->FindTarget(te->TargetName); const bool newCMP0022Behavior = - tgt->GetPolicyStatusCMP0022() != cmPolicies::WARN - && tgt->GetPolicyStatusCMP0022() != cmPolicies::OLD; + (tgt && + tgt->GetPolicyStatusCMP0022() != cmPolicies::WARN && + tgt->GetPolicyStatusCMP0022() != cmPolicies::OLD); if(!newCMP0022Behavior) { diff --git a/Tests/RunCMake/install/EXPORT-OldIFace.cmake b/Tests/RunCMake/install/EXPORT-OldIFace.cmake new file mode 100644 index 0000000..8dfb46b --- /dev/null +++ b/Tests/RunCMake/install/EXPORT-OldIFace.cmake @@ -0,0 +1,6 @@ +enable_language(C) +add_subdirectory(EXPORT-OldIFace) +add_library(foo SHARED empty.c) +target_link_libraries(foo bar) +install(TARGETS foo DESTINATION lib EXPORT fooExport) +install(EXPORT fooExport DESTINATION lib/cmake/foo EXPORT_LINK_INTERFACE_LIBRARIES) diff --git a/Tests/RunCMake/install/EXPORT-OldIFace/CMakeLists.txt b/Tests/RunCMake/install/EXPORT-OldIFace/CMakeLists.txt new file mode 100644 index 0000000..32292e2 --- /dev/null +++ b/Tests/RunCMake/install/EXPORT-OldIFace/CMakeLists.txt @@ -0,0 +1,2 @@ +add_library(bar SHARED ../empty.c) +install(TARGETS bar DESTINATION lib EXPORT fooExport) diff --git a/Tests/RunCMake/install/RunCMakeTest.cmake b/Tests/RunCMake/install/RunCMakeTest.cmake index 2c1b29d..c2347d8 100644 --- a/Tests/RunCMake/install/RunCMakeTest.cmake +++ b/Tests/RunCMake/install/RunCMakeTest.cmake @@ -10,6 +10,7 @@ run_cmake(DIRECTORY-DIRECTORY-bad) run_cmake(DIRECTORY-DESTINATION-bad) run_cmake(FILES-DESTINATION-bad) run_cmake(TARGETS-DESTINATION-bad) +run_cmake(EXPORT-OldIFace) run_cmake(CMP0062-OLD) run_cmake(CMP0062-NEW) run_cmake(CMP0062-WARN) ----------------------------------------------------------------------- Summary of changes: Source/cmInstallCommand.cxx | 8 +++++--- Tests/RunCMake/install/EXPORT-OldIFace.cmake | 6 ++++++ Tests/RunCMake/install/EXPORT-OldIFace/CMakeLists.txt | 2 ++ Tests/RunCMake/install/RunCMakeTest.cmake | 1 + 4 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 Tests/RunCMake/install/EXPORT-OldIFace.cmake create mode 100644 Tests/RunCMake/install/EXPORT-OldIFace/CMakeLists.txt hooks/post-receive -- CMake From kwrobot at kitware.com Fri Feb 5 00:01:08 2016 From: kwrobot at kitware.com (Kitware Robot) Date: Fri, 5 Feb 2016 00:01:08 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc1-9-g5ee00b7 Message-ID: <20160205050110.B766EE4876@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 5ee00b71e94f5daa985b8453ae67b125ea0983d9 (commit) from 7b1fbcc4b035c591491c5033cbfbfc0aabd80fde (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=5ee00b71e94f5daa985b8453ae67b125ea0983d9 commit 5ee00b71e94f5daa985b8453ae67b125ea0983d9 Author: Kitware Robot AuthorDate: Fri Feb 5 00:01:04 2016 -0500 Commit: Kitware Robot CommitDate: Fri Feb 5 00:01:04 2016 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index fc7bd9f..91079a8 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 5) -set(CMake_VERSION_PATCH 20160204) +set(CMake_VERSION_PATCH 20160205) #set(CMake_VERSION_RC 1) ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Fri Feb 5 09:29:31 2016 From: brad.king at kitware.com (Brad King) Date: Fri, 5 Feb 2016 09:29:31 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-28-g599f02d Message-ID: <20160205142931.6CE52E4BE0@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, next has been updated via 599f02d90301a61a10a9ef9273f0f6c1332242d3 (commit) via c5eb21b6d1f4187778ad49545761a818e1126541 (commit) from d57db1d14df72ff5a13aa169a5334a453121ca2c (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=599f02d90301a61a10a9ef9273f0f6c1332242d3 commit 599f02d90301a61a10a9ef9273f0f6c1332242d3 Merge: d57db1d c5eb21b Author: Brad King AuthorDate: Fri Feb 5 09:29:30 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 5 09:29:30 2016 -0500 Merge topic 'fix-Fortran-module-in-subdir' into next c5eb21b6 Fix dependency scanning configuration in subdirectories https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5eb21b6d1f4187778ad49545761a818e1126541 commit c5eb21b6d1f4187778ad49545761a818e1126541 Author: Brad King AuthorDate: Fri Feb 5 08:55:15 2016 -0500 Commit: Brad King CommitDate: Fri Feb 5 09:26:44 2016 -0500 Fix dependency scanning configuration in subdirectories Refactoring in commit v3.5.0-rc1~347^2~2 (Set the current dirs on the snapshot before creating the cmMakefile) accidentally changed the source and binary directories configured in `cmake -E cmake_depends` for use during dependency scanning. This can cause the wrong directory information to be loaded. It also breaks Fortran module dependency scanning for modules provided by targets in subdirectories that do not have Fortran_MODULE_DIRECTORY set. Fix the dependency scanning directory configuration and add a test to cover the Fortran module case in which the breakage was observed. Reported-by: Kelly Thompson diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index 1dc304c..e9d77b2 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -813,10 +813,8 @@ int cmcmd::ExecuteCMakeCommand(std::vector& args) { cm.SetGlobalGenerator(ggd); cmState::Snapshot snapshot = cm.GetCurrentSnapshot(); - snapshot.GetDirectory().SetCurrentBinary - (cmSystemTools::GetCurrentWorkingDirectory()); - snapshot.GetDirectory().SetCurrentSource - (cmSystemTools::GetCurrentWorkingDirectory()); + snapshot.GetDirectory().SetCurrentBinary(startOutDir); + snapshot.GetDirectory().SetCurrentSource(startDir); cmsys::auto_ptr mf(new cmMakefile(ggd, snapshot)); cmsys::auto_ptr lgd( ggd->CreateLocalGenerator(mf.get())); diff --git a/Tests/Fortran/CMakeLists.txt b/Tests/Fortran/CMakeLists.txt index 753ce27..ecf38a6 100644 --- a/Tests/Fortran/CMakeLists.txt +++ b/Tests/Fortran/CMakeLists.txt @@ -223,5 +223,6 @@ if(TEST_MODULE_DEPENDS) endif() add_subdirectory(Library) + add_subdirectory(Subdir) add_subdirectory(Executable) endif() diff --git a/Tests/Fortran/Executable/CMakeLists.txt b/Tests/Fortran/Executable/CMakeLists.txt index 55f21ad..de08d86 100644 --- a/Tests/Fortran/Executable/CMakeLists.txt +++ b/Tests/Fortran/Executable/CMakeLists.txt @@ -3,6 +3,6 @@ include_directories(${External_BINARY_DIR}) link_directories(${External_BINARY_DIR}) add_executable(subdir_exe2 main.f90) -target_link_libraries(subdir_exe2 subdir_mods) +target_link_libraries(subdir_exe2 subdir_mods subdir_mods2) add_dependencies(subdir_exe2 ExternalTarget) target_link_libraries(subdir_exe2 myext) diff --git a/Tests/Fortran/Executable/main.f90 b/Tests/Fortran/Executable/main.f90 index f21156c..640259c 100644 --- a/Tests/Fortran/Executable/main.f90 +++ b/Tests/Fortran/Executable/main.f90 @@ -1,6 +1,7 @@ PROGRAM MAINF90 USE libraryModuleA USE libraryModuleB + USE subdirModuleA USE externalMod CALL printExtModGreeting END PROGRAM MAINF90 diff --git a/Tests/Fortran/Subdir/CMakeLists.txt b/Tests/Fortran/Subdir/CMakeLists.txt new file mode 100644 index 0000000..52683e5 --- /dev/null +++ b/Tests/Fortran/Subdir/CMakeLists.txt @@ -0,0 +1,2 @@ +add_library(subdir_mods2 subdir.f90) +target_include_directories(subdir_mods2 INTERFACE ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/Tests/Fortran/Subdir/subdir.f90 b/Tests/Fortran/Subdir/subdir.f90 new file mode 100644 index 0000000..68955f6 --- /dev/null +++ b/Tests/Fortran/Subdir/subdir.f90 @@ -0,0 +1,2 @@ +MODULE subdirModuleA +END MODULE ----------------------------------------------------------------------- Summary of changes: Source/cmcmd.cxx | 6 ++---- Tests/Fortran/CMakeLists.txt | 1 + Tests/Fortran/Executable/CMakeLists.txt | 2 +- Tests/Fortran/Executable/main.f90 | 1 + Tests/Fortran/Subdir/CMakeLists.txt | 2 ++ Tests/Fortran/Subdir/subdir.f90 | 2 ++ 6 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 Tests/Fortran/Subdir/CMakeLists.txt create mode 100644 Tests/Fortran/Subdir/subdir.f90 hooks/post-receive -- CMake From brad.king at kitware.com Fri Feb 5 09:44:03 2016 From: brad.king at kitware.com (Brad King) Date: Fri, 5 Feb 2016 09:44:03 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-30-g09bc2bc Message-ID: <20160205144403.73277E36A7@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, next has been updated via 09bc2bc7260d7fcc1767da7de6e7b063628e03c3 (commit) via d0a984faa8b94c09e9b61e7d02b4b8526c22838e (commit) from 599f02d90301a61a10a9ef9273f0f6c1332242d3 (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=09bc2bc7260d7fcc1767da7de6e7b063628e03c3 commit 09bc2bc7260d7fcc1767da7de6e7b063628e03c3 Merge: 599f02d d0a984f Author: Brad King AuthorDate: Fri Feb 5 09:44:02 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 5 09:44:02 2016 -0500 Merge topic 'fix-install-EXPORT-crash' into next d0a984fa Tests: Use newer policy settings in RunCMake.install test https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0a984faa8b94c09e9b61e7d02b4b8526c22838e commit d0a984faa8b94c09e9b61e7d02b4b8526c22838e Author: Brad King AuthorDate: Fri Feb 5 09:40:13 2016 -0500 Commit: Brad King CommitDate: Fri Feb 5 09:42:16 2016 -0500 Tests: Use newer policy settings in RunCMake.install test In particular, avoid CMP0042 warnings on OS X. diff --git a/Tests/RunCMake/install/CMP0062-NEW.cmake b/Tests/RunCMake/install/CMP0062-NEW.cmake index a696f56..9e7a5fb 100644 --- a/Tests/RunCMake/install/CMP0062-NEW.cmake +++ b/Tests/RunCMake/install/CMP0062-NEW.cmake @@ -1,4 +1,4 @@ - +cmake_policy(VERSION 3.2) cmake_policy(SET CMP0062 NEW) add_library(iface INTERFACE) diff --git a/Tests/RunCMake/install/CMP0062-OLD.cmake b/Tests/RunCMake/install/CMP0062-OLD.cmake index 94b809a..8874923 100644 --- a/Tests/RunCMake/install/CMP0062-OLD.cmake +++ b/Tests/RunCMake/install/CMP0062-OLD.cmake @@ -1,4 +1,4 @@ - +cmake_policy(VERSION 3.2) cmake_policy(SET CMP0062 OLD) add_library(iface INTERFACE) diff --git a/Tests/RunCMake/install/CMP0062-WARN.cmake b/Tests/RunCMake/install/CMP0062-WARN.cmake index 0435a64..018f822 100644 --- a/Tests/RunCMake/install/CMP0062-WARN.cmake +++ b/Tests/RunCMake/install/CMP0062-WARN.cmake @@ -1,3 +1,4 @@ +cmake_policy(VERSION 3.2) add_library(iface INTERFACE) export(TARGETS iface FILE "${CMAKE_CURRENT_BINARY_DIR}/exported.cmake") diff --git a/Tests/RunCMake/install/CMakeLists.txt b/Tests/RunCMake/install/CMakeLists.txt index 4b3de84..6dd8cdf 100644 --- a/Tests/RunCMake/install/CMakeLists.txt +++ b/Tests/RunCMake/install/CMakeLists.txt @@ -1,3 +1,3 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.4) project(${RunCMake_TEST} NONE) include(${RunCMake_TEST}.cmake) ----------------------------------------------------------------------- Summary of changes: Tests/RunCMake/install/CMP0062-NEW.cmake | 2 +- Tests/RunCMake/install/CMP0062-OLD.cmake | 2 +- Tests/RunCMake/install/CMP0062-WARN.cmake | 1 + Tests/RunCMake/install/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Fri Feb 5 09:46:33 2016 From: brad.king at kitware.com (Brad King) Date: Fri, 5 Feb 2016 09:46:33 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-33-g405dcbb Message-ID: <20160205144633.56E7AE40DE@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, next has been updated via 405dcbb37c9a442a92d5df52f6f6ecf387cd7cb7 (commit) via 47460f3e152a59af81edd816cdfe6e0d54e38090 (commit) via e86383e135e4cae9d54575445d945df1f6272b3a (commit) from 09bc2bc7260d7fcc1767da7de6e7b063628e03c3 (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=405dcbb37c9a442a92d5df52f6f6ecf387cd7cb7 commit 405dcbb37c9a442a92d5df52f6f6ecf387cd7cb7 Merge: 09bc2bc 47460f3 Author: Brad King AuthorDate: Fri Feb 5 09:46:32 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 5 09:46:32 2016 -0500 Merge topic 'fix-install-EXPORT-crash' into next 47460f3e install(EXPORT): Fix crash on target in another directory e86383e1 Tests: Use newer policy settings in RunCMake.install test https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=47460f3e152a59af81edd816cdfe6e0d54e38090 commit 47460f3e152a59af81edd816cdfe6e0d54e38090 Author: Brad King AuthorDate: Thu Feb 4 11:45:54 2016 -0500 Commit: Brad King CommitDate: Fri Feb 5 09:45:16 2016 -0500 install(EXPORT): Fix crash on target in another directory Refactoring merged by commit v3.5.0-rc1~299 (Merge topic 'use-generator-target', 2015-10-20) in and around commit v3.5.0-rc1~299^2~13 (cmExportSet: Store a cmGeneratorTarget, 2015-10-17) changed export sets to delay looking up actual targets and stores only their names. However, in InstallCommand::HandleExportMode we need to lookup targets immediately to check them for EXPORT_LINK_INTERFACE_LIBRARIES. The check was accidentally made local to the current directory, so if an export set contains a target from another directory the lookup fails and CMake crashes. Fix the check to look up the target name globally, and tolerate when no target is found just in case. Reported-by: Kelly Thompson diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx index 15a83ee..2d78a41 100644 --- a/Source/cmInstallCommand.cxx +++ b/Source/cmInstallCommand.cxx @@ -1374,10 +1374,12 @@ bool cmInstallCommand::HandleExportMode(std::vector const& args) tei != exportSet->GetTargetExports()->end(); ++tei) { cmTargetExport const* te = *tei; - cmTarget* tgt = this->Makefile->FindTarget(te->TargetName); + cmTarget* tgt = + this->Makefile->GetGlobalGenerator()->FindTarget(te->TargetName); const bool newCMP0022Behavior = - tgt->GetPolicyStatusCMP0022() != cmPolicies::WARN - && tgt->GetPolicyStatusCMP0022() != cmPolicies::OLD; + (tgt && + tgt->GetPolicyStatusCMP0022() != cmPolicies::WARN && + tgt->GetPolicyStatusCMP0022() != cmPolicies::OLD); if(!newCMP0022Behavior) { diff --git a/Tests/RunCMake/install/EXPORT-OldIFace.cmake b/Tests/RunCMake/install/EXPORT-OldIFace.cmake new file mode 100644 index 0000000..8dfb46b --- /dev/null +++ b/Tests/RunCMake/install/EXPORT-OldIFace.cmake @@ -0,0 +1,6 @@ +enable_language(C) +add_subdirectory(EXPORT-OldIFace) +add_library(foo SHARED empty.c) +target_link_libraries(foo bar) +install(TARGETS foo DESTINATION lib EXPORT fooExport) +install(EXPORT fooExport DESTINATION lib/cmake/foo EXPORT_LINK_INTERFACE_LIBRARIES) diff --git a/Tests/RunCMake/install/EXPORT-OldIFace/CMakeLists.txt b/Tests/RunCMake/install/EXPORT-OldIFace/CMakeLists.txt new file mode 100644 index 0000000..32292e2 --- /dev/null +++ b/Tests/RunCMake/install/EXPORT-OldIFace/CMakeLists.txt @@ -0,0 +1,2 @@ +add_library(bar SHARED ../empty.c) +install(TARGETS bar DESTINATION lib EXPORT fooExport) diff --git a/Tests/RunCMake/install/RunCMakeTest.cmake b/Tests/RunCMake/install/RunCMakeTest.cmake index 2c1b29d..c2347d8 100644 --- a/Tests/RunCMake/install/RunCMakeTest.cmake +++ b/Tests/RunCMake/install/RunCMakeTest.cmake @@ -10,6 +10,7 @@ run_cmake(DIRECTORY-DIRECTORY-bad) run_cmake(DIRECTORY-DESTINATION-bad) run_cmake(FILES-DESTINATION-bad) run_cmake(TARGETS-DESTINATION-bad) +run_cmake(EXPORT-OldIFace) run_cmake(CMP0062-OLD) run_cmake(CMP0062-NEW) run_cmake(CMP0062-WARN) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e86383e135e4cae9d54575445d945df1f6272b3a commit e86383e135e4cae9d54575445d945df1f6272b3a Author: Brad King AuthorDate: Fri Feb 5 09:40:13 2016 -0500 Commit: Brad King CommitDate: Fri Feb 5 09:44:26 2016 -0500 Tests: Use newer policy settings in RunCMake.install test In particular, avoid CMP0042 warnings on OS X. diff --git a/Tests/RunCMake/install/CMP0062-NEW.cmake b/Tests/RunCMake/install/CMP0062-NEW.cmake index a696f56..9e7a5fb 100644 --- a/Tests/RunCMake/install/CMP0062-NEW.cmake +++ b/Tests/RunCMake/install/CMP0062-NEW.cmake @@ -1,4 +1,4 @@ - +cmake_policy(VERSION 3.2) cmake_policy(SET CMP0062 NEW) add_library(iface INTERFACE) diff --git a/Tests/RunCMake/install/CMP0062-OLD.cmake b/Tests/RunCMake/install/CMP0062-OLD.cmake index 94b809a..8874923 100644 --- a/Tests/RunCMake/install/CMP0062-OLD.cmake +++ b/Tests/RunCMake/install/CMP0062-OLD.cmake @@ -1,4 +1,4 @@ - +cmake_policy(VERSION 3.2) cmake_policy(SET CMP0062 OLD) add_library(iface INTERFACE) diff --git a/Tests/RunCMake/install/CMP0062-WARN.cmake b/Tests/RunCMake/install/CMP0062-WARN.cmake index 0435a64..018f822 100644 --- a/Tests/RunCMake/install/CMP0062-WARN.cmake +++ b/Tests/RunCMake/install/CMP0062-WARN.cmake @@ -1,3 +1,4 @@ +cmake_policy(VERSION 3.2) add_library(iface INTERFACE) export(TARGETS iface FILE "${CMAKE_CURRENT_BINARY_DIR}/exported.cmake") diff --git a/Tests/RunCMake/install/CMakeLists.txt b/Tests/RunCMake/install/CMakeLists.txt index 4b3de84..6dd8cdf 100644 --- a/Tests/RunCMake/install/CMakeLists.txt +++ b/Tests/RunCMake/install/CMakeLists.txt @@ -1,3 +1,3 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.4) project(${RunCMake_TEST} NONE) include(${RunCMake_TEST}.cmake) ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake From brad.king at kitware.com Fri Feb 5 10:53:47 2016 From: brad.king at kitware.com (Brad King) Date: Fri, 5 Feb 2016 10:53:47 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-36-gee1a481 Message-ID: <20160205155347.A4E8DE46E2@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, next has been updated via ee1a481cf097d78e547e4af821767b3347c443d8 (commit) via d31d7ffd1e59c9fe2a108726d2d9d78adf90ca11 (commit) via 5ee00b71e94f5daa985b8453ae67b125ea0983d9 (commit) from 405dcbb37c9a442a92d5df52f6f6ecf387cd7cb7 (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=ee1a481cf097d78e547e4af821767b3347c443d8 commit ee1a481cf097d78e547e4af821767b3347c443d8 Merge: 405dcbb d31d7ff Author: Brad King AuthorDate: Fri Feb 5 10:53:47 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 5 10:53:47 2016 -0500 Merge topic 'test-FortranCInterface-again' into next d31d7ffd Tests: Fix Fortran test to run FortranCInterface again 5ee00b71 CMake Nightly Date Stamp https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d31d7ffd1e59c9fe2a108726d2d9d78adf90ca11 commit d31d7ffd1e59c9fe2a108726d2d9d78adf90ca11 Author: Brad King AuthorDate: Fri Feb 5 10:48:20 2016 -0500 Commit: Brad King CommitDate: Fri Feb 5 10:49:08 2016 -0500 Tests: Fix Fortran test to run FortranCInterface again Updates to Tests/Fortran by commit v3.2.0-rc1~501^2 (Avoid if() quoted auto-dereference, 2014-10-14) changed our check "${CMAKE_Fortran_COMPILER_ID}" MATCHES "${CMAKE_C_COMPILER_ID}" to CMAKE_Fortran_COMPILER_ID MATCHES CMAKE_C_COMPILER_ID because CMP0054 warned about the LHS compiler id "MSVC" being expanded. However, the RHS of if(MATCHES) does not auto-dereference so this check has returned FALSE since then and the FortranCInterface part of the test has not been running! Fix this by using STREQUAL with quoted arguments and setting CMP0054 to NEW (by requiring 3.1). diff --git a/Tests/Fortran/CMakeLists.txt b/Tests/Fortran/CMakeLists.txt index 753ce27..51e971b 100644 --- a/Tests/Fortran/CMakeLists.txt +++ b/Tests/Fortran/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.0) +cmake_minimum_required (VERSION 3.1) project(testf C CXX Fortran) if(NOT DEFINED CMake_TEST_NESTED_MAKE_PROGRAM AND NOT CMAKE_GENERATOR MATCHES "Visual Studio") set(CMake_TEST_NESTED_MAKE_PROGRAM "${CMAKE_MAKE_PROGRAM}") @@ -119,7 +119,7 @@ endfunction() # call the test_fortran_c_interface_module function if("${CMAKE_Fortran_COMPILER_ID}:${CMAKE_C_COMPILER_ID}" MATCHES "(Intel:MSVC|Absoft:GNU)" - OR (CMAKE_Fortran_COMPILER_ID MATCHES CMAKE_C_COMPILER_ID )) + OR ("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "${CMAKE_C_COMPILER_ID}" )) test_fortran_c_interface_module() else() message("Fortran does not match c compiler") ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- Tests/Fortran/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Fri Feb 5 11:49:21 2016 From: brad.king at kitware.com (Brad King) Date: Fri, 5 Feb 2016 11:49:21 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-39-gea89648 Message-ID: <20160205164921.73728E4425@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, next has been updated via ea896482b563918c9d839577adab1ee926893bcd (commit) via 497cad7c883dc401b4d78109c3a057fb38745d9e (commit) via 886acd80f09c807fccbfcde713c53a7686386968 (commit) from ee1a481cf097d78e547e4af821767b3347c443d8 (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=ea896482b563918c9d839577adab1ee926893bcd commit ea896482b563918c9d839577adab1ee926893bcd Merge: ee1a481 497cad7 Author: Brad King AuthorDate: Fri Feb 5 11:49:20 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 5 11:49:20 2016 -0500 Merge topic 'error-multiple-targets' into next 497cad7c cmake: Teach --build to reject multiple --target options 886acd80 Help: Fix reference to `cmake --build` in cmake(1) manual https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=497cad7c883dc401b4d78109c3a057fb38745d9e commit 497cad7c883dc401b4d78109c3a057fb38745d9e Author: Sebastian Schuberth AuthorDate: Thu Feb 4 12:36:44 2016 +0100 Commit: Brad King CommitDate: Fri Feb 5 11:48:16 2016 -0500 cmake: Teach --build to reject multiple --target options Previously we did not clearly document that `--target` is only supported to be specified once. Even worse, specifying it multiple times would silently ignore any previously specified targets and only build the last target. Update the documentation to specify this. Update the implementation to reject multiple `--target` options to prevent user errors. diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst index 273a780..959148e 100644 --- a/Help/manual/cmake.1.rst +++ b/Help/manual/cmake.1.rst @@ -58,6 +58,7 @@ Options = Project binary directory to be built. --target = Build instead of default targets. + May only be specified once. --config = For multi-configuration tools, choose . --clean-first = Build target 'clean' first, then build. (To clean only, use --target 'clean'.) diff --git a/Help/release/dev/error-multiple-targets.rst b/Help/release/dev/error-multiple-targets.rst new file mode 100644 index 0000000..060b26b --- /dev/null +++ b/Help/release/dev/error-multiple-targets.rst @@ -0,0 +1,6 @@ +error-multiple-targets +---------------------- + +* The :manual:`cmake(1)` ``--build`` command-line tool now rejects multiple + ``--target`` options with an error instead of silently ignoring all but the + last one. diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx index a06b26f..c60b962 100644 --- a/Source/cmakemain.cxx +++ b/Source/cmakemain.cxx @@ -60,6 +60,7 @@ static const char * cmDocumentationUsageNote[][2] = #define CMAKE_BUILD_OPTIONS \ " = Project binary directory to be built.\n" \ " --target = Build instead of default targets.\n" \ + " May only be specified once.\n" \ " --config = For multi-configuration tools, choose .\n" \ " --clean-first = Build target 'clean' first, then build.\n" \ " (To clean only, use --target 'clean'.)\n" \ @@ -386,6 +387,7 @@ static int do_build(int ac, char const* const* av) std::string dir; std::vector nativeOptions; bool clean = false; + bool hasTarget = false; enum Doing { DoingNone, DoingDir, DoingTarget, DoingConfig, DoingNative}; Doing doing = DoingDir; @@ -397,7 +399,17 @@ static int do_build(int ac, char const* const* av) } else if(strcmp(av[i], "--target") == 0) { - doing = DoingTarget; + if (!hasTarget) + { + doing = DoingTarget; + hasTarget = true; + } + else + { + std::cerr << "'--target' may not be specified more than once.\n\n"; + dir = ""; + break; + } } else if(strcmp(av[i], "--config") == 0) { diff --git a/Tests/RunCMake/CommandLine/BuildDir--build-multiple-targets-result.txt b/Tests/RunCMake/CommandLine/BuildDir--build-multiple-targets-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/CommandLine/BuildDir--build-multiple-targets-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/CommandLine/BuildDir--build-multiple-targets-stderr.txt b/Tests/RunCMake/CommandLine/BuildDir--build-multiple-targets-stderr.txt new file mode 100644 index 0000000..f2cbaa6 --- /dev/null +++ b/Tests/RunCMake/CommandLine/BuildDir--build-multiple-targets-stderr.txt @@ -0,0 +1,3 @@ +^'--target' may not be specified more than once\. ++ +Usage: cmake --build \[options\] \[-- \[native-options\]\] diff --git a/Tests/RunCMake/CommandLine/BuildDir/CMakeLists.txt b/Tests/RunCMake/CommandLine/BuildDir/CMakeLists.txt index 20df108..d2a2831 100644 --- a/Tests/RunCMake/CommandLine/BuildDir/CMakeLists.txt +++ b/Tests/RunCMake/CommandLine/BuildDir/CMakeLists.txt @@ -3,3 +3,5 @@ add_custom_command( COMMAND ${CMAKE_COMMAND} -E echo CustomCommand > output.txt ) add_custom_target(CustomTarget ALL DEPENDS output.txt) +add_custom_target(CustomTarget2 ALL DEPENDS output.txt) +add_custom_target(CustomTarget3 ALL DEPENDS output.txt) diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake index e3b73ff..a07bbbe 100644 --- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake +++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake @@ -51,6 +51,8 @@ function(run_BuildDir) run_cmake(BuildDir) run_cmake_command(BuildDir--build ${CMAKE_COMMAND} -E chdir .. ${CMAKE_COMMAND} --build BuildDir-build --target CustomTarget) + run_cmake_command(BuildDir--build-multiple-targets ${CMAKE_COMMAND} -E chdir .. + ${CMAKE_COMMAND} --build BuildDir-build --target CustomTarget2 --target CustomTarget3) endfunction() run_BuildDir() https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=886acd80f09c807fccbfcde713c53a7686386968 commit 886acd80f09c807fccbfcde713c53a7686386968 Author: Brad King AuthorDate: Fri Feb 5 11:47:41 2016 -0500 Commit: Brad King CommitDate: Fri Feb 5 11:48:16 2016 -0500 Help: Fix reference to `cmake --build` in cmake(1) manual diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst index 91af3e3..273a780 100644 --- a/Help/manual/cmake.1.rst +++ b/Help/manual/cmake.1.rst @@ -64,7 +64,7 @@ Options --use-stderr = Ignored. Behavior is default in CMake >= 3.0. -- = Pass remaining options to the native tool. - Run cmake --build with no options for quick help. + Run ``cmake --build`` with no options for quick help. ``-N`` View mode only. ----------------------------------------------------------------------- Summary of changes: Help/manual/cmake.1.rst | 3 ++- Help/release/dev/error-multiple-targets.rst | 6 ++++++ Source/cmakemain.cxx | 14 +++++++++++++- .../BuildDir--build-multiple-targets-result.txt} | 0 .../BuildDir--build-multiple-targets-stderr.txt | 3 +++ Tests/RunCMake/CommandLine/BuildDir/CMakeLists.txt | 2 ++ Tests/RunCMake/CommandLine/RunCMakeTest.cmake | 2 ++ 7 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 Help/release/dev/error-multiple-targets.rst copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLine/BuildDir--build-multiple-targets-result.txt} (100%) create mode 100644 Tests/RunCMake/CommandLine/BuildDir--build-multiple-targets-stderr.txt hooks/post-receive -- CMake From brad.king at kitware.com Fri Feb 5 14:38:39 2016 From: brad.king at kitware.com (Brad King) Date: Fri, 5 Feb 2016 14:38:39 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-41-g3748be6 Message-ID: <20160205193839.62721E4FE2@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, next has been updated via 3748be6afa12f0f0d7d3b51ee44d7908e86a19bd (commit) via 265f4288be6429656824928243d7390401f4c882 (commit) from ea896482b563918c9d839577adab1ee926893bcd (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=3748be6afa12f0f0d7d3b51ee44d7908e86a19bd commit 3748be6afa12f0f0d7d3b51ee44d7908e86a19bd Merge: ea89648 265f428 Author: Brad King AuthorDate: Fri Feb 5 14:38:38 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 5 14:38:38 2016 -0500 Merge topic 'ExternalProject-build-config-compat' into next 265f4288 ExternalProject: Be compatible with projects setting CMAKE_CFG_INTDIR https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=265f4288be6429656824928243d7390401f4c882 commit 265f4288be6429656824928243d7390401f4c882 Author: Brad King AuthorDate: Fri Feb 5 14:18:01 2016 -0500 Commit: Brad King CommitDate: Fri Feb 5 14:28:42 2016 -0500 ExternalProject: Be compatible with projects setting CMAKE_CFG_INTDIR Since commit v3.5.0-rc1~32^2~1 (ExternalProject: Simplify `cmake --build` configuration passing, 2016-01-19) we use the `$` generator expression to generate the `cmake --build . --config ` value for the default BUILD_COMMAND instead of the CMAKE_CFG_INTDIR placeholder value provided by multi-config generators. However, some projects have been abusing the old implementation detail by setting CMAKE_CFG_INTDIR themselves to get a specific configuration. Those projects should be updated to set their own BUILD_COMMAND to get non-default behavior. Meanwhile we can be compatible with their existing releases by detecting when CMAKE_CFG_INTDIR is not a generator-provided placeholder and using its value instead. diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index 7070dc4..8b5e90f 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -1231,7 +1231,20 @@ function(_ep_get_build_command name step cmd_var) endif() set(args --build ".") if(CMAKE_CONFIGURATION_TYPES) - list(APPEND args --config $) + if (CMAKE_CFG_INTDIR AND + NOT CMAKE_CFG_INTDIR STREQUAL "." AND + NOT CMAKE_CFG_INTDIR MATCHES "\\$") + # CMake 3.4 and below used the CMAKE_CFG_INTDIR placeholder value + # provided by multi-configuration generators. Some projects were + # taking advantage of that undocumented implementation detail to + # specify a specific configuration here. They should use + # BUILD_COMMAND to change the default command instead, but for + # compatibility honor the value. + set(config ${CMAKE_CFG_INTDIR}) + else() + set(config $) + endif() + list(APPEND args --config ${config}) endif() if(step STREQUAL "INSTALL") list(APPEND args --target install) @@ -1241,7 +1254,7 @@ function(_ep_get_build_command name step cmd_var) string(REGEX REPLACE "^(.*/)cmake([^/]*)$" "\\1ctest\\2" cmd "${cmd}") set(args "") if(CMAKE_CONFIGURATION_TYPES) - list(APPEND args -C $) + list(APPEND args -C ${config}) endif() endif() endif() ----------------------------------------------------------------------- Summary of changes: Modules/ExternalProject.cmake | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Fri Feb 5 14:43:12 2016 From: brad.king at kitware.com (Brad King) Date: Fri, 5 Feb 2016 14:43:12 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-43-gb3df88b Message-ID: <20160205194312.5F00AE3638@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, next has been updated via b3df88b4bb4c77291040e27ece6d384e3e58b55c (commit) via 6d191f28a379162e39c4acea3bda494936d8c9fe (commit) from 3748be6afa12f0f0d7d3b51ee44d7908e86a19bd (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=b3df88b4bb4c77291040e27ece6d384e3e58b55c commit b3df88b4bb4c77291040e27ece6d384e3e58b55c Merge: 3748be6 6d191f2 Author: Brad King AuthorDate: Fri Feb 5 14:43:11 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 5 14:43:11 2016 -0500 Merge topic 'ExternalProject-build-config-compat' into next 6d191f28 fixup! ExternalProject: Be compatible with projects setting CMAKE_CFG_INTDIR https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6d191f28a379162e39c4acea3bda494936d8c9fe commit 6d191f28a379162e39c4acea3bda494936d8c9fe Author: Brad King AuthorDate: Fri Feb 5 14:40:58 2016 -0500 Commit: Brad King CommitDate: Fri Feb 5 14:40:58 2016 -0500 fixup! ExternalProject: Be compatible with projects setting CMAKE_CFG_INTDIR diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index 8b5e90f..249658d 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -1241,6 +1241,8 @@ function(_ep_get_build_command name step cmd_var) # BUILD_COMMAND to change the default command instead, but for # compatibility honor the value. set(config ${CMAKE_CFG_INTDIR}) + message(AUTHOR_WARNING "CMAKE_CFG_INTDIR should not be set by project code.\n" + "To get a non-default build command, use the BUILD_COMMAND option.") else() set(config $) endif() ----------------------------------------------------------------------- Summary of changes: Modules/ExternalProject.cmake | 2 ++ 1 file changed, 2 insertions(+) hooks/post-receive -- CMake From brad.king at kitware.com Fri Feb 5 14:43:27 2016 From: brad.king at kitware.com (Brad King) Date: Fri, 5 Feb 2016 14:43:27 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-45-g7885d80 Message-ID: <20160205194327.AA728E3678@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, next has been updated via 7885d80b0f36dc8a031d36277d3d8b35a1776a1b (commit) via 1b9d15c1e7adff5170f10d488483e1dc4e99d507 (commit) from b3df88b4bb4c77291040e27ece6d384e3e58b55c (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=7885d80b0f36dc8a031d36277d3d8b35a1776a1b commit 7885d80b0f36dc8a031d36277d3d8b35a1776a1b Merge: b3df88b 1b9d15c Author: Brad King AuthorDate: Fri Feb 5 14:43:27 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 5 14:43:27 2016 -0500 Merge topic 'ExternalProject-build-config-compat' into next 1b9d15c1 ExternalProject: Be compatible with projects setting CMAKE_CFG_INTDIR https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1b9d15c1e7adff5170f10d488483e1dc4e99d507 commit 1b9d15c1e7adff5170f10d488483e1dc4e99d507 Author: Brad King AuthorDate: Fri Feb 5 14:18:01 2016 -0500 Commit: Brad King CommitDate: Fri Feb 5 14:43:16 2016 -0500 ExternalProject: Be compatible with projects setting CMAKE_CFG_INTDIR Since commit v3.5.0-rc1~32^2~1 (ExternalProject: Simplify `cmake --build` configuration passing, 2016-01-19) we use the `$` generator expression to generate the `cmake --build . --config ` value for the default BUILD_COMMAND instead of the CMAKE_CFG_INTDIR placeholder value provided by multi-config generators. However, some projects have been abusing the old implementation detail by setting CMAKE_CFG_INTDIR themselves to get a specific configuration. Those projects should be updated to set their own BUILD_COMMAND to get non-default behavior. Meanwhile we can be compatible with their existing releases by detecting when CMAKE_CFG_INTDIR is not a generator-provided placeholder and using its value instead. diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake index 7070dc4..249658d 100644 --- a/Modules/ExternalProject.cmake +++ b/Modules/ExternalProject.cmake @@ -1231,7 +1231,22 @@ function(_ep_get_build_command name step cmd_var) endif() set(args --build ".") if(CMAKE_CONFIGURATION_TYPES) - list(APPEND args --config $) + if (CMAKE_CFG_INTDIR AND + NOT CMAKE_CFG_INTDIR STREQUAL "." AND + NOT CMAKE_CFG_INTDIR MATCHES "\\$") + # CMake 3.4 and below used the CMAKE_CFG_INTDIR placeholder value + # provided by multi-configuration generators. Some projects were + # taking advantage of that undocumented implementation detail to + # specify a specific configuration here. They should use + # BUILD_COMMAND to change the default command instead, but for + # compatibility honor the value. + set(config ${CMAKE_CFG_INTDIR}) + message(AUTHOR_WARNING "CMAKE_CFG_INTDIR should not be set by project code.\n" + "To get a non-default build command, use the BUILD_COMMAND option.") + else() + set(config $) + endif() + list(APPEND args --config ${config}) endif() if(step STREQUAL "INSTALL") list(APPEND args --target install) @@ -1241,7 +1256,7 @@ function(_ep_get_build_command name step cmd_var) string(REGEX REPLACE "^(.*/)cmake([^/]*)$" "\\1ctest\\2" cmd "${cmd}") set(args "") if(CMAKE_CONFIGURATION_TYPES) - list(APPEND args -C $) + list(APPEND args -C ${config}) endif() endif() endif() ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake From jamesbigler at gmail.com Fri Feb 5 16:36:24 2016 From: jamesbigler at gmail.com (James Bigler) Date: Fri, 5 Feb 2016 16:36:24 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-47-g42416ba Message-ID: <20160205213624.AD968E4CEB@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, next has been updated via 42416ba1798a81bd3d0e9aeb9919dc3e3de3c603 (commit) via 4b561b4cb528a3d6fee6baa79dacfff31923a9b6 (commit) from 7885d80b0f36dc8a031d36277d3d8b35a1776a1b (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=42416ba1798a81bd3d0e9aeb9919dc3e3de3c603 commit 42416ba1798a81bd3d0e9aeb9919dc3e3de3c603 Merge: 7885d80 4b561b4 Author: James Bigler AuthorDate: Fri Feb 5 16:36:23 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 5 16:36:23 2016 -0500 Merge topic 'FindCUDA.cmake/FixNonExistantDependencyFile' into next 4b561b4c FindCUDA: Fix for when a non-existent dependency file is found. https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4b561b4cb528a3d6fee6baa79dacfff31923a9b6 commit 4b561b4cb528a3d6fee6baa79dacfff31923a9b6 Author: James Bigler AuthorDate: Fri Feb 5 14:32:01 2016 -0700 Commit: James Bigler CommitDate: Fri Feb 5 14:32:01 2016 -0700 FindCUDA: Fix for when a non-existent dependency file is found. Previously if a non-existent dependency file is found we set the file to "" and then do if(NOT IS_DIRECTORY "${file}"). Later we call get_filename_component on the empty file which returns basically the current build directory. Having a dependency on the current build directory is really annoying, because anything that compiles into that directory will change the file stamp and cause your files to rebuild every time you call make. :( diff --git a/Modules/FindCUDA/make2cmake.cmake b/Modules/FindCUDA/make2cmake.cmake index c433fa8..7b3ca03 100644 --- a/Modules/FindCUDA/make2cmake.cmake +++ b/Modules/FindCUDA/make2cmake.cmake @@ -67,7 +67,7 @@ if (NOT "${depend_text}" STREQUAL "") endif() endif() - if(NOT IS_DIRECTORY "${file}") + if(file AND NOT IS_DIRECTORY "${file}") # If softlinks start to matter, we should change this to REALPATH. For now we need # to flatten paths, because nvcc can generate stuff like /bin/../include instead of # just /include. ----------------------------------------------------------------------- Summary of changes: Modules/FindCUDA/make2cmake.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From jamesbigler at gmail.com Fri Feb 5 16:51:27 2016 From: jamesbigler at gmail.com (James Bigler) Date: Fri, 5 Feb 2016 16:51:27 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-49-gb11b9d0 Message-ID: <20160205215127.3B8D3E4375@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, next has been updated via b11b9d05dd1d9e77ac76f6b9b72c4f1face53418 (commit) via 81ecc7263754ad96e3aa77ec4d60b72c49cc1409 (commit) from 42416ba1798a81bd3d0e9aeb9919dc3e3de3c603 (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=b11b9d05dd1d9e77ac76f6b9b72c4f1face53418 commit b11b9d05dd1d9e77ac76f6b9b72c4f1face53418 Merge: 42416ba 81ecc72 Author: James Bigler AuthorDate: Fri Feb 5 16:51:26 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 5 16:51:26 2016 -0500 Merge topic 'FindCUDA.cmake/FixNonExistantDependencyFile' into next 81ecc726 FindCUDA: Added some additional comments about non-existent dependency files. https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=81ecc7263754ad96e3aa77ec4d60b72c49cc1409 commit 81ecc7263754ad96e3aa77ec4d60b72c49cc1409 Author: James Bigler AuthorDate: Fri Feb 5 14:50:29 2016 -0700 Commit: James Bigler CommitDate: Fri Feb 5 14:50:29 2016 -0700 FindCUDA: Added some additional comments about non-existent dependency files. diff --git a/Modules/FindCUDA/make2cmake.cmake b/Modules/FindCUDA/make2cmake.cmake index 7b3ca03..b841f3b 100644 --- a/Modules/FindCUDA/make2cmake.cmake +++ b/Modules/FindCUDA/make2cmake.cmake @@ -67,6 +67,8 @@ if (NOT "${depend_text}" STREQUAL "") endif() endif() + # Make sure we check to see if we have a file, before asking if it is not a directory. + # if(NOT IS_DIRECTORY "") will return TRUE. if(file AND NOT IS_DIRECTORY "${file}") # If softlinks start to matter, we should change this to REALPATH. For now we need # to flatten paths, because nvcc can generate stuff like /bin/../include instead of ----------------------------------------------------------------------- Summary of changes: Modules/FindCUDA/make2cmake.cmake | 2 ++ 1 file changed, 2 insertions(+) hooks/post-receive -- CMake From kwrobot at kitware.com Sat Feb 6 00:01:07 2016 From: kwrobot at kitware.com (Kitware Robot) Date: Sat, 6 Feb 2016 00:01:07 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc1-10-gd276b6e Message-ID: <20160206050107.1C09FE4AFC@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 d276b6e9971a3f4d0a99c6e46ebb0533fbeee5db (commit) from 5ee00b71e94f5daa985b8453ae67b125ea0983d9 (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=d276b6e9971a3f4d0a99c6e46ebb0533fbeee5db commit d276b6e9971a3f4d0a99c6e46ebb0533fbeee5db Author: Kitware Robot AuthorDate: Sat Feb 6 00:01:04 2016 -0500 Commit: Kitware Robot CommitDate: Sat Feb 6 00:01:04 2016 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 91079a8..35ea56e 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 5) -set(CMake_VERSION_PATCH 20160205) +set(CMake_VERSION_PATCH 20160206) #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 Feb 7 00:01:06 2016 From: kwrobot at kitware.com (Kitware Robot) Date: Sun, 7 Feb 2016 00:01:06 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc1-11-gc810079 Message-ID: <20160207050107.0566DE4D6A@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 c8100794b4faab4255c1229f966f57525c18ccc7 (commit) from d276b6e9971a3f4d0a99c6e46ebb0533fbeee5db (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=c8100794b4faab4255c1229f966f57525c18ccc7 commit c8100794b4faab4255c1229f966f57525c18ccc7 Author: Kitware Robot AuthorDate: Sun Feb 7 00:01:03 2016 -0500 Commit: Kitware Robot CommitDate: Sun Feb 7 00:01:03 2016 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 35ea56e..9260c3b 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 5) -set(CMake_VERSION_PATCH 20160206) +set(CMake_VERSION_PATCH 20160207) #set(CMake_VERSION_RC 1) ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From gjasny at googlemail.com Sun Feb 7 14:42:33 2016 From: gjasny at googlemail.com (Gregor Jasny) Date: Sun, 7 Feb 2016 14:42:33 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-53-gc4e3666 Message-ID: <20160207194233.23961E367D@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, next has been updated via c4e3666047f50c16673ab70c66b57046995052b5 (commit) via 2cae5128fdc6316a7f0913cb89ec467b33b9715b (commit) via c8100794b4faab4255c1229f966f57525c18ccc7 (commit) via d276b6e9971a3f4d0a99c6e46ebb0533fbeee5db (commit) from b11b9d05dd1d9e77ac76f6b9b72c4f1face53418 (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=c4e3666047f50c16673ab70c66b57046995052b5 commit c4e3666047f50c16673ab70c66b57046995052b5 Merge: b11b9d0 2cae512 Author: Gregor Jasny AuthorDate: Sun Feb 7 14:42:32 2016 -0500 Commit: CMake Topic Stage CommitDate: Sun Feb 7 14:42:32 2016 -0500 Merge topic 'apple-isystem-gcc' into next 2cae5128 Apple: Enable -isystem for GNU Compiler >= 4 (#15953) c8100794 CMake Nightly Date Stamp d276b6e9 CMake Nightly Date Stamp https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2cae5128fdc6316a7f0913cb89ec467b33b9715b commit 2cae5128fdc6316a7f0913cb89ec467b33b9715b Author: Gregor Jasny AuthorDate: Sun Feb 7 20:20:02 2016 +0100 Commit: Gregor Jasny CommitDate: Sun Feb 7 20:20:02 2016 +0100 Apple: Enable -isystem for GNU Compiler >= 4 (#15953) Due to #4662 -isystem support was disabled for all GNU Compilers on Apple platforms. But the change was probably a just work around for a broken compiler on Tiger (see 10837#c27206). So we tighten the condition to only kick in for GCC versions earlier than 4. That should ensure sane behavior for Xcode 3.2 and later. diff --git a/Modules/Compiler/GNU.cmake b/Modules/Compiler/GNU.cmake index 764fbf9..d1ca85e 100644 --- a/Modules/Compiler/GNU.cmake +++ b/Modules/Compiler/GNU.cmake @@ -52,7 +52,7 @@ macro(__compiler_gnu lang) set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT "-O2 -g -DNDEBUG") set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE " -E > ") set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE " -S -o ") - if(NOT APPLE) + if(NOT APPLE OR NOT CMAKE_${lang}_COMPILER_VERSION VERSION_LESS 4) # work around #4462 set(CMAKE_INCLUDE_SYSTEM_FLAG_${lang} "-isystem ") endif() endmacro() ----------------------------------------------------------------------- Summary of changes: Modules/Compiler/GNU.cmake | 2 +- Source/CMakeVersion.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake From kwrobot at kitware.com Mon Feb 8 00:01:10 2016 From: kwrobot at kitware.com (Kitware Robot) Date: Mon, 8 Feb 2016 00:01:10 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc1-12-gccb2a26 Message-ID: <20160208050110.C3573E4D47@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 ccb2a26095b3d49c899e935da23af41eb21f2c51 (commit) from c8100794b4faab4255c1229f966f57525c18ccc7 (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=ccb2a26095b3d49c899e935da23af41eb21f2c51 commit ccb2a26095b3d49c899e935da23af41eb21f2c51 Author: Kitware Robot AuthorDate: Mon Feb 8 00:01:05 2016 -0500 Commit: Kitware Robot CommitDate: Mon Feb 8 00:01:05 2016 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 9260c3b..66a97c7 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 5) -set(CMake_VERSION_PATCH 20160207) +set(CMake_VERSION_PATCH 20160208) #set(CMake_VERSION_RC 1) ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From gjasny at googlemail.com Mon Feb 8 06:49:59 2016 From: gjasny at googlemail.com (Gregor Jasny) Date: Mon, 8 Feb 2016 06:49:59 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-55-g830e87e Message-ID: <20160208114959.C63A9E491E@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, next has been updated via 830e87e4076bcd7a5bacda7ccd823b5050a77879 (commit) via 5b04aa31b8d791bc5e162fbc8c89b2d0058c8572 (commit) from c4e3666047f50c16673ab70c66b57046995052b5 (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=830e87e4076bcd7a5bacda7ccd823b5050a77879 commit 830e87e4076bcd7a5bacda7ccd823b5050a77879 Merge: c4e3666 5b04aa3 Author: Gregor Jasny AuthorDate: Mon Feb 8 06:49:58 2016 -0500 Commit: CMake Topic Stage CommitDate: Mon Feb 8 06:49:58 2016 -0500 Merge topic 'apple-isystem-gcc' into next 5b04aa31 Xcode: Disable test for system include dirs https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5b04aa31b8d791bc5e162fbc8c89b2d0058c8572 commit 5b04aa31b8d791bc5e162fbc8c89b2d0058c8572 Author: Gregor Jasny AuthorDate: Mon Feb 8 12:48:35 2016 +0100 Commit: Gregor Jasny CommitDate: Mon Feb 8 12:48:35 2016 +0100 Xcode: Disable test for system include dirs diff --git a/Tests/Complex/Executable/CMakeLists.txt b/Tests/Complex/Executable/CMakeLists.txt index a1f8e68..c30dcbc 100644 --- a/Tests/Complex/Executable/CMakeLists.txt +++ b/Tests/Complex/Executable/CMakeLists.txt @@ -146,7 +146,8 @@ add_dependencies(notInAllCustom notInAllExe) # add_subdirectory(Temp) -if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_INCLUDE_SYSTEM_FLAG_CXX) +if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_INCLUDE_SYSTEM_FLAG_CXX + AND NOT XCODE) # XCODE is excluded due to #15687 add_executable(testSystemDir testSystemDir.cxx) set_target_properties(testSystemDir PROPERTIES COMPILE_FLAGS "-Werror") endif() diff --git a/Tests/ComplexOneConfig/Executable/CMakeLists.txt b/Tests/ComplexOneConfig/Executable/CMakeLists.txt index b2307b2..4897b48 100644 --- a/Tests/ComplexOneConfig/Executable/CMakeLists.txt +++ b/Tests/ComplexOneConfig/Executable/CMakeLists.txt @@ -146,7 +146,8 @@ add_dependencies(notInAllCustom notInAllExe) # add_subdirectory(Temp) -if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_INCLUDE_SYSTEM_FLAG_CXX) +if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_INCLUDE_SYSTEM_FLAG_CXX + AND NOT XCODE) # XCODE is excluded due to #15687 add_executable(testSystemDir testSystemDir.cxx) set_target_properties(testSystemDir PROPERTIES COMPILE_FLAGS "-Werror") endif() ----------------------------------------------------------------------- Summary of changes: Tests/Complex/Executable/CMakeLists.txt | 3 ++- Tests/ComplexOneConfig/Executable/CMakeLists.txt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Mon Feb 8 09:28:41 2016 From: brad.king at kitware.com (Brad King) Date: Mon, 8 Feb 2016 09:28:41 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-57-g3550f25 Message-ID: <20160208142841.6D210E4C16@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, next has been updated via 3550f2532b4455fe539b57e80112494b4be5bf41 (commit) via 2859d9ef6b6899ce87d104acd8a3cd232c53d65e (commit) from 830e87e4076bcd7a5bacda7ccd823b5050a77879 (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=3550f2532b4455fe539b57e80112494b4be5bf41 commit 3550f2532b4455fe539b57e80112494b4be5bf41 Merge: 830e87e 2859d9e Author: Brad King AuthorDate: Mon Feb 8 09:28:40 2016 -0500 Commit: CMake Topic Stage CommitDate: Mon Feb 8 09:28:40 2016 -0500 Merge topic 'test-ctest_submit-update' into next 2859d9ef Tests: Extend ctest_submit host lookup failure matching (#15958) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2859d9ef6b6899ce87d104acd8a3cd232c53d65e commit 2859d9ef6b6899ce87d104acd8a3cd232c53d65e Author: Orion Poplawski AuthorDate: Mon Feb 8 09:22:54 2016 -0500 Commit: Brad King CommitDate: Mon Feb 8 09:25:21 2016 -0500 Tests: Extend ctest_submit host lookup failure matching (#15958) Match this message: Could not resolve host: -no-site-; Name or service not known ^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt b/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt index adf334b..4825d7a 100644 --- a/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt +++ b/Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt @@ -1,3 +1,3 @@ *Error when uploading file: .*/Configure.xml - *Error message was: ([Cc]ould *n.t resolve host:? '?-no-site-'?|The requested URL returned error:.*) + *Error message was: ([Cc]ould *n.t resolve host:? '?-no-site-'?.*|The requested URL returned error:.*) *Problems when submitting via HTTP diff --git a/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt index 64c3011..b9d9394 100644 --- a/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt +++ b/Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt @@ -1,2 +1,2 @@ -Error message was: ([Cc]ould *n.t resolve host:? '?-no-site-'?|The requested URL returned error:.*) +Error message was: ([Cc]ould *n.t resolve host:? '?-no-site-'?.*|The requested URL returned error:.*) Problems when submitting via FTP diff --git a/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt index 73f0138..f52d2d8 100644 --- a/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt +++ b/Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt @@ -1,2 +1,2 @@ -Error message was: ([Cc]ould *n.t resolve host:? '?-no-site-'?|The requested URL returned error:.*) +Error message was: ([Cc]ould *n.t resolve host:? '?-no-site-'?.*|The requested URL returned error:.*) Problems when submitting via HTTP diff --git a/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt b/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt index a1ba4f6..24083f2 100644 --- a/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt +++ b/Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt @@ -1,2 +1,2 @@ -Error message was: ([Cc]ould *n.t resolve host:? '?-no-site-'?|The requested URL returned error:.*|Protocol "https" not supported or disabled in .*|.* was built with SSL disabled.*) +Error message was: ([Cc]ould *n.t resolve host:? '?-no-site-'?.*|The requested URL returned error:.*|Protocol "https" not supported or disabled in .*|.* was built with SSL disabled.*) Problems when submitting via HTTP ----------------------------------------------------------------------- Summary of changes: Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt | 2 +- Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt | 2 +- Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt | 2 +- Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Mon Feb 8 09:40:12 2016 From: brad.king at kitware.com (Brad King) Date: Mon, 8 Feb 2016 09:40:12 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-59-g494b416 Message-ID: <20160208144012.B75EFE05EB@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, next has been updated via 494b416de52ed4f24eaf69dec91747435e90dbfb (commit) via 8282547e0f9d7370e6f84f97a448b9842009c8c8 (commit) from 3550f2532b4455fe539b57e80112494b4be5bf41 (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=494b416de52ed4f24eaf69dec91747435e90dbfb commit 494b416de52ed4f24eaf69dec91747435e90dbfb Merge: 3550f25 8282547 Author: Brad King AuthorDate: Mon Feb 8 09:40:12 2016 -0500 Commit: CMake Topic Stage CommitDate: Mon Feb 8 09:40:12 2016 -0500 Merge topic 'install-man-conditionally' into next 8282547e Install ccmake.1 and cmake-gui.1 conditionally with their tools (#15957) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8282547e0f9d7370e6f84f97a448b9842009c8c8 commit 8282547e0f9d7370e6f84f97a448b9842009c8c8 Author: Brad King AuthorDate: Mon Feb 8 09:37:24 2016 -0500 Commit: Brad King CommitDate: Mon Feb 8 09:38:18 2016 -0500 Install ccmake.1 and cmake-gui.1 conditionally with their tools (#15957) diff --git a/Utilities/Sphinx/CMakeLists.txt b/Utilities/Sphinx/CMakeLists.txt index 1baca35..257ba62 100644 --- a/Utilities/Sphinx/CMakeLists.txt +++ b/Utilities/Sphinx/CMakeLists.txt @@ -156,6 +156,14 @@ if(SPHINX_MAN) if("x${m}" MATCHES "^x(.+)\\.([1-9])\\.rst$") set(name "${CMAKE_MATCH_1}") set(sec "${CMAKE_MATCH_2}") + if(NOT CMakeHelp_STANDALONE) + if(name STREQUAL "ccmake" AND NOT BUILD_CursesDialog) + continue() + endif() + if(name STREQUAL "cmake-gui" AND NOT BUILD_QtDialog) + continue() + endif() + endif() CMake_OPTIONAL_COMPONENT(sphinx-man) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/man/${name}.${sec} DESTINATION ${CMAKE_MAN_DIR}/man${sec} ----------------------------------------------------------------------- Summary of changes: Utilities/Sphinx/CMakeLists.txt | 8 ++++++++ 1 file changed, 8 insertions(+) hooks/post-receive -- CMake From brad.king at kitware.com Mon Feb 8 09:59:13 2016 From: brad.king at kitware.com (Brad King) Date: Mon, 8 Feb 2016 09:59:13 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-62-gbb332d0 Message-ID: <20160208145913.C6F7AE4E49@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, next has been updated via bb332d0c3040615fcc0e77f924f193db79913f2b (commit) via a3b91d164043bdef713c0490f3069c00851ccf13 (commit) via d8c90800174b6b5256fea5ea0813977c608c5ff0 (commit) from 494b416de52ed4f24eaf69dec91747435e90dbfb (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=bb332d0c3040615fcc0e77f924f193db79913f2b commit bb332d0c3040615fcc0e77f924f193db79913f2b Merge: 494b416 a3b91d1 Author: Brad King AuthorDate: Mon Feb 8 09:59:13 2016 -0500 Commit: CMake Topic Stage CommitDate: Mon Feb 8 09:59:13 2016 -0500 Merge topic 'fix-doc-typos' into next a3b91d16 Help: Fix command specification for cmake_minimum_required d8c90800 Help: Fix mistake in cmake-buildsystem(7) example https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a3b91d164043bdef713c0490f3069c00851ccf13 commit a3b91d164043bdef713c0490f3069c00851ccf13 Author: Horst Kronstorfer AuthorDate: Mon Feb 8 12:55:25 2016 +0100 Commit: Brad King CommitDate: Mon Feb 8 09:52:56 2016 -0500 Help: Fix command specification for cmake_minimum_required Implementation indicates that at least two components of VERSION must be specified (see Source/cmCMakeMinimumRequired.cxx.) Therefore the minor version is not optional. diff --git a/Help/command/cmake_minimum_required.rst b/Help/command/cmake_minimum_required.rst index 8573218..dc65a9e 100644 --- a/Help/command/cmake_minimum_required.rst +++ b/Help/command/cmake_minimum_required.rst @@ -5,7 +5,7 @@ Set the minimum required version of cmake for a project. :: - cmake_minimum_required(VERSION major[.minor[.patch[.tweak]]] + cmake_minimum_required(VERSION major.minor[.patch[.tweak]] [FATAL_ERROR]) If the current version of CMake is lower than that required it will https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d8c90800174b6b5256fea5ea0813977c608c5ff0 commit d8c90800174b6b5256fea5ea0813977c608c5ff0 Author: Paul Wilkinson AuthorDate: Sun Feb 7 20:46:27 2016 +0000 Commit: Brad King CommitDate: Mon Feb 8 09:51:37 2016 -0500 Help: Fix mistake in cmake-buildsystem(7) example The COMPATIBLE_INTERFACE_NUMBER_MAX example now sets INTERFACE_CONTAINER_SIZE_REQUIRED on lib1Version2 and lib1Version3. Previously set it on lib1Version2 twice and never on lib1Version3. diff --git a/Help/manual/cmake-buildsystem.7.rst b/Help/manual/cmake-buildsystem.7.rst index 4a04f31..9004bb2 100644 --- a/Help/manual/cmake-buildsystem.7.rst +++ b/Help/manual/cmake-buildsystem.7.rst @@ -427,7 +427,7 @@ specified will be calculated: ) add_library(lib1Version3 SHARED lib1_v3.cpp) - set_property(TARGET lib1Version2 PROPERTY INTERFACE_CONTAINER_SIZE_REQUIRED 1000) + set_property(TARGET lib1Version3 PROPERTY INTERFACE_CONTAINER_SIZE_REQUIRED 1000) add_executable(exe1 exe1.cpp) # CONTAINER_SIZE_REQUIRED will be "200" ----------------------------------------------------------------------- Summary of changes: Help/command/cmake_minimum_required.rst | 2 +- Help/manual/cmake-buildsystem.7.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Mon Feb 8 10:32:54 2016 From: brad.king at kitware.com (Brad King) Date: Mon, 8 Feb 2016 10:32:54 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc1-14-g037738a Message-ID: <20160208153254.242CFE4F3A@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 037738ac194a7e50c92ffda60eaca707bb35bac9 (commit) via 1b9d15c1e7adff5170f10d488483e1dc4e99d507 (commit) from ccb2a26095b3d49c899e935da23af41eb21f2c51 (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=037738ac194a7e50c92ffda60eaca707bb35bac9 commit 037738ac194a7e50c92ffda60eaca707bb35bac9 Merge: ccb2a26 1b9d15c Author: Brad King AuthorDate: Mon Feb 8 10:32:52 2016 -0500 Commit: CMake Topic Stage CommitDate: Mon Feb 8 10:32:52 2016 -0500 Merge topic 'ExternalProject-build-config-compat' 1b9d15c1 ExternalProject: Be compatible with projects setting CMAKE_CFG_INTDIR ----------------------------------------------------------------------- Summary of changes: Modules/ExternalProject.cmake | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Mon Feb 8 10:32:56 2016 From: brad.king at kitware.com (Brad King) Date: Mon, 8 Feb 2016 10:32:56 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc1-17-g08e5362 Message-ID: <20160208153256.D1A6EE4F54@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 08e53620044c1ac5ff29adb695a7c6bdde480fb4 (commit) via 497cad7c883dc401b4d78109c3a057fb38745d9e (commit) via 886acd80f09c807fccbfcde713c53a7686386968 (commit) from 037738ac194a7e50c92ffda60eaca707bb35bac9 (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=08e53620044c1ac5ff29adb695a7c6bdde480fb4 commit 08e53620044c1ac5ff29adb695a7c6bdde480fb4 Merge: 037738a 497cad7 Author: Brad King AuthorDate: Mon Feb 8 10:32:55 2016 -0500 Commit: CMake Topic Stage CommitDate: Mon Feb 8 10:32:55 2016 -0500 Merge topic 'error-multiple-targets' 497cad7c cmake: Teach --build to reject multiple --target options 886acd80 Help: Fix reference to `cmake --build` in cmake(1) manual ----------------------------------------------------------------------- Summary of changes: Help/manual/cmake.1.rst | 3 ++- Help/release/dev/error-multiple-targets.rst | 6 ++++++ Source/cmakemain.cxx | 14 +++++++++++++- .../BuildDir--build-multiple-targets-result.txt} | 0 .../BuildDir--build-multiple-targets-stderr.txt | 3 +++ Tests/RunCMake/CommandLine/BuildDir/CMakeLists.txt | 2 ++ Tests/RunCMake/CommandLine/RunCMakeTest.cmake | 2 ++ 7 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 Help/release/dev/error-multiple-targets.rst copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLine/BuildDir--build-multiple-targets-result.txt} (100%) create mode 100644 Tests/RunCMake/CommandLine/BuildDir--build-multiple-targets-stderr.txt hooks/post-receive -- CMake From brad.king at kitware.com Mon Feb 8 10:32:59 2016 From: brad.king at kitware.com (Brad King) Date: Mon, 8 Feb 2016 10:32:59 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc1-19-g5643088 Message-ID: <20160208153259.39AB1E4F57@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 5643088bb18cebcfa9ba28b16cf7ae198ae31645 (commit) via 58a4a7713233bebb5feca5985d0850d170703122 (commit) from 08e53620044c1ac5ff29adb695a7c6bdde480fb4 (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=5643088bb18cebcfa9ba28b16cf7ae198ae31645 commit 5643088bb18cebcfa9ba28b16cf7ae198ae31645 Merge: 08e5362 58a4a77 Author: Brad King AuthorDate: Mon Feb 8 10:32:57 2016 -0500 Commit: CMake Topic Stage CommitDate: Mon Feb 8 10:32:57 2016 -0500 Merge topic 'fix-pedantic-warnings' 58a4a771 Make cmLinkInterface:: and cmGeneratorTarget::Multiplicity unsigned ints ----------------------------------------------------------------------- Summary of changes: Source/cmComputeLinkDepends.cxx | 2 +- Source/cmGeneratorTarget.h | 2 +- Source/cmLinkItem.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Mon Feb 8 10:33:01 2016 From: brad.king at kitware.com (Brad King) Date: Mon, 8 Feb 2016 10:33:01 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc1-22-gc1ee516 Message-ID: <20160208153301.8DF64E4F5A@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 c1ee5166adcbe0aeb25b6cd368bd2917a70b22b4 (commit) via 81ecc7263754ad96e3aa77ec4d60b72c49cc1409 (commit) via 4b561b4cb528a3d6fee6baa79dacfff31923a9b6 (commit) from 5643088bb18cebcfa9ba28b16cf7ae198ae31645 (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=c1ee5166adcbe0aeb25b6cd368bd2917a70b22b4 commit c1ee5166adcbe0aeb25b6cd368bd2917a70b22b4 Merge: 5643088 81ecc72 Author: Brad King AuthorDate: Mon Feb 8 10:32:59 2016 -0500 Commit: CMake Topic Stage CommitDate: Mon Feb 8 10:32:59 2016 -0500 Merge topic 'FindCUDA.cmake/FixNonExistantDependencyFile' 81ecc726 FindCUDA: Added some additional comments about non-existent dependency files. 4b561b4c FindCUDA: Fix for when a non-existent dependency file is found. ----------------------------------------------------------------------- Summary of changes: Modules/FindCUDA/make2cmake.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Mon Feb 8 10:33:03 2016 From: brad.king at kitware.com (Brad King) Date: Mon, 8 Feb 2016 10:33:03 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc1-25-g2619317 Message-ID: <20160208153303.E6D17E4F3A@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 2619317c66ece81a9103731736ed7c8718e45666 (commit) via a3b91d164043bdef713c0490f3069c00851ccf13 (commit) via d8c90800174b6b5256fea5ea0813977c608c5ff0 (commit) from c1ee5166adcbe0aeb25b6cd368bd2917a70b22b4 (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=2619317c66ece81a9103731736ed7c8718e45666 commit 2619317c66ece81a9103731736ed7c8718e45666 Merge: c1ee516 a3b91d1 Author: Brad King AuthorDate: Mon Feb 8 10:33:02 2016 -0500 Commit: CMake Topic Stage CommitDate: Mon Feb 8 10:33:02 2016 -0500 Merge topic 'fix-doc-typos' a3b91d16 Help: Fix command specification for cmake_minimum_required d8c90800 Help: Fix mistake in cmake-buildsystem(7) example ----------------------------------------------------------------------- Summary of changes: Help/command/cmake_minimum_required.rst | 2 +- Help/manual/cmake-buildsystem.7.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Mon Feb 8 10:33:06 2016 From: brad.king at kitware.com (Brad King) Date: Mon, 8 Feb 2016 10:33:06 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc1-27-ga7e2021 Message-ID: <20160208153306.745D0E4A89@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 a7e2021fea7f5dee0c8d8c6841819286438c8580 (commit) via c5eb21b6d1f4187778ad49545761a818e1126541 (commit) from 2619317c66ece81a9103731736ed7c8718e45666 (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=a7e2021fea7f5dee0c8d8c6841819286438c8580 commit a7e2021fea7f5dee0c8d8c6841819286438c8580 Merge: 2619317 c5eb21b Author: Brad King AuthorDate: Mon Feb 8 10:33:04 2016 -0500 Commit: CMake Topic Stage CommitDate: Mon Feb 8 10:33:04 2016 -0500 Merge topic 'fix-Fortran-module-in-subdir' c5eb21b6 Fix dependency scanning configuration in subdirectories ----------------------------------------------------------------------- Summary of changes: Source/cmcmd.cxx | 6 ++---- Tests/Fortran/CMakeLists.txt | 1 + Tests/Fortran/Executable/CMakeLists.txt | 2 +- Tests/Fortran/Executable/main.f90 | 1 + Tests/Fortran/Subdir/CMakeLists.txt | 2 ++ Tests/Fortran/Subdir/subdir.f90 | 2 ++ 6 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 Tests/Fortran/Subdir/CMakeLists.txt create mode 100644 Tests/Fortran/Subdir/subdir.f90 hooks/post-receive -- CMake From brad.king at kitware.com Mon Feb 8 10:33:08 2016 From: brad.king at kitware.com (Brad King) Date: Mon, 8 Feb 2016 10:33:08 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc1-29-gbd15330 Message-ID: <20160208153308.DADB9E4F2A@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 bd15330da1edaf4a662335ff53648074fdc30e2b (commit) via d31d7ffd1e59c9fe2a108726d2d9d78adf90ca11 (commit) from a7e2021fea7f5dee0c8d8c6841819286438c8580 (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=bd15330da1edaf4a662335ff53648074fdc30e2b commit bd15330da1edaf4a662335ff53648074fdc30e2b Merge: a7e2021 d31d7ff Author: Brad King AuthorDate: Mon Feb 8 10:33:07 2016 -0500 Commit: CMake Topic Stage CommitDate: Mon Feb 8 10:33:07 2016 -0500 Merge topic 'test-FortranCInterface-again' d31d7ffd Tests: Fix Fortran test to run FortranCInterface again ----------------------------------------------------------------------- Summary of changes: Tests/Fortran/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Mon Feb 8 10:33:30 2016 From: brad.king at kitware.com (Brad King) Date: Mon, 8 Feb 2016 10:33:30 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-71-g1e2e67c Message-ID: <20160208153330.2F9C8E4D46@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, next has been updated via 1e2e67cd2fe3ee08b37afef37facae8fb366821c (commit) via bd15330da1edaf4a662335ff53648074fdc30e2b (commit) via a7e2021fea7f5dee0c8d8c6841819286438c8580 (commit) via 2619317c66ece81a9103731736ed7c8718e45666 (commit) via c1ee5166adcbe0aeb25b6cd368bd2917a70b22b4 (commit) via 5643088bb18cebcfa9ba28b16cf7ae198ae31645 (commit) via 08e53620044c1ac5ff29adb695a7c6bdde480fb4 (commit) via 037738ac194a7e50c92ffda60eaca707bb35bac9 (commit) via ccb2a26095b3d49c899e935da23af41eb21f2c51 (commit) from bb332d0c3040615fcc0e77f924f193db79913f2b (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=1e2e67cd2fe3ee08b37afef37facae8fb366821c commit 1e2e67cd2fe3ee08b37afef37facae8fb366821c Merge: bb332d0 bd15330 Author: Brad King AuthorDate: Mon Feb 8 10:33:23 2016 -0500 Commit: Brad King CommitDate: Mon Feb 8 10:33:23 2016 -0500 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Mon Feb 8 10:46:24 2016 From: brad.king at kitware.com (Brad King) Date: Mon, 8 Feb 2016 10:46:24 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-73-g72f135c Message-ID: <20160208154626.89E22E4375@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, next has been updated via 72f135c659170d195788f289dc4e37862c905f46 (commit) via a1ad098dc8fc5204fc797b92faed517337816b82 (commit) from 1e2e67cd2fe3ee08b37afef37facae8fb366821c (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=72f135c659170d195788f289dc4e37862c905f46 commit 72f135c659170d195788f289dc4e37862c905f46 Merge: 1e2e67c a1ad098 Author: Brad King AuthorDate: Mon Feb 8 10:46:23 2016 -0500 Commit: CMake Topic Stage CommitDate: Mon Feb 8 10:46:23 2016 -0500 Merge topic 'fix-install-EXPORT-crash' into next a1ad098d Tests: Avoid OS X 10.5 limitation warning in RunCMake.install test https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a1ad098dc8fc5204fc797b92faed517337816b82 commit a1ad098dc8fc5204fc797b92faed517337816b82 Author: Brad King AuthorDate: Mon Feb 8 10:44:43 2016 -0500 Commit: Brad King CommitDate: Mon Feb 8 10:44:43 2016 -0500 Tests: Avoid OS X 10.5 limitation warning in RunCMake.install test The EXPORT-OldIFace test case uses install(TARGETS) and so generates a warning: CMake Warning in CMakeLists.txt: WARNING: Target "foo" has runtime paths which cannot be changed during install. To change runtime paths, OS X version 10.6 or newer is required. Therefore, runtime paths will not be changed when installing. CMAKE_BUILD_WITH_INSTALL_RPATH may be used to work around this limitation. Set CMAKE_BUILD_WITH_INSTALL_RPATH to avoid the warning since we do not need to run the binaries from the build tree anyway. diff --git a/Tests/RunCMake/install/EXPORT-OldIFace.cmake b/Tests/RunCMake/install/EXPORT-OldIFace.cmake index 8dfb46b..033f684 100644 --- a/Tests/RunCMake/install/EXPORT-OldIFace.cmake +++ b/Tests/RunCMake/install/EXPORT-OldIFace.cmake @@ -1,4 +1,5 @@ enable_language(C) +set(CMAKE_BUILD_WITH_INSTALL_RPATH 1) add_subdirectory(EXPORT-OldIFace) add_library(foo SHARED empty.c) target_link_libraries(foo bar) ----------------------------------------------------------------------- Summary of changes: Tests/RunCMake/install/EXPORT-OldIFace.cmake | 1 + 1 file changed, 1 insertion(+) hooks/post-receive -- CMake From brad.king at kitware.com Mon Feb 8 13:21:00 2016 From: brad.king at kitware.com (Brad King) Date: Mon, 8 Feb 2016 13:21:00 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-76-gbd6a289 Message-ID: <20160208182100.05427E4B00@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, next has been updated via bd6a289b24ea77224ce6892b6e8a42f489816ab0 (commit) via 9b7d5871b86036da009119e14f54d161f2d44f24 (commit) via 6cbf6a51976c9092f84ef4a90d35fb6fd60f5898 (commit) from 72f135c659170d195788f289dc4e37862c905f46 (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=bd6a289b24ea77224ce6892b6e8a42f489816ab0 commit bd6a289b24ea77224ce6892b6e8a42f489816ab0 Merge: 72f135c 9b7d587 Author: Brad King AuthorDate: Mon Feb 8 13:20:58 2016 -0500 Commit: CMake Topic Stage CommitDate: Mon Feb 8 13:20:58 2016 -0500 Merge topic 'fix-target-lookup-performance-regression' into next 9b7d5871 Improve internal generator target structure lookup 6cbf6a51 Fix internal target lookup performance regression https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9b7d5871b86036da009119e14f54d161f2d44f24 commit 9b7d5871b86036da009119e14f54d161f2d44f24 Author: Brad King AuthorDate: Mon Feb 8 12:50:56 2016 -0500 Commit: Brad King CommitDate: Mon Feb 8 13:08:11 2016 -0500 Improve internal generator target structure lookup In commit v3.5.0-rc1~272^2~6 (cmGlobalGenerator: Add FindGeneratorTarget API, 2015-10-25) a lookup was implemented via linear search. Replace it with an efficient data structure. Suggested-by: Stephen Kelly diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 65e7b12..fc8cf06 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1650,6 +1650,7 @@ void cmGlobalGenerator::ClearGeneratorMembers() this->ExportSets.clear(); this->TargetDependencies.clear(); this->TargetSearchIndex.clear(); + this->GeneratorTargetSearchIndex.clear(); this->ProjectMap.clear(); this->RuleHashes.clear(); this->DirectoryContentMap.clear(); @@ -2186,6 +2187,14 @@ void cmGlobalGenerator::IndexTarget(cmTarget* t) } } +void cmGlobalGenerator::IndexGeneratorTarget(cmGeneratorTarget* gt) +{ + if (!gt->IsImported() || gt->IsImportedGloballyVisible()) + { + this->GeneratorTargetSearchIndex[gt->GetName()] = gt; + } +} + cmTarget* cmGlobalGenerator::FindTargetImpl(std::string const& name) const { TargetMap::const_iterator i = this->TargetSearchIndex.find(name); @@ -2199,37 +2208,11 @@ cmTarget* cmGlobalGenerator::FindTargetImpl(std::string const& name) const cmGeneratorTarget* cmGlobalGenerator::FindGeneratorTargetImpl(std::string const& name) const { - for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i) + GeneratorTargetMap::const_iterator i = + this->GeneratorTargetSearchIndex.find(name); + if (i != this->GeneratorTargetSearchIndex.end()) { - const std::vector& tgts = - this->LocalGenerators[i]->GetGeneratorTargets(); - for (std::vector::const_iterator it = tgts.begin(); - it != tgts.end(); ++it) - { - if ((*it)->GetName() == name) - { - return *it; - } - } - } - return 0; -} - -cmGeneratorTarget* cmGlobalGenerator::FindImportedGeneratorTargetImpl( - std::string const& name) const -{ - for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i) - { - const std::vector& tgts = - this->LocalGenerators[i]->GetImportedGeneratorTargets(); - for (std::vector::const_iterator it = tgts.begin(); - it != tgts.end(); ++it) - { - if ((*it)->IsImportedGloballyVisible() && (*it)->GetName() == name) - { - return *it; - } - } + return i->second; } return 0; } @@ -2260,11 +2243,7 @@ cmGlobalGenerator::FindGeneratorTarget(const std::string& name) const { return this->FindGeneratorTargetImpl(ai->second); } - if (cmGeneratorTarget* tgt = this->FindGeneratorTargetImpl(name)) - { - return tgt; - } - return this->FindImportedGeneratorTargetImpl(name); + return this->FindGeneratorTargetImpl(name); } //---------------------------------------------------------------------------- diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index 82bb35c..48fa704 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -279,6 +279,7 @@ public: bool needDisk = true); void IndexTarget(cmTarget* t); + void IndexGeneratorTarget(cmGeneratorTarget* gt); static bool IsReservedTarget(std::string const& name); @@ -435,16 +436,21 @@ private: #if defined(CMAKE_BUILD_WITH_CMAKE) # ifdef CMake_HAVE_CXX11_UNORDERED_MAP typedef std::unordered_map TargetMap; + typedef std::unordered_map + GeneratorTargetMap; # else typedef cmsys::hash_map TargetMap; + typedef cmsys::hash_map GeneratorTargetMap; # endif #else typedef std::map TargetMap; + typedef std::map GeneratorTargetMap; #endif // Map efficiently from target name to cmTarget instance. // Do not use this structure for looping over all targets. // It contains both normal and globally visible imported targets. TargetMap TargetSearchIndex; + GeneratorTargetMap GeneratorTargetSearchIndex; cmMakefile* TryCompileOuterMakefile; // If you add a new map here, make sure it is copied diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 1d17032..912be0c 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -455,11 +455,13 @@ void cmLocalGenerator::GenerateInstallRules() void cmLocalGenerator::AddGeneratorTarget(cmGeneratorTarget* gt) { this->GeneratorTargets.push_back(gt); + this->GlobalGenerator->IndexGeneratorTarget(gt); } void cmLocalGenerator::AddImportedGeneratorTarget(cmGeneratorTarget* gt) { this->ImportedGeneratorTargets.push_back(gt); + this->GlobalGenerator->IndexGeneratorTarget(gt); } void cmLocalGenerator::AddOwnedImportedGeneratorTarget(cmGeneratorTarget* gt) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6cbf6a51976c9092f84ef4a90d35fb6fd60f5898 commit 6cbf6a51976c9092f84ef4a90d35fb6fd60f5898 Author: Brad King AuthorDate: Mon Feb 8 12:37:47 2016 -0500 Commit: Brad King CommitDate: Mon Feb 8 13:08:11 2016 -0500 Fix internal target lookup performance regression Refactoring in commit v3.5.0-rc1~272^2~13 (cmGlobalGenerator: Remove direct storage of targets, 2015-10-25) replaced an efficient data structure mapping from target name to cmTarget instance with a linear search. Lookups through cmGlobalGenerator::FindTarget are done a lot. Restore the efficient mapping structure with a name indicating its purpose. Reported-by: Bartosz Kosiorek diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index d7bec44..65e7b12 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1649,6 +1649,7 @@ void cmGlobalGenerator::ClearGeneratorMembers() this->ExportSets.clear(); this->TargetDependencies.clear(); + this->TargetSearchIndex.clear(); this->ProjectMap.clear(); this->RuleHashes.clear(); this->DirectoryContentMap.clear(); @@ -2177,18 +2178,20 @@ bool cmGlobalGenerator::IsAlias(const std::string& name) const return this->AliasTargets.find(name) != this->AliasTargets.end(); } +void cmGlobalGenerator::IndexTarget(cmTarget* t) +{ + if (!t->IsImported() || t->IsImportedGloballyVisible()) + { + this->TargetSearchIndex[t->GetName()] = t; + } +} + cmTarget* cmGlobalGenerator::FindTargetImpl(std::string const& name) const { - for (unsigned int i = 0; i < this->Makefiles.size(); ++i) + TargetMap::const_iterator i = this->TargetSearchIndex.find(name); + if (i != this->TargetSearchIndex.end()) { - cmTargets& tgts = this->Makefiles[i]->GetTargets(); - for (cmTargets::iterator it = tgts.begin(); it != tgts.end(); ++it) - { - if (it->second.GetName() == name) - { - return &it->second; - } - } + return i->second; } return 0; } @@ -2212,25 +2215,6 @@ cmGlobalGenerator::FindGeneratorTargetImpl(std::string const& name) const return 0; } -cmTarget* -cmGlobalGenerator::FindImportedTargetImpl(std::string const& name) const -{ - for (unsigned int i = 0; i < this->Makefiles.size(); ++i) - { - const std::vector& tgts = - this->Makefiles[i]->GetOwnedImportedTargets(); - for (std::vector::const_iterator it = tgts.begin(); - it != tgts.end(); ++it) - { - if ((*it)->GetName() == name && (*it)->IsImportedGloballyVisible()) - { - return *it; - } - } - } - return 0; -} - cmGeneratorTarget* cmGlobalGenerator::FindImportedGeneratorTargetImpl( std::string const& name) const { @@ -2264,11 +2248,7 @@ cmGlobalGenerator::FindTarget(const std::string& name, return this->FindTargetImpl(ai->second); } } - if (cmTarget* tgt = this->FindTargetImpl(name)) - { - return tgt; - } - return this->FindImportedTargetImpl(name); + return this->FindTargetImpl(name); } cmGeneratorTarget* diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index bc6e17d..82bb35c 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -278,6 +278,8 @@ public: std::set const& GetDirectoryContent(std::string const& dir, bool needDisk = true); + void IndexTarget(cmTarget* t); + static bool IsReservedTarget(std::string const& name); virtual const char* GetAllTargetName() const { return "ALL_BUILD"; } @@ -420,7 +422,6 @@ protected: std::map AliasTargets; cmTarget* FindTargetImpl(std::string const& name) const; - cmTarget* FindImportedTargetImpl(std::string const& name) const; cmGeneratorTarget* FindGeneratorTargetImpl(std::string const& name) const; cmGeneratorTarget* @@ -430,6 +431,21 @@ protected: virtual bool UseFolderProperty(); private: + +#if defined(CMAKE_BUILD_WITH_CMAKE) +# ifdef CMake_HAVE_CXX11_UNORDERED_MAP + typedef std::unordered_map TargetMap; +# else + typedef cmsys::hash_map TargetMap; +# endif +#else + typedef std::map TargetMap; +#endif + // Map efficiently from target name to cmTarget instance. + // Do not use this structure for looping over all targets. + // It contains both normal and globally visible imported targets. + TargetMap TargetSearchIndex; + cmMakefile* TryCompileOuterMakefile; // If you add a new map here, make sure it is copied // in EnableLanguagesFromGenerator diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index cba29eb..950b247 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -2128,6 +2128,7 @@ cmMakefile::AddNewTarget(cmState::TargetType type, const std::string& name) cmTarget& target = it->second; target.SetType(type, name); target.SetMakefile(this); + this->GetGlobalGenerator()->IndexTarget(&it->second); return &it->second; } @@ -4218,6 +4219,7 @@ cmMakefile::AddImportedTarget(const std::string& name, // Add to the set of available imported targets. this->ImportedTargets[name] = target.get(); + this->GetGlobalGenerator()->IndexTarget(target.get()); // Transfer ownership to this cmMakefile object. this->ImportedTargetsOwned.push_back(target.get()); ----------------------------------------------------------------------- Summary of changes: Source/cmGlobalGenerator.cxx | 81 +++++++++++------------------------------- Source/cmGlobalGenerator.h | 24 ++++++++++++- Source/cmLocalGenerator.cxx | 2 ++ Source/cmMakefile.cxx | 2 ++ 4 files changed, 47 insertions(+), 62 deletions(-) hooks/post-receive -- CMake From jamesbigler at gmail.com Mon Feb 8 15:40:23 2016 From: jamesbigler at gmail.com (James Bigler) Date: Mon, 8 Feb 2016 15:40:23 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-78-g59535a6 Message-ID: <20160208204023.1F7B9E3DAE@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, next has been updated via 59535a60761ca79e685e24f18bbd621e70d0594b (commit) via e739ef7b66f0a14db5955316916204034104cad4 (commit) from bd6a289b24ea77224ce6892b6e8a42f489816ab0 (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=59535a60761ca79e685e24f18bbd621e70d0594b commit 59535a60761ca79e685e24f18bbd621e70d0594b Merge: bd6a289 e739ef7 Author: James Bigler AuthorDate: Mon Feb 8 15:40:22 2016 -0500 Commit: CMake Topic Stage CommitDate: Mon Feb 8 15:40:22 2016 -0500 Merge topic 'FindCUDA.cmake/FixNonExistantDependencyFile' into next e739ef7b FindCUDA: Only warn about non-existent dependency files in verbose mode https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e739ef7b66f0a14db5955316916204034104cad4 commit e739ef7b66f0a14db5955316916204034104cad4 Author: James Bigler AuthorDate: Mon Feb 8 13:38:28 2016 -0700 Commit: James Bigler CommitDate: Mon Feb 8 13:38:28 2016 -0700 FindCUDA: Only warn about non-existent dependency files in verbose mode diff --git a/Modules/FindCUDA/make2cmake.cmake b/Modules/FindCUDA/make2cmake.cmake index b841f3b..802f93a 100644 --- a/Modules/FindCUDA/make2cmake.cmake +++ b/Modules/FindCUDA/make2cmake.cmake @@ -35,6 +35,16 @@ # This converts a file written in makefile syntax into one that can be included # by CMake. +# Input variables +# +# verbose:BOOL=<> OFF: Be as quiet as possible (default) +# ON : Extra output +# +# input_file:FILEPATH=<> Path to dependecy file in makefile format +# +# output_file:FILEPATH=<> Path to file with dependencies in CMake readable variable +# + file(READ ${input_file} depend_text) if (NOT "${depend_text}" STREQUAL "") @@ -62,7 +72,9 @@ if (NOT "${depend_text}" STREQUAL "") if (EXISTS "/${file}") set(file "/${file}") else() - message(WARNING " Removing non-existent dependency file: ${file}") + if(verbose) + message(WARNING " Removing non-existent dependency file: ${file}") + endif() set(file "") endif() endif() diff --git a/Modules/FindCUDA/run_nvcc.cmake b/Modules/FindCUDA/run_nvcc.cmake index 8032309..12b83e0 100644 --- a/Modules/FindCUDA/run_nvcc.cmake +++ b/Modules/FindCUDA/run_nvcc.cmake @@ -207,6 +207,7 @@ cuda_execute_process( COMMAND "${CMAKE_COMMAND}" -D "input_file:FILEPATH=${NVCC_generated_dependency_file}" -D "output_file:FILEPATH=${cmake_dependency_file}.tmp" + -D "verbose=${verbose}" -P "${CUDA_make2cmake}" ) ----------------------------------------------------------------------- Summary of changes: Modules/FindCUDA/make2cmake.cmake | 14 +++++++++++++- Modules/FindCUDA/run_nvcc.cmake | 1 + 2 files changed, 14 insertions(+), 1 deletion(-) hooks/post-receive -- CMake From kwrobot at kitware.com Tue Feb 9 00:01:07 2016 From: kwrobot at kitware.com (Kitware Robot) Date: Tue, 9 Feb 2016 00:01:07 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc1-30-g41c38ee Message-ID: <20160209050107.A6146E486B@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 41c38ee7cdd32b15b51dc44cdb97fd44f9831c40 (commit) from bd15330da1edaf4a662335ff53648074fdc30e2b (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=41c38ee7cdd32b15b51dc44cdb97fd44f9831c40 commit 41c38ee7cdd32b15b51dc44cdb97fd44f9831c40 Author: Kitware Robot AuthorDate: Tue Feb 9 00:01:05 2016 -0500 Commit: Kitware Robot CommitDate: Tue Feb 9 00:01:05 2016 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 66a97c7..5517ba9 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 5) -set(CMake_VERSION_PATCH 20160208) +set(CMake_VERSION_PATCH 20160209) #set(CMake_VERSION_RC 1) ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Tue Feb 9 10:10:12 2016 From: brad.king at kitware.com (Brad King) Date: Tue, 9 Feb 2016 10:10:12 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc1-34-ge509c0e Message-ID: <20160209151012.9F268C0382@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 e509c0e6d47510940d4282bf46b583ac15ab033d (commit) via a1ad098dc8fc5204fc797b92faed517337816b82 (commit) via 47460f3e152a59af81edd816cdfe6e0d54e38090 (commit) via e86383e135e4cae9d54575445d945df1f6272b3a (commit) from 41c38ee7cdd32b15b51dc44cdb97fd44f9831c40 (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=e509c0e6d47510940d4282bf46b583ac15ab033d commit e509c0e6d47510940d4282bf46b583ac15ab033d Merge: 41c38ee a1ad098 Author: Brad King AuthorDate: Tue Feb 9 10:10:09 2016 -0500 Commit: CMake Topic Stage CommitDate: Tue Feb 9 10:10:09 2016 -0500 Merge topic 'fix-install-EXPORT-crash' a1ad098d Tests: Avoid OS X 10.5 limitation warning in RunCMake.install test 47460f3e install(EXPORT): Fix crash on target in another directory e86383e1 Tests: Use newer policy settings in RunCMake.install test ----------------------------------------------------------------------- Summary of changes: Source/cmInstallCommand.cxx | 8 +++++--- Tests/RunCMake/install/CMP0062-NEW.cmake | 2 +- Tests/RunCMake/install/CMP0062-OLD.cmake | 2 +- Tests/RunCMake/install/CMP0062-WARN.cmake | 1 + Tests/RunCMake/install/CMakeLists.txt | 2 +- Tests/RunCMake/install/EXPORT-OldIFace.cmake | 7 +++++++ Tests/RunCMake/install/EXPORT-OldIFace/CMakeLists.txt | 2 ++ Tests/RunCMake/install/RunCMakeTest.cmake | 1 + 8 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 Tests/RunCMake/install/EXPORT-OldIFace.cmake create mode 100644 Tests/RunCMake/install/EXPORT-OldIFace/CMakeLists.txt hooks/post-receive -- CMake From brad.king at kitware.com Tue Feb 9 10:10:14 2016 From: brad.king at kitware.com (Brad King) Date: Tue, 9 Feb 2016 10:10:14 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc1-36-g8aec0f9 Message-ID: <20160209151014.D7D23C0AEE@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 8aec0f955a5e6a11cea6004a31fbe88760db939f (commit) via 2859d9ef6b6899ce87d104acd8a3cd232c53d65e (commit) from e509c0e6d47510940d4282bf46b583ac15ab033d (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=8aec0f955a5e6a11cea6004a31fbe88760db939f commit 8aec0f955a5e6a11cea6004a31fbe88760db939f Merge: e509c0e 2859d9e Author: Brad King AuthorDate: Tue Feb 9 10:10:13 2016 -0500 Commit: CMake Topic Stage CommitDate: Tue Feb 9 10:10:13 2016 -0500 Merge topic 'test-ctest_submit-update' 2859d9ef Tests: Extend ctest_submit host lookup failure matching (#15958) ----------------------------------------------------------------------- Summary of changes: Tests/RunCMake/ctest_submit/CDashSubmitQuiet-stderr.txt | 2 +- Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt | 2 +- Tests/RunCMake/ctest_submit/FailDrop-http-stderr.txt | 2 +- Tests/RunCMake/ctest_submit/FailDrop-https-stderr.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Tue Feb 9 10:10:17 2016 From: brad.king at kitware.com (Brad King) Date: Tue, 9 Feb 2016 10:10:17 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc1-40-g3b8c0fb Message-ID: <20160209151017.ACB29DED73@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 3b8c0fbfd787fc21137b0e2f511e7c91b3e70227 (commit) via 586e56d0ef8c9bda2e5c24371ad7bb0b95a4395f (commit) via d321c196a0bfb58ff8a32ed14552d1b78b24cf8a (commit) via 18ce97c4a20b7da4e11006ad80f17cb55e128db1 (commit) from 8aec0f955a5e6a11cea6004a31fbe88760db939f (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=3b8c0fbfd787fc21137b0e2f511e7c91b3e70227 commit 3b8c0fbfd787fc21137b0e2f511e7c91b3e70227 Merge: 8aec0f9 586e56d Author: Brad King AuthorDate: Tue Feb 9 10:10:15 2016 -0500 Commit: CMake Topic Stage CommitDate: Tue Feb 9 10:10:15 2016 -0500 Merge topic 'install-EXCLUDE_FROM_ALL' 586e56d0 Help: Add notes for topic 'install-EXCLUDE_FROM_ALL' d321c196 Tests: Add cases for install() command EXCLUDE_FROM_ALL option 18ce97c4 install: Add EXCLUDE_FROM_ALL option (#14921) ----------------------------------------------------------------------- Summary of changes: Help/command/install.rst | 23 ++++++---- Help/release/dev/install-EXCLUDE_FROM_ALL.rst | 5 +++ Source/cmInstallCommand.cxx | 31 ++++++++++++-- Source/cmInstallCommandArguments.cxx | 30 +++++++++---- Source/cmInstallCommandArguments.h | 2 + Source/cmInstallDirectoryGenerator.cxx | 4 +- Source/cmInstallDirectoryGenerator.h | 1 + Source/cmInstallExportGenerator.cxx | 4 +- Source/cmInstallExportGenerator.h | 1 + Source/cmInstallFilesCommand.cxx | 4 +- Source/cmInstallFilesGenerator.cxx | 4 +- Source/cmInstallFilesGenerator.h | 1 + Source/cmInstallGenerator.cxx | 18 +++++--- Source/cmInstallGenerator.h | 7 ++- Source/cmInstallProgramsCommand.cxx | 4 +- Source/cmInstallScriptGenerator.cxx | 7 +-- Source/cmInstallScriptGenerator.h | 2 +- Source/cmInstallTargetGenerator.cxx | 4 +- Source/cmInstallTargetGenerator.h | 1 + Source/cmLocalGenerator.cxx | 6 +-- .../install/FILES-EXCLUDE_FROM_ALL-all-check.cmake | 1 + .../install/FILES-EXCLUDE_FROM_ALL-exc-check.cmake | 1 + .../install/FILES-EXCLUDE_FROM_ALL-uns-check.cmake | 1 + .../RunCMake/install/FILES-EXCLUDE_FROM_ALL.cmake | 3 ++ Tests/RunCMake/install/RunCMakeTest.cmake | 45 ++++++++++++++++++++ .../TARGETS-EXCLUDE_FROM_ALL-all-check.cmake | 1 + .../TARGETS-EXCLUDE_FROM_ALL-exc-check.cmake | 1 + .../TARGETS-EXCLUDE_FROM_ALL-uns-check.cmake | 1 + .../install/TARGETS-EXCLUDE_FROM_ALL.cmake | 5 +++ .../LinkInterfaceLoop => RunCMake/install}/main.c | 0 30 files changed, 177 insertions(+), 41 deletions(-) create mode 100644 Help/release/dev/install-EXCLUDE_FROM_ALL.rst create mode 100644 Tests/RunCMake/install/FILES-EXCLUDE_FROM_ALL-all-check.cmake create mode 100644 Tests/RunCMake/install/FILES-EXCLUDE_FROM_ALL-exc-check.cmake create mode 100644 Tests/RunCMake/install/FILES-EXCLUDE_FROM_ALL-uns-check.cmake create mode 100644 Tests/RunCMake/install/FILES-EXCLUDE_FROM_ALL.cmake create mode 100644 Tests/RunCMake/install/TARGETS-EXCLUDE_FROM_ALL-all-check.cmake create mode 100644 Tests/RunCMake/install/TARGETS-EXCLUDE_FROM_ALL-exc-check.cmake create mode 100644 Tests/RunCMake/install/TARGETS-EXCLUDE_FROM_ALL-uns-check.cmake create mode 100644 Tests/RunCMake/install/TARGETS-EXCLUDE_FROM_ALL.cmake copy Tests/{CMakeOnly/LinkInterfaceLoop => RunCMake/install}/main.c (100%) hooks/post-receive -- CMake From brad.king at kitware.com Tue Feb 9 10:10:20 2016 From: brad.king at kitware.com (Brad King) Date: Tue, 9 Feb 2016 10:10:20 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc1-43-g778fda1 Message-ID: <20160209151020.138FEE269B@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 778fda1e925098ebd4377eaabce932f47bb40ec2 (commit) via 5b04aa31b8d791bc5e162fbc8c89b2d0058c8572 (commit) via 2cae5128fdc6316a7f0913cb89ec467b33b9715b (commit) from 3b8c0fbfd787fc21137b0e2f511e7c91b3e70227 (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=778fda1e925098ebd4377eaabce932f47bb40ec2 commit 778fda1e925098ebd4377eaabce932f47bb40ec2 Merge: 3b8c0fb 5b04aa3 Author: Brad King AuthorDate: Tue Feb 9 10:10:18 2016 -0500 Commit: CMake Topic Stage CommitDate: Tue Feb 9 10:10:18 2016 -0500 Merge topic 'apple-isystem-gcc' 5b04aa31 Xcode: Disable test for system include dirs 2cae5128 Apple: Enable -isystem for GNU Compiler >= 4 (#15953) ----------------------------------------------------------------------- Summary of changes: Modules/Compiler/GNU.cmake | 2 +- Tests/Complex/Executable/CMakeLists.txt | 3 ++- Tests/ComplexOneConfig/Executable/CMakeLists.txt | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Tue Feb 9 10:10:22 2016 From: brad.king at kitware.com (Brad King) Date: Tue, 9 Feb 2016 10:10:22 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc1-45-g7b53e8c Message-ID: <20160209151022.454F1E26EE@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 7b53e8c6a52d64768774608116f6c5cc72d1e0b1 (commit) via 8282547e0f9d7370e6f84f97a448b9842009c8c8 (commit) from 778fda1e925098ebd4377eaabce932f47bb40ec2 (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=7b53e8c6a52d64768774608116f6c5cc72d1e0b1 commit 7b53e8c6a52d64768774608116f6c5cc72d1e0b1 Merge: 778fda1 8282547 Author: Brad King AuthorDate: Tue Feb 9 10:10:20 2016 -0500 Commit: CMake Topic Stage CommitDate: Tue Feb 9 10:10:20 2016 -0500 Merge topic 'install-man-conditionally' 8282547e Install ccmake.1 and cmake-gui.1 conditionally with their tools (#15957) ----------------------------------------------------------------------- Summary of changes: Utilities/Sphinx/CMakeLists.txt | 8 ++++++++ 1 file changed, 8 insertions(+) hooks/post-receive -- CMake From brad.king at kitware.com Tue Feb 9 10:10:24 2016 From: brad.king at kitware.com (Brad King) Date: Tue, 9 Feb 2016 10:10:24 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc1-48-ga887c7f Message-ID: <20160209151024.A72D6E27B8@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 a887c7f1fd97d9ebf88b294105e81acf5963fc25 (commit) via 9b7d5871b86036da009119e14f54d161f2d44f24 (commit) via 6cbf6a51976c9092f84ef4a90d35fb6fd60f5898 (commit) from 7b53e8c6a52d64768774608116f6c5cc72d1e0b1 (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=a887c7f1fd97d9ebf88b294105e81acf5963fc25 commit a887c7f1fd97d9ebf88b294105e81acf5963fc25 Merge: 7b53e8c 9b7d587 Author: Brad King AuthorDate: Tue Feb 9 10:10:23 2016 -0500 Commit: CMake Topic Stage CommitDate: Tue Feb 9 10:10:23 2016 -0500 Merge topic 'fix-target-lookup-performance-regression' 9b7d5871 Improve internal generator target structure lookup 6cbf6a51 Fix internal target lookup performance regression ----------------------------------------------------------------------- Summary of changes: Source/cmGlobalGenerator.cxx | 81 +++++++++++------------------------------- Source/cmGlobalGenerator.h | 24 ++++++++++++- Source/cmLocalGenerator.cxx | 2 ++ Source/cmMakefile.cxx | 2 ++ 4 files changed, 47 insertions(+), 62 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Tue Feb 9 10:10:26 2016 From: brad.king at kitware.com (Brad King) Date: Tue, 9 Feb 2016 10:10:26 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc1-50-g16f83f6 Message-ID: <20160209151026.DAC3DE27B8@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 16f83f648a1ef75a66a5b07deec55c6e6e65b0d3 (commit) via e739ef7b66f0a14db5955316916204034104cad4 (commit) from a887c7f1fd97d9ebf88b294105e81acf5963fc25 (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=16f83f648a1ef75a66a5b07deec55c6e6e65b0d3 commit 16f83f648a1ef75a66a5b07deec55c6e6e65b0d3 Merge: a887c7f e739ef7 Author: Brad King AuthorDate: Tue Feb 9 10:10:25 2016 -0500 Commit: CMake Topic Stage CommitDate: Tue Feb 9 10:10:25 2016 -0500 Merge topic 'FindCUDA.cmake/FixNonExistantDependencyFile' e739ef7b FindCUDA: Only warn about non-existent dependency files in verbose mode ----------------------------------------------------------------------- Summary of changes: Modules/FindCUDA/make2cmake.cmake | 14 +++++++++++++- Modules/FindCUDA/run_nvcc.cmake | 1 + 2 files changed, 14 insertions(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Tue Feb 9 10:10:44 2016 From: brad.king at kitware.com (Brad King) Date: Tue, 9 Feb 2016 10:10:44 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-87-g686b52d Message-ID: <20160209151044.D9C0FE2D29@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, next has been updated via 686b52d714b059aeecbf1a835f6eafa50943b0f8 (commit) via 16f83f648a1ef75a66a5b07deec55c6e6e65b0d3 (commit) via a887c7f1fd97d9ebf88b294105e81acf5963fc25 (commit) via 7b53e8c6a52d64768774608116f6c5cc72d1e0b1 (commit) via 778fda1e925098ebd4377eaabce932f47bb40ec2 (commit) via 3b8c0fbfd787fc21137b0e2f511e7c91b3e70227 (commit) via 8aec0f955a5e6a11cea6004a31fbe88760db939f (commit) via e509c0e6d47510940d4282bf46b583ac15ab033d (commit) via 41c38ee7cdd32b15b51dc44cdb97fd44f9831c40 (commit) from 59535a60761ca79e685e24f18bbd621e70d0594b (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=686b52d714b059aeecbf1a835f6eafa50943b0f8 commit 686b52d714b059aeecbf1a835f6eafa50943b0f8 Merge: 59535a6 16f83f6 Author: Brad King AuthorDate: Tue Feb 9 10:10:37 2016 -0500 Commit: Brad King CommitDate: Tue Feb 9 10:10:37 2016 -0500 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Tue Feb 9 10:13:46 2016 From: brad.king at kitware.com (Brad King) Date: Tue, 9 Feb 2016 10:13:46 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc1-57-gdfa01fd Message-ID: <20160209151346.79299E3E90@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 dfa01fd005502cf8d80d007bb42d21e2817d4d73 (commit) via 656bf0da2c0b9a2fa6e79970df968d5e9c4e4e1a (commit) via 2a768f84e3dda1ce26342b9922b7f57e5110e887 (commit) via 98d6d8f9e21fe7cb4f993cdc4c06bf7d8b4f74d1 (commit) via 024c4eac0502e4153c9eb44a2f5bcabf48c4d00d (commit) via 52a81d67f1a462143147e2282c8763b5b37060ae (commit) via cb409699a40826cacc7ba5bc64936aed7ae0a286 (commit) from 16f83f648a1ef75a66a5b07deec55c6e6e65b0d3 (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: hooks/post-receive -- CMake From brad.king at kitware.com Tue Feb 9 10:13:46 2016 From: brad.king at kitware.com (Brad King) Date: Tue, 9 Feb 2016 10:13:46 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-95-g0de8af0 Message-ID: <20160209151346.8D521E3EEC@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, next has been updated via 0de8af011e69b31d2c67cca890cff301ad22ad0f (commit) via dfa01fd005502cf8d80d007bb42d21e2817d4d73 (commit) via 656bf0da2c0b9a2fa6e79970df968d5e9c4e4e1a (commit) via 2a768f84e3dda1ce26342b9922b7f57e5110e887 (commit) via 98d6d8f9e21fe7cb4f993cdc4c06bf7d8b4f74d1 (commit) via 024c4eac0502e4153c9eb44a2f5bcabf48c4d00d (commit) via 52a81d67f1a462143147e2282c8763b5b37060ae (commit) via cb409699a40826cacc7ba5bc64936aed7ae0a286 (commit) from 686b52d714b059aeecbf1a835f6eafa50943b0f8 (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=0de8af011e69b31d2c67cca890cff301ad22ad0f commit 0de8af011e69b31d2c67cca890cff301ad22ad0f Merge: 686b52d dfa01fd Author: Brad King AuthorDate: Tue Feb 9 10:13:10 2016 -0500 Commit: Brad King CommitDate: Tue Feb 9 10:13:10 2016 -0500 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake From brad.king at kitware.com Tue Feb 9 10:13:46 2016 From: brad.king at kitware.com (Brad King) Date: Tue, 9 Feb 2016 10:13:46 -0500 (EST) Subject: [Cmake-commits] CMake branch, release, updated. v3.5.0-rc1-15-g656bf0d Message-ID: <20160209151347.014E5E3E55@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 656bf0da2c0b9a2fa6e79970df968d5e9c4e4e1a (commit) via a1ad098dc8fc5204fc797b92faed517337816b82 (commit) via 2a768f84e3dda1ce26342b9922b7f57e5110e887 (commit) via 98d6d8f9e21fe7cb4f993cdc4c06bf7d8b4f74d1 (commit) via 024c4eac0502e4153c9eb44a2f5bcabf48c4d00d (commit) via 52a81d67f1a462143147e2282c8763b5b37060ae (commit) via cb409699a40826cacc7ba5bc64936aed7ae0a286 (commit) via a3b91d164043bdef713c0490f3069c00851ccf13 (commit) via d8c90800174b6b5256fea5ea0813977c608c5ff0 (commit) via 8282547e0f9d7370e6f84f97a448b9842009c8c8 (commit) via 2859d9ef6b6899ce87d104acd8a3cd232c53d65e (commit) via 1b9d15c1e7adff5170f10d488483e1dc4e99d507 (commit) via 47460f3e152a59af81edd816cdfe6e0d54e38090 (commit) via e86383e135e4cae9d54575445d945df1f6272b3a (commit) via c5eb21b6d1f4187778ad49545761a818e1126541 (commit) from 8a8d22cf1e5d20b7c3b32c1ec9b5f06b339c2a50 (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: Help/command/cmake_minimum_required.rst | 2 +- Help/manual/cmake-buildsystem.7.rst | 2 +- Modules/ExternalProject.cmake | 19 +++++++++++++++++-- Source/cmInstallCommand.cxx | 8 +++++--- Source/cmcmd.cxx | 6 ++---- Tests/Fortran/CMakeLists.txt | 1 + Tests/Fortran/Executable/CMakeLists.txt | 2 +- Tests/Fortran/Executable/main.f90 | 1 + Tests/Fortran/Subdir/CMakeLists.txt | 2 ++ Tests/Fortran/Subdir/subdir.f90 | 2 ++ .../ctest_submit/CDashSubmitQuiet-stderr.txt | 2 +- Tests/RunCMake/ctest_submit/FailDrop-ftp-stderr.txt | 2 +- .../RunCMake/ctest_submit/FailDrop-http-stderr.txt | 2 +- .../RunCMake/ctest_submit/FailDrop-https-stderr.txt | 2 +- Tests/RunCMake/install/CMP0062-NEW.cmake | 2 +- Tests/RunCMake/install/CMP0062-OLD.cmake | 2 +- Tests/RunCMake/install/CMP0062-WARN.cmake | 1 + Tests/RunCMake/install/CMakeLists.txt | 2 +- Tests/RunCMake/install/EXPORT-OldIFace.cmake | 7 +++++++ .../RunCMake/install/EXPORT-OldIFace/CMakeLists.txt | 2 ++ Tests/RunCMake/install/RunCMakeTest.cmake | 1 + Utilities/Sphinx/CMakeLists.txt | 8 ++++++++ 22 files changed, 59 insertions(+), 19 deletions(-) create mode 100644 Tests/Fortran/Subdir/CMakeLists.txt create mode 100644 Tests/Fortran/Subdir/subdir.f90 create mode 100644 Tests/RunCMake/install/EXPORT-OldIFace.cmake create mode 100644 Tests/RunCMake/install/EXPORT-OldIFace/CMakeLists.txt hooks/post-receive -- CMake From brad.king at kitware.com Tue Feb 9 10:35:50 2016 From: brad.king at kitware.com (Brad King) Date: Tue, 9 Feb 2016 10:35:50 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-97-g236133f Message-ID: <20160209153550.2D887E4D99@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, next has been updated via 236133f1fb460880cb87c7ed48f2be81bd197cb2 (commit) via a12b0f1b193024b71583b9150aeead33d364d189 (commit) from 0de8af011e69b31d2c67cca890cff301ad22ad0f (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=236133f1fb460880cb87c7ed48f2be81bd197cb2 commit 236133f1fb460880cb87c7ed48f2be81bd197cb2 Merge: 0de8af0 a12b0f1 Author: Brad King AuthorDate: Tue Feb 9 10:35:48 2016 -0500 Commit: CMake Topic Stage CommitDate: Tue Feb 9 10:35:48 2016 -0500 Merge topic 'wix-prevent-nsis-overwrite' into next a12b0f1b CMake: Prevent WiX installations over existing NSIS installations https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a12b0f1b193024b71583b9150aeead33d364d189 commit a12b0f1b193024b71583b9150aeead33d364d189 Author: Nils Gladitz AuthorDate: Sun Feb 7 20:25:56 2016 +0100 Commit: Brad King CommitDate: Tue Feb 9 10:28:57 2016 -0500 CMake: Prevent WiX installations over existing NSIS installations Use a custom action to look for Uninstall.exe in the user selected installation prefix. Its presence indicates a previous NSIS installation. Inform the user and request manual resolution of the issue. diff --git a/CMakeCPack.cmake b/CMakeCPack.cmake index a0aadcc..3203279 100644 --- a/CMakeCPack.cmake +++ b/CMakeCPack.cmake @@ -198,6 +198,17 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake") set(CPACK_WIX_UPGRADE_GUID "8ffd1d72-b7f1-11e2-8ee5-00238bca4991") + if(MSVC AND NOT "$ENV{WIX}" STREQUAL "") + set(WIX_CUSTOM_ACTION_ENABLED TRUE) + if(CMAKE_CONFIGURATION_TYPES) + set(WIX_CUSTOM_ACTION_MULTI_CONFIG TRUE) + else() + set(WIX_CUSTOM_ACTION_MULTI_CONFIG FALSE) + endif() + else() + set(WIX_CUSTOM_ACTION_ENABLED FALSE) + endif() + # Set the options file that needs to be included inside CMakeCPackOptions.cmake set(QT_DIALOG_CPACK_OPTIONS_FILE ${CMake_BINARY_DIR}/Source/QtDialog/QtDialogCPack.cmake) configure_file("${CMake_SOURCE_DIR}/CMakeCPackOptions.cmake.in" diff --git a/CMakeCPackOptions.cmake.in b/CMakeCPackOptions.cmake.in index 25af0c9..59ae224 100644 --- a/CMakeCPackOptions.cmake.in +++ b/CMakeCPackOptions.cmake.in @@ -246,6 +246,29 @@ if("${CPACK_GENERATOR}" STREQUAL "WIX") "@CMake_SOURCE_DIR@/Utilities/Release/WiX/cmake_extra_dialog.wxs" ) + set(_WIX_CUSTOM_ACTION_ENABLED "@WIX_CUSTOM_ACTION_ENABLED@") + if(_WIX_CUSTOM_ACTION_ENABLED) + list(APPEND CPACK_WIX_EXTRA_SOURCES + "@CMake_SOURCE_DIR@/Utilities/Release/WiX/cmake_nsis_overwrite_dialog.wxs" + ) + list(APPEND CPACK_WIX_CANDLE_EXTRA_FLAGS -dCHECK_NSIS=1) + + set(_WIX_CUSTOM_ACTION_MULTI_CONFIG "@WIX_CUSTOM_ACTION_MULTI_CONFIG@") + if(_WIX_CUSTOM_ACTION_MULTI_CONFIG) + if(CPACK_BUILD_CONFIG) + set(_WIX_CUSTOM_ACTION_CONFIG "${CPACK_BUILD_CONFIG}") + else() + set(_WIX_CUSTOM_ACTION_CONFIG "Release") + endif() + + list(APPEND CPACK_WIX_EXTRA_SOURCES + "@CMake_BINARY_DIR@/Utilities/Release/WiX/custom_action_dll-${_WIX_CUSTOM_ACTION_CONFIG}.wxs") + else() + list(APPEND CPACK_WIX_EXTRA_SOURCES + "@CMake_BINARY_DIR@/Utilities/Release/WiX/custom_action_dll.wxs") + endif() + endif() + set(CPACK_WIX_UI_REF "CMakeUI_InstallDir") set(CPACK_WIX_PATCH_FILE @@ -261,8 +284,7 @@ if("${CPACK_GENERATOR}" STREQUAL "WIX") if(BUILD_QtDialog) list(APPEND CPACK_WIX_PATCH_FILE "@CMake_SOURCE_DIR@/Utilities/Release/WiX/patch_desktop_shortcut.xml" - ) - - set(CPACK_WIX_CANDLE_EXTRA_FLAGS "-dBUILD_QtDialog=1") + ) + list(APPEND CPACK_WIX_CANDLE_EXTRA_FLAGS -dBUILD_QtDialog=1) endif() endif() diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt index 8b3e325..cf6bb72 100644 --- a/Utilities/CMakeLists.txt +++ b/Utilities/CMakeLists.txt @@ -33,3 +33,7 @@ else() # Normal documentation build. add_subdirectory(Sphinx) endif() + +if(WIX_CUSTOM_ACTION_ENABLED) + add_subdirectory(Release/WiX) +endif() diff --git a/Utilities/Release/WiX/CMakeLists.txt b/Utilities/Release/WiX/CMakeLists.txt new file mode 100644 index 0000000..cc0dbe1 --- /dev/null +++ b/Utilities/Release/WiX/CMakeLists.txt @@ -0,0 +1,12 @@ +add_subdirectory(CustomAction) + +if(CMAKE_CONFIGURATION_TYPES) + set(CUSTOM_ACTION_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/custom_action_dll-$.wxs") +else() + set(CUSTOM_ACTION_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/custom_action_dll.wxs") +endif() + +file(GENERATE + OUTPUT "${CUSTOM_ACTION_OUTPUT}" + INPUT "${CMAKE_CURRENT_SOURCE_DIR}/custom_action_dll.wxs.in" + ) diff --git a/Utilities/Release/WiX/CustomAction/CMakeLists.txt b/Utilities/Release/WiX/CustomAction/CMakeLists.txt new file mode 100644 index 0000000..7efd01e --- /dev/null +++ b/Utilities/Release/WiX/CustomAction/CMakeLists.txt @@ -0,0 +1,13 @@ +foreach(CONFIG DEBUG MINSIZEREL RELEASE RELWITHDEBINFO) + string(REPLACE "/MD" "/MT" + "CMAKE_CXX_FLAGS_${CONFIG}" + "${CMAKE_CXX_FLAGS_${CONFIG}}" + ) +endforeach() + +add_library(CMakeWiXCustomActions MODULE + detect_nsis_overwrite.cpp + exports.def +) + +target_link_libraries(CMakeWiXCustomActions PRIVATE msi) diff --git a/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp b/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp new file mode 100644 index 0000000..dad1ae5 --- /dev/null +++ b/Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp @@ -0,0 +1,45 @@ +#include +#include +#include + +#include +#include + +std::wstring get_property(MSIHANDLE msi_handle, std::wstring const& name) +{ + DWORD size = 0; + + UINT status = MsiGetPropertyW(msi_handle, name.c_str(), L"", &size); + + if(status == ERROR_MORE_DATA) + { + std::vector buffer(size + 1); + MsiGetPropertyW(msi_handle, name.c_str(), &buffer[0], &size); + return std::wstring(&buffer[0]); + } + else + { + return std::wstring(); + } +} + +void set_property(MSIHANDLE msi_handle, + std::wstring const& name, std::wstring const& value) +{ + MsiSetPropertyW(msi_handle, name.c_str(), value.c_str()); +} + +extern "C" UINT __stdcall DetectNsisOverwrite(MSIHANDLE msi_handle) +{ + std::wstring install_root = get_property(msi_handle, L"INSTALL_ROOT"); + + std::wstring uninstall_exe = install_root + L"\\uninstall.exe"; + + bool uninstall_exe_exists = + GetFileAttributesW(uninstall_exe.c_str()) != INVALID_FILE_ATTRIBUTES; + + set_property(msi_handle, L"CMAKE_NSIS_OVERWRITE_DETECTED", + uninstall_exe_exists ? L"1" : L"0"); + + return ERROR_SUCCESS; +} diff --git a/Utilities/Release/WiX/CustomAction/exports.def b/Utilities/Release/WiX/CustomAction/exports.def new file mode 100644 index 0000000..0e448b2 --- /dev/null +++ b/Utilities/Release/WiX/CustomAction/exports.def @@ -0,0 +1,2 @@ +EXPORTS + DetectNsisOverwrite=DetectNsisOverwrite diff --git a/Utilities/Release/WiX/cmake_nsis_overwrite_dialog.wxs b/Utilities/Release/WiX/cmake_nsis_overwrite_dialog.wxs new file mode 100644 index 0000000..8fe60f2 --- /dev/null +++ b/Utilities/Release/WiX/cmake_nsis_overwrite_dialog.wxs @@ -0,0 +1,21 @@ + + + + + + 1 + + + + Uninstall.exe was detected in your chosen installation prefix. + This indicates a conflicting NSIS based installation of CMake. + + Please uninstall your old CMake installation or choose a different + installation directory. + + + + + + + diff --git a/Utilities/Release/WiX/custom_action_dll.wxs.in b/Utilities/Release/WiX/custom_action_dll.wxs.in new file mode 100644 index 0000000..021e63c --- /dev/null +++ b/Utilities/Release/WiX/custom_action_dll.wxs.in @@ -0,0 +1,6 @@ + + + + + diff --git a/Utilities/Release/WiX/install_dir.wxs b/Utilities/Release/WiX/install_dir.wxs index 883efba..49b74e3 100644 --- a/Utilities/Release/WiX/install_dir.wxs +++ b/Utilities/Release/WiX/install_dir.wxs @@ -9,6 +9,9 @@ + + + @@ -36,7 +39,11 @@ 1 NOT WIXUI_DONTVALIDATEPATH "1"]]> - WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1" + + 1 + CMAKE_NSIS_OVERWRITE_DETECTED="1" + + 1]]> 1 1 @@ -57,5 +64,9 @@ + + + + ----------------------------------------------------------------------- Summary of changes: CMakeCPack.cmake | 11 +++++ CMakeCPackOptions.cmake.in | 28 ++++++++++-- Utilities/CMakeLists.txt | 4 ++ Utilities/Release/WiX/CMakeLists.txt | 12 ++++++ Utilities/Release/WiX/CustomAction/CMakeLists.txt | 13 ++++++ .../WiX/CustomAction/detect_nsis_overwrite.cpp | 45 ++++++++++++++++++++ Utilities/Release/WiX/CustomAction/exports.def | 2 + .../Release/WiX/cmake_nsis_overwrite_dialog.wxs | 21 +++++++++ Utilities/Release/WiX/custom_action_dll.wxs.in | 6 +++ Utilities/Release/WiX/install_dir.wxs | 13 +++++- 10 files changed, 151 insertions(+), 4 deletions(-) create mode 100644 Utilities/Release/WiX/CMakeLists.txt create mode 100644 Utilities/Release/WiX/CustomAction/CMakeLists.txt create mode 100644 Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp create mode 100644 Utilities/Release/WiX/CustomAction/exports.def create mode 100644 Utilities/Release/WiX/cmake_nsis_overwrite_dialog.wxs create mode 100644 Utilities/Release/WiX/custom_action_dll.wxs.in hooks/post-receive -- CMake From brad.king at kitware.com Tue Feb 9 13:25:31 2016 From: brad.king at kitware.com (Brad King) Date: Tue, 9 Feb 2016 13:25:31 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-99-g57d546c Message-ID: <20160209182531.A38F9E4DE7@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, next has been updated via 57d546cf95daa5b5187d47697b9476feca4a146d (commit) via 1ea55acf8aaa1a59b4453e4aec1fc704d7696321 (commit) from 236133f1fb460880cb87c7ed48f2be81bd197cb2 (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=57d546cf95daa5b5187d47697b9476feca4a146d commit 57d546cf95daa5b5187d47697b9476feca4a146d Merge: 236133f 1ea55ac Author: Brad King AuthorDate: Tue Feb 9 13:25:30 2016 -0500 Commit: CMake Topic Stage CommitDate: Tue Feb 9 13:25:30 2016 -0500 Merge topic 'curl-pre-7.21.5' into next 1ea55acf cmCurl: Fix compilation with system curl versions prior to 7.21.5 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ea55acf8aaa1a59b4453e4aec1fc704d7696321 commit 1ea55acf8aaa1a59b4453e4aec1fc704d7696321 Author: Brad King AuthorDate: Tue Feb 9 13:20:39 2016 -0500 Commit: Brad King CommitDate: Tue Feb 9 13:24:19 2016 -0500 cmCurl: Fix compilation with system curl versions prior to 7.21.5 This version introduced CURLE_NOT_BUILT_IN which we have used since commit v3.4.0-rc1~211^2~4 (cmCurl: Tolerate lack of CURLOPT_CAPATH support, 2015-08-12). For older versions, just define the name to the then-unused error code so that we can compile. diff --git a/Source/cmCurl.cxx b/Source/cmCurl.cxx index ad0c7d3..4f3d890 100644 --- a/Source/cmCurl.cxx +++ b/Source/cmCurl.cxx @@ -12,6 +12,11 @@ #include "cmCurl.h" #include "cmSystemTools.h" +// curl versions before 7.21.5 did not provide this error code +#if defined(LIBCURL_VERSION_NUM) && LIBCURL_VERSION_NUM < 0x071505 +# define CURLE_NOT_BUILT_IN 4 +#endif + #define check_curl_result(result, errstr) \ if (result != CURLE_OK && result != CURLE_NOT_BUILT_IN) \ { \ ----------------------------------------------------------------------- Summary of changes: Source/cmCurl.cxx | 5 +++++ 1 file changed, 5 insertions(+) hooks/post-receive -- CMake From brad.king at kitware.com Tue Feb 9 13:44:12 2016 From: brad.king at kitware.com (Brad King) Date: Tue, 9 Feb 2016 13:44:12 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-101-g8895f11 Message-ID: <20160209184412.C507BE44BF@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, next has been updated via 8895f113237afaa09e8964ad30f45702bfd5cdf3 (commit) via c0a1605bbe5a1af15b88307b3c201de7cb61f40a (commit) from 57d546cf95daa5b5187d47697b9476feca4a146d (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=8895f113237afaa09e8964ad30f45702bfd5cdf3 commit 8895f113237afaa09e8964ad30f45702bfd5cdf3 Merge: 57d546c c0a1605 Author: Brad King AuthorDate: Tue Feb 9 13:44:12 2016 -0500 Commit: CMake Topic Stage CommitDate: Tue Feb 9 13:44:12 2016 -0500 Merge topic 'update-prebuilt-openssl' into next c0a1605b Utilities/Release: Update to openssl-1.0.2f https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c0a1605bbe5a1af15b88307b3c201de7cb61f40a commit c0a1605bbe5a1af15b88307b3c201de7cb61f40a Author: Brad King AuthorDate: Tue Feb 9 13:41:50 2016 -0500 Commit: Brad King CommitDate: Tue Feb 9 13:41:50 2016 -0500 Utilities/Release: Update to openssl-1.0.2f Update the prebuilt binary build configurations for machines where we build our own OpenSSL library to use a newer version. diff --git a/Utilities/Release/linux64_release.cmake b/Utilities/Release/linux64_release.cmake index 81442e7..4787d69 100644 --- a/Utilities/Release/linux64_release.cmake +++ b/Utilities/Release/linux64_release.cmake @@ -12,9 +12,9 @@ CURSES_LIBRARY:FILEPATH=/home/kitware/ncurses-5.9/lib/libncurses.a CURSES_INCLUDE_PATH:PATH=/home/kitware/ncurses-5.9/include FORM_LIBRARY:FILEPATH=/home/kitware/ncurses-5.9/lib/libform.a CMAKE_USE_OPENSSL:BOOL=ON -OPENSSL_CRYPTO_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.2d/lib/libcrypto.a -OPENSSL_INCLUDE_DIR:PATH=/home/kitware/openssl-1.0.2d/include -OPENSSL_SSL_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.2d/lib/libssl.a +OPENSSL_CRYPTO_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.2f/lib/libcrypto.a +OPENSSL_INCLUDE_DIR:PATH=/home/kitware/openssl-1.0.2f/include +OPENSSL_SSL_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.2f/lib/libssl.a CPACK_SYSTEM_NAME:STRING=Linux-x86_64 BUILD_QtDialog:BOOL:=TRUE CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:BOOL=TRUE diff --git a/Utilities/Release/magrathea_release.cmake b/Utilities/Release/magrathea_release.cmake index 0634dda..00abcc1 100644 --- a/Utilities/Release/magrathea_release.cmake +++ b/Utilities/Release/magrathea_release.cmake @@ -12,9 +12,9 @@ CURSES_LIBRARY:FILEPATH=/usr/i686-gcc-332s/lib/libncurses.a CURSES_INCLUDE_PATH:PATH=/usr/i686-gcc-332s/include/ncurses FORM_LIBRARY:FILEPATH=/usr/i686-gcc-332s/lib/libform.a CMAKE_USE_OPENSSL:BOOL=ON -OPENSSL_CRYPTO_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.2d/lib/libcrypto.a -OPENSSL_INCLUDE_DIR:PATH=/home/kitware/openssl-1.0.2d/include -OPENSSL_SSL_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.2d/lib/libssl.a +OPENSSL_CRYPTO_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.2f/lib/libcrypto.a +OPENSSL_INCLUDE_DIR:PATH=/home/kitware/openssl-1.0.2f/include +OPENSSL_SSL_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.2f/lib/libssl.a CPACK_SYSTEM_NAME:STRING=Linux-i386 BUILD_QtDialog:BOOL:=TRUE CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:BOOL=TRUE ----------------------------------------------------------------------- Summary of changes: Utilities/Release/linux64_release.cmake | 6 +++--- Utilities/Release/magrathea_release.cmake | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) hooks/post-receive -- CMake From kwrobot at kitware.com Wed Feb 10 00:01:07 2016 From: kwrobot at kitware.com (Kitware Robot) Date: Wed, 10 Feb 2016 00:01:07 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc1-58-g0def7e6 Message-ID: <20160210050107.D14E0E4FC2@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 0def7e6e70d809958cb605e93dbe3d02baf05265 (commit) from dfa01fd005502cf8d80d007bb42d21e2817d4d73 (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=0def7e6e70d809958cb605e93dbe3d02baf05265 commit 0def7e6e70d809958cb605e93dbe3d02baf05265 Author: Kitware Robot AuthorDate: Wed Feb 10 00:01:05 2016 -0500 Commit: Kitware Robot CommitDate: Wed Feb 10 00:01:05 2016 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 5517ba9..b8bdc48 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 5) -set(CMake_VERSION_PATCH 20160209) +set(CMake_VERSION_PATCH 20160210) #set(CMake_VERSION_RC 1) ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 10 08:49:32 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 10 Feb 2016 08:49:32 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc1-60-g7540deb Message-ID: <20160210134932.8DA38E4AD6@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 7540deb185a40ddfbac759f8027df74c2a8569c3 (commit) via 1ea55acf8aaa1a59b4453e4aec1fc704d7696321 (commit) from 0def7e6e70d809958cb605e93dbe3d02baf05265 (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=7540deb185a40ddfbac759f8027df74c2a8569c3 commit 7540deb185a40ddfbac759f8027df74c2a8569c3 Merge: 0def7e6 1ea55ac Author: Brad King AuthorDate: Wed Feb 10 08:49:30 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 10 08:49:30 2016 -0500 Merge topic 'curl-pre-7.21.5' 1ea55acf cmCurl: Fix compilation with system curl versions prior to 7.21.5 ----------------------------------------------------------------------- Summary of changes: Source/cmCurl.cxx | 5 +++++ 1 file changed, 5 insertions(+) hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 10 08:49:35 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 10 Feb 2016 08:49:35 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc1-62-g6bd277d Message-ID: <20160210134935.6114BE4B07@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 6bd277d2c15201962c2774d71f326a6918f56231 (commit) via a12b0f1b193024b71583b9150aeead33d364d189 (commit) from 7540deb185a40ddfbac759f8027df74c2a8569c3 (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=6bd277d2c15201962c2774d71f326a6918f56231 commit 6bd277d2c15201962c2774d71f326a6918f56231 Merge: 7540deb a12b0f1 Author: Brad King AuthorDate: Wed Feb 10 08:49:33 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 10 08:49:33 2016 -0500 Merge topic 'wix-prevent-nsis-overwrite' a12b0f1b CMake: Prevent WiX installations over existing NSIS installations ----------------------------------------------------------------------- Summary of changes: CMakeCPack.cmake | 11 +++++ CMakeCPackOptions.cmake.in | 28 ++++++++++-- Utilities/CMakeLists.txt | 4 ++ Utilities/Release/WiX/CMakeLists.txt | 12 ++++++ Utilities/Release/WiX/CustomAction/CMakeLists.txt | 13 ++++++ .../WiX/CustomAction/detect_nsis_overwrite.cpp | 45 ++++++++++++++++++++ Utilities/Release/WiX/CustomAction/exports.def | 2 + .../Release/WiX/cmake_nsis_overwrite_dialog.wxs | 21 +++++++++ Utilities/Release/WiX/custom_action_dll.wxs.in | 6 +++ Utilities/Release/WiX/install_dir.wxs | 13 +++++- 10 files changed, 151 insertions(+), 4 deletions(-) create mode 100644 Utilities/Release/WiX/CMakeLists.txt create mode 100644 Utilities/Release/WiX/CustomAction/CMakeLists.txt create mode 100644 Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp create mode 100644 Utilities/Release/WiX/CustomAction/exports.def create mode 100644 Utilities/Release/WiX/cmake_nsis_overwrite_dialog.wxs create mode 100644 Utilities/Release/WiX/custom_action_dll.wxs.in hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 10 08:49:37 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 10 Feb 2016 08:49:37 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc1-64-gfb65890 Message-ID: <20160210134937.8904BE4B35@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 fb658907d8bb3a44f0a834eede6272ae82a8cb54 (commit) via c0a1605bbe5a1af15b88307b3c201de7cb61f40a (commit) from 6bd277d2c15201962c2774d71f326a6918f56231 (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=fb658907d8bb3a44f0a834eede6272ae82a8cb54 commit fb658907d8bb3a44f0a834eede6272ae82a8cb54 Merge: 6bd277d c0a1605 Author: Brad King AuthorDate: Wed Feb 10 08:49:36 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 10 08:49:36 2016 -0500 Merge topic 'update-prebuilt-openssl' c0a1605b Utilities/Release: Update to openssl-1.0.2f ----------------------------------------------------------------------- Summary of changes: Utilities/Release/linux64_release.cmake | 6 +++--- Utilities/Release/magrathea_release.cmake | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 10 08:49:56 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 10 Feb 2016 08:49:56 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-106-g5347a50 Message-ID: <20160210134956.0A65CE4A77@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, next has been updated via 5347a50695cbee332db7dc39f241bcdf911ffe82 (commit) via fb658907d8bb3a44f0a834eede6272ae82a8cb54 (commit) via 6bd277d2c15201962c2774d71f326a6918f56231 (commit) via 7540deb185a40ddfbac759f8027df74c2a8569c3 (commit) via 0def7e6e70d809958cb605e93dbe3d02baf05265 (commit) from 8895f113237afaa09e8964ad30f45702bfd5cdf3 (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=5347a50695cbee332db7dc39f241bcdf911ffe82 commit 5347a50695cbee332db7dc39f241bcdf911ffe82 Merge: 8895f11 fb65890 Author: Brad King AuthorDate: Wed Feb 10 08:49:44 2016 -0500 Commit: Brad King CommitDate: Wed Feb 10 08:49:44 2016 -0500 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 10 09:23:00 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 10 Feb 2016 09:23:00 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc1-68-g4f593ab Message-ID: <20160210142300.C517EE4C84@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 4f593abe7270d43ba5a9c882067ae34328fdf30b (commit) via b162dd9ea0c7c08b4b5c0afcb107ebf870064ee2 (commit) via 5b06896ba85f20d621b052c75930e671fc3c37fa (commit) via 0570b4e4ea8159e701961fa479a74003ca458660 (commit) from fb658907d8bb3a44f0a834eede6272ae82a8cb54 (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: hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 10 09:23:00 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 10 Feb 2016 09:23:00 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-111-g092fc70 Message-ID: <20160210142300.D7930E4C88@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, next has been updated via 092fc70bfc345a6eaf8b2bef94298e6db319361b (commit) via 4f593abe7270d43ba5a9c882067ae34328fdf30b (commit) via b162dd9ea0c7c08b4b5c0afcb107ebf870064ee2 (commit) via 5b06896ba85f20d621b052c75930e671fc3c37fa (commit) via 0570b4e4ea8159e701961fa479a74003ca458660 (commit) from 5347a50695cbee332db7dc39f241bcdf911ffe82 (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=092fc70bfc345a6eaf8b2bef94298e6db319361b commit 092fc70bfc345a6eaf8b2bef94298e6db319361b Merge: 5347a50 4f593ab Author: Brad King AuthorDate: Wed Feb 10 09:22:50 2016 -0500 Commit: Brad King CommitDate: Wed Feb 10 09:22:50 2016 -0500 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 10 09:23:01 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 10 Feb 2016 09:23:01 -0500 (EST) Subject: [Cmake-commits] CMake branch, release, updated. v3.5.0-rc1-22-gb162dd9 Message-ID: <20160210142301.701E0E4C8A@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 b162dd9ea0c7c08b4b5c0afcb107ebf870064ee2 (commit) via 1ea55acf8aaa1a59b4453e4aec1fc704d7696321 (commit) via 5b06896ba85f20d621b052c75930e671fc3c37fa (commit) via a12b0f1b193024b71583b9150aeead33d364d189 (commit) via 0570b4e4ea8159e701961fa479a74003ca458660 (commit) via 9b7d5871b86036da009119e14f54d161f2d44f24 (commit) via 6cbf6a51976c9092f84ef4a90d35fb6fd60f5898 (commit) from 656bf0da2c0b9a2fa6e79970df968d5e9c4e4e1a (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: CMakeCPack.cmake | 11 +++ CMakeCPackOptions.cmake.in | 28 ++++++- Source/cmCurl.cxx | 5 ++ Source/cmGlobalGenerator.cxx | 81 +++++--------------- Source/cmGlobalGenerator.h | 24 +++++- Source/cmLocalGenerator.cxx | 2 + Source/cmMakefile.cxx | 2 + Utilities/CMakeLists.txt | 4 + Utilities/Release/WiX/CMakeLists.txt | 12 +++ Utilities/Release/WiX/CustomAction/CMakeLists.txt | 13 ++++ .../WiX/CustomAction/detect_nsis_overwrite.cpp | 45 +++++++++++ Utilities/Release/WiX/CustomAction/exports.def | 2 + .../Release/WiX/cmake_nsis_overwrite_dialog.wxs | 21 +++++ Utilities/Release/WiX/custom_action_dll.wxs.in | 6 ++ Utilities/Release/WiX/install_dir.wxs | 13 +++- 15 files changed, 203 insertions(+), 66 deletions(-) create mode 100644 Utilities/Release/WiX/CMakeLists.txt create mode 100644 Utilities/Release/WiX/CustomAction/CMakeLists.txt create mode 100644 Utilities/Release/WiX/CustomAction/detect_nsis_overwrite.cpp create mode 100644 Utilities/Release/WiX/CustomAction/exports.def create mode 100644 Utilities/Release/WiX/cmake_nsis_overwrite_dialog.wxs create mode 100644 Utilities/Release/WiX/custom_action_dll.wxs.in hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 10 09:24:49 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 10 Feb 2016 09:24:49 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-114-g77582d1 Message-ID: <20160210142449.5D5E0E4ABD@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, next has been updated via 77582d137e5bc84b4969f0870a3bf8f17fb071c9 (commit) via 3572c3bd084f396f5f55f984ceabd1ffe7df8dce (commit) via 8d1b37a2b207956c05e017645de3681a077d0a5b (commit) from 092fc70bfc345a6eaf8b2bef94298e6db319361b (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=77582d137e5bc84b4969f0870a3bf8f17fb071c9 commit 77582d137e5bc84b4969f0870a3bf8f17fb071c9 Merge: 092fc70 3572c3b Author: Brad King AuthorDate: Wed Feb 10 09:24:48 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 10 09:24:48 2016 -0500 Merge topic 'test-release' into next 3572c3bd Merge branch 'release' into test-release 8d1b37a2 CMake 3.5.0-rc2 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3572c3bd084f396f5f55f984ceabd1ffe7df8dce commit 3572c3bd084f396f5f55f984ceabd1ffe7df8dce Merge: 4f593ab 8d1b37a Author: Brad King AuthorDate: Wed Feb 10 09:24:28 2016 -0500 Commit: Brad King CommitDate: Wed Feb 10 09:24:28 2016 -0500 Merge branch 'release' into test-release https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d1b37a2b207956c05e017645de3681a077d0a5b commit 8d1b37a2b207956c05e017645de3681a077d0a5b Author: Brad King AuthorDate: Wed Feb 10 09:23:57 2016 -0500 Commit: Brad King CommitDate: Wed Feb 10 09:23:57 2016 -0500 CMake 3.5.0-rc2 diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index e4f44b7..58eb1fc 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -2,4 +2,4 @@ set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 5) set(CMake_VERSION_PATCH 0) -set(CMake_VERSION_RC 1) +set(CMake_VERSION_RC 2) ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake From zack.galbreath at kitware.com Wed Feb 10 10:13:05 2016 From: zack.galbreath at kitware.com (Zack Galbreath) Date: Wed, 10 Feb 2016 10:13:05 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-116-ga629eb2 Message-ID: <20160210151305.3BF4EE3B71@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, next has been updated via a629eb2813e0c05d32079431389d80aadecb0818 (commit) via 062045b8b6887cd8a59c384dfca23b83747568b5 (commit) from 77582d137e5bc84b4969f0870a3bf8f17fb071c9 (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=a629eb2813e0c05d32079431389d80aadecb0818 commit a629eb2813e0c05d32079431389d80aadecb0818 Merge: 77582d1 062045b Author: Zack Galbreath AuthorDate: Wed Feb 10 10:13:04 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 10 10:13:04 2016 -0500 Merge topic 'cross_subproject_coverage' into next 062045b8 More options for CTestCoverageCollectGCOV https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=062045b8b6887cd8a59c384dfca23b83747568b5 commit 062045b8b6887cd8a59c384dfca23b83747568b5 Author: Zack Galbreath AuthorDate: Wed Feb 10 10:02:02 2016 -0500 Commit: Zack Galbreath CommitDate: Wed Feb 10 10:12:01 2016 -0500 More options for CTestCoverageCollectGCOV This commit introduces two new options to CTestCoverageCollectGCOV. When GLOB is set we recursively search in the source & binary directories for .gcda files. Otherwise the default behavior is to parse TargetDirectories.txt for a list of locations to search. When DELETE is set we remove any .gcda file found after it has been used to generate the corresponding .gcov file. The .gcov file is also removed after the result tarball has been created. Together these two new features help support the use case of computing coverage across subprojects. diff --git a/Modules/CTestCoverageCollectGCOV.cmake b/Modules/CTestCoverageCollectGCOV.cmake index ef3aa76..f31e432 100644 --- a/Modules/CTestCoverageCollectGCOV.cmake +++ b/Modules/CTestCoverageCollectGCOV.cmake @@ -46,6 +46,13 @@ # is run as ``gcov ... -o .gcda``. # If not specified, the default option is just ``-b``. # +# ``GLOB`` +# Recursively search for .gcda files in build_dir rather than +# determining search locations by reading TargetDirectories.txt. +# +# ``DELETE`` +# Delete coverage files after they've been packaged into the .tar. +# # ``QUIET`` # Suppress non-error messages that otherwise would have been # printed out by this function. @@ -64,7 +71,7 @@ # License text for the above reference.) include(CMakeParseArguments) function(ctest_coverage_collect_gcov) - set(options QUIET) + set(options QUIET GLOB DELETE) set(oneValueArgs TARBALL SOURCE BUILD GCOV_COMMAND) set(multiValueArgs GCOV_OPTIONS) cmake_parse_arguments(GCOV "${options}" "${oneValueArgs}" @@ -91,22 +98,32 @@ function(ctest_coverage_collect_gcov) # run gcov on each gcda file in the binary tree set(gcda_files) set(label_files) - # look for gcda files in the target directories - # could do a glob from the top of the binary tree but - # this will be faster and only look where the files will be - file(STRINGS "${binary_dir}/CMakeFiles/TargetDirectories.txt" target_dirs - ENCODING UTF-8) - foreach(target_dir ${target_dirs}) - file(GLOB_RECURSE gfiles RELATIVE ${binary_dir} "${target_dir}/*.gcda") - list(LENGTH gfiles len) - # if we have gcda files then also grab the labels file for that target - if(${len} GREATER 0) - file(GLOB_RECURSE lfiles RELATIVE ${binary_dir} - "${target_dir}/Labels.json") - list(APPEND gcda_files ${gfiles}) - list(APPEND label_files ${lfiles}) - endif() - endforeach() + if (GCOV_GLOB) + file(GLOB_RECURSE gfiles RELATIVE ${binary_dir} "*.gcda") + list(LENGTH gfiles len) + # if we have gcda files then also grab the labels file for that target + if(${len} GREATER 0) + file(GLOB_RECURSE lfiles RELATIVE ${binary_dir} "Labels.json") + list(APPEND gcda_files ${gfiles}) + list(APPEND label_files ${lfiles}) + endif() + else() + # look for gcda files in the target directories + # this will be faster and only look where the files will be + file(STRINGS "${binary_dir}/CMakeFiles/TargetDirectories.txt" target_dirs + ENCODING UTF-8) + foreach(target_dir ${target_dirs}) + file(GLOB_RECURSE gfiles RELATIVE ${binary_dir} "${target_dir}/*.gcda") + list(LENGTH gfiles len) + # if we have gcda files then also grab the labels file for that target + if(${len} GREATER 0) + file(GLOB_RECURSE lfiles RELATIVE ${binary_dir} + "${target_dir}/Labels.json") + list(APPEND gcda_files ${gfiles}) + list(APPEND label_files ${lfiles}) + endif() + endforeach() + endif() # return early if no coverage files were found list(LENGTH gcda_files len) if(len EQUAL 0) @@ -134,6 +151,11 @@ function(ctest_coverage_collect_gcov) OUTPUT_VARIABLE out RESULT_VARIABLE res WORKING_DIRECTORY ${coverage_dir}) + + if (GCOV_DELETE) + file(REMOVE ${gcda_file}) + endif() + endforeach() if(NOT "${res}" EQUAL 0) if (NOT GCOV_QUIET) @@ -201,4 +223,12 @@ ${label_files} "--format=gnutar" --files-from=${coverage_dir}/coverage_file_list.txt WORKING_DIRECTORY ${binary_dir}) + + if (GCOV_DELETE) + string(REPLACE "\n" ";" gcov_files "${gcov_files}") + foreach(gcov_file ${gcov_files}) + file(REMOVE ${binary_dir}/${gcov_file}) + endforeach() + endif() + endfunction() ----------------------------------------------------------------------- Summary of changes: Modules/CTestCoverageCollectGCOV.cmake | 64 +++++++++++++++++++++++--------- 1 file changed, 47 insertions(+), 17 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 10 10:42:28 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 10 Feb 2016 10:42:28 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-120-gddc1801 Message-ID: <20160210154228.1EAC6E37AB@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, next has been updated via ddc180100229fd76d25a97f4310ca97ff738b2cb (commit) via 4f3f75a2461af79bf1eb01b61a06d396d89521c5 (commit) via 47f24cbccaaeb125a8b7ead420340d2bf8bf89ef (commit) via 9d1f40ccc1e45b918498800029034f3bebafb031 (commit) from a629eb2813e0c05d32079431389d80aadecb0818 (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=ddc180100229fd76d25a97f4310ca97ff738b2cb commit ddc180100229fd76d25a97f4310ca97ff738b2cb Merge: a629eb2 4f3f75a Author: Brad King AuthorDate: Wed Feb 10 10:42:27 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 10 10:42:27 2016 -0500 Merge topic 'doc-FortranCInterface-variables' into next 4f3f75a2 FortranCInterface: Document mangling result variables publicly 47f24cbc FortranCInterface: Improve documentation formatting and organization 9d1f40cc FortranCInterface: Convert docs to a bracket comment https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4f3f75a2461af79bf1eb01b61a06d396d89521c5 commit 4f3f75a2461af79bf1eb01b61a06d396d89521c5 Author: Brad King AuthorDate: Wed Feb 10 10:35:48 2016 -0500 Commit: Brad King CommitDate: Wed Feb 10 10:35:48 2016 -0500 FortranCInterface: Document mangling result variables publicly Some projects may want to use the detailed mangling information directly instead of using the FortranCInterface_HEADER function. We already provide variables encoding the mangling information, so just document them as available. diff --git a/Modules/FortranCInterface.cmake b/Modules/FortranCInterface.cmake index c872d6d..c12dd4c 100644 --- a/Modules/FortranCInterface.cmake +++ b/Modules/FortranCInterface.cmake @@ -18,6 +18,58 @@ Variables that indicate if the mangling is found: ``FortranCInterface_MODULE_FOUND`` Module subroutines and functions (declared by "MODULE PROCEDURE"). +This module also provides the following variables to specify +the detected mangling, though a typical use case does not need +to reference them and can use the `Module Functions`_ below. + +``FortranCInterface_GLOBAL_PREFIX`` + Prefix for a global symbol without an underscore. + +``FortranCInterface_GLOBAL_SUFFIX`` + Suffix for a global symbol without an underscore. + +``FortranCInterface_GLOBAL_CASE`` + The case for a global symbol without an underscore, + either ``UPPER`` or ``LOWER``. + +``FortranCInterface_GLOBAL__PREFIX`` + Prefix for a global symbol with an underscore. + +``FortranCInterface_GLOBAL__SUFFIX`` + Suffix for a global symbol with an underscore. + +``FortranCInterface_GLOBAL__CASE`` + The case for a global symbol with an underscore, + either ``UPPER`` or ``LOWER``. + +``FortranCInterface_MODULE_PREFIX`` + Prefix for a module symbol without an underscore. + +``FortranCInterface_MODULE_MIDDLE`` + Middle of a module symbol without an underscore that appears + between the name of the module and the name of the symbol. + +``FortranCInterface_MODULE_SUFFIX`` + Suffix for a module symbol without an underscore. + +``FortranCInterface_MODULE_CASE`` + The case for a module symbol without an underscore, + either ``UPPER`` or ``LOWER``. + +``FortranCInterface_MODULE__PREFIX`` + Prefix for a module symbol with an underscore. + +``FortranCInterface_MODULE__MIDDLE`` + Middle of a module symbol with an underscore that appears + between the name of the module and the name of the symbol. + +``FortranCInterface_MODULE__SUFFIX`` + Suffix for a module symbol with an underscore. + +``FortranCInterface_MODULE__CASE`` + The case for a module symbol with an underscore, + either ``UPPER`` or ``LOWER``. + Module Functions ^^^^^^^^^^^^^^^^ https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=47f24cbccaaeb125a8b7ead420340d2bf8bf89ef commit 47f24cbccaaeb125a8b7ead420340d2bf8bf89ef Author: Brad King AuthorDate: Tue Feb 9 16:43:27 2016 -0500 Commit: Brad King CommitDate: Wed Feb 10 10:33:25 2016 -0500 FortranCInterface: Improve documentation formatting and organization Organize content into sections. Define functions via explicit markup blocks so we can cross-reference them. diff --git a/Modules/FortranCInterface.cmake b/Modules/FortranCInterface.cmake index 881e8b1..c872d6d 100644 --- a/Modules/FortranCInterface.cmake +++ b/Modules/FortranCInterface.cmake @@ -5,73 +5,96 @@ FortranCInterface Fortran/C Interface Detection This module automatically detects the API by which C and Fortran -languages interact. Variables indicate if the mangling is found: +languages interact. -:: +Module Variables +^^^^^^^^^^^^^^^^ - FortranCInterface_GLOBAL_FOUND = Global subroutines and functions - FortranCInterface_MODULE_FOUND = Module subroutines and functions - (declared by "MODULE PROCEDURE") +Variables that indicate if the mangling is found: -A function is provided to generate a C header file containing macros -to mangle symbol names: +``FortranCInterface_GLOBAL_FOUND`` + Global subroutines and functions. -:: +``FortranCInterface_MODULE_FOUND`` + Module subroutines and functions (declared by "MODULE PROCEDURE"). - FortranCInterface_HEADER( - [MACRO_NAMESPACE ] - [SYMBOL_NAMESPACE ] - [SYMBOLS [:] ...]) +Module Functions +^^^^^^^^^^^^^^^^ -It generates in definitions of the following macros: +.. command:: FortranCInterface_HEADER -:: + The ``FortranCInterface_HEADER`` function is provided to generate a + C header file containing macros to mangle symbol names:: - #define FortranCInterface_GLOBAL (name,NAME) ... - #define FortranCInterface_GLOBAL_(name,NAME) ... - #define FortranCInterface_MODULE (mod,name, MOD,NAME) ... - #define FortranCInterface_MODULE_(mod,name, MOD,NAME) ... + FortranCInterface_HEADER( + [MACRO_NAMESPACE ] + [SYMBOL_NAMESPACE ] + [SYMBOLS [:] ...]) -These macros mangle four categories of Fortran symbols, respectively: + It generates in ```` definitions of the following macros:: -:: + #define FortranCInterface_GLOBAL (name,NAME) ... + #define FortranCInterface_GLOBAL_(name,NAME) ... + #define FortranCInterface_MODULE (mod,name, MOD,NAME) ... + #define FortranCInterface_MODULE_(mod,name, MOD,NAME) ... - - Global symbols without '_': call mysub() - - Global symbols with '_' : call my_sub() - - Module symbols without '_': use mymod; call mysub() - - Module symbols with '_' : use mymod; call my_sub() + These macros mangle four categories of Fortran symbols, respectively: -If mangling for a category is not known, its macro is left undefined. -All macros require raw names in both lower case and upper case. The -MACRO_NAMESPACE option replaces the default "FortranCInterface_" -prefix with a given namespace "". + * Global symbols without '_': ``call mysub()`` + * Global symbols with '_' : ``call my_sub()`` + * Module symbols without '_': ``use mymod; call mysub()`` + * Module symbols with '_' : ``use mymod; call my_sub()`` -The SYMBOLS option lists symbols to mangle automatically with C -preprocessor definitions: + If mangling for a category is not known, its macro is left undefined. + All macros require raw names in both lower case and upper case. -:: + The options are: - ==> #define ... - : ==> #define _ ... + ``MACRO_NAMESPACE`` + Replace the default ``FortranCInterface_`` prefix with a given + namespace ````. -If the mangling for some symbol is not known then no preprocessor -definition is created, and a warning is displayed. The -SYMBOL_NAMESPACE option prefixes all preprocessor definitions -generated by the SYMBOLS option with a given namespace "". + ``SYMBOLS`` + List symbols to mangle automatically with C preprocessor definitions:: -Example usage: + ==> #define ... + : ==> #define _ ... -:: + If the mangling for some symbol is not known then no preprocessor + definition is created, and a warning is displayed. + + ``SYMBOL_NAMESPACE`` + Prefix all preprocessor definitions generated by the ``SYMBOLS`` + option with a given namespace ````. + +.. command:: FortranCInterface_VERIFY + + The ``FortranCInterface_VERIFY`` function is provided to verify + that the Fortran and C/C++ compilers work together:: + + FortranCInterface_VERIFY([CXX] [QUIET]) + + It tests whether a simple test executable using Fortran and C (and C++ + when the CXX option is given) compiles and links successfully. The + result is stored in the cache entry ``FortranCInterface_VERIFIED_C`` + (or ``FortranCInterface_VERIFIED_CXX`` if ``CXX`` is given) as a boolean. + If the check fails and ``QUIET`` is not given the function terminates with a + fatal error message describing the problem. The purpose of this check + is to stop a build early for incompatible compiler combinations. The + test is built in the ``Release`` configuration. + +Example Usage +^^^^^^^^^^^^^ + +.. code-block:: cmake include(FortranCInterface) FortranCInterface_HEADER(FC.h MACRO_NAMESPACE "FC_") -This creates a "FC.h" header that defines mangling macros FC_GLOBAL(), -FC_GLOBAL_(), FC_MODULE(), and FC_MODULE_(). - -Example usage: +This creates a "FC.h" header that defines mangling macros ``FC_GLOBAL()``, +``FC_GLOBAL_()``, ``FC_MODULE()``, and ``FC_MODULE_()``. -:: +.. code-block:: cmake include(FortranCInterface) FortranCInterface_HEADER(FCMangle.h @@ -79,40 +102,25 @@ Example usage: SYMBOL_NAMESPACE "FC_" SYMBOLS mysub mymod:my_sub) -This creates a "FCMangle.h" header that defines the same FC_*() +This creates a "FCMangle.h" header that defines the same ``FC_*()`` mangling macros as the previous example plus preprocessor symbols -FC_mysub and FC_mymod_my_sub. - -Another function is provided to verify that the Fortran and C/C++ -compilers work together: - -:: - - FortranCInterface_VERIFY([CXX] [QUIET]) - -It tests whether a simple test executable using Fortran and C (and C++ -when the CXX option is given) compiles and links successfully. The -result is stored in the cache entry FortranCInterface_VERIFIED_C (or -FortranCInterface_VERIFIED_CXX if CXX is given) as a boolean. If the -check fails and QUIET is not given the function terminates with a -FATAL_ERROR message describing the problem. The purpose of this check -is to stop a build early for incompatible compiler combinations. The -test is built in the Release configuration. +``FC_mysub`` and ``FC_mymod_my_sub``. -FortranCInterface is aware of possible GLOBAL and MODULE manglings for -many Fortran compilers, but it also provides an interface to specify -new possible manglings. Set the variables +Additional Manglings +^^^^^^^^^^^^^^^^^^^^ -:: +FortranCInterface is aware of possible ``GLOBAL`` and ``MODULE`` manglings +for many Fortran compilers, but it also provides an interface to specify +new possible manglings. Set the variables:: FortranCInterface_GLOBAL_SYMBOLS FortranCInterface_MODULE_SYMBOLS before including FortranCInterface to specify manglings of the symbols -"MySub", "My_Sub", "MyModule:MySub", and "My_Module:My_Sub". For -example, the code: +``MySub``, ``My_Sub``, ``MyModule:MySub``, and ``My_Module:My_Sub``. +For example, the code: -:: +.. code-block:: cmake set(FortranCInterface_GLOBAL_SYMBOLS mysub_ my_sub__ MYSUB_) # ^^^^^ ^^^^^^ ^^^^^ @@ -121,7 +129,7 @@ example, the code: # ^^^^^^^^ ^^^^^ ^^^^^^^^^ ^^^^^^ include(FortranCInterface) -tells FortranCInterface to try given GLOBAL and MODULE manglings. +tells FortranCInterface to try given ``GLOBAL`` and ``MODULE`` manglings. (The carets point at raw symbol names for clarity in this example but are not needed.) #]=======================================================================] https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9d1f40ccc1e45b918498800029034f3bebafb031 commit 9d1f40ccc1e45b918498800029034f3bebafb031 Author: Brad King AuthorDate: Tue Feb 9 16:38:20 2016 -0500 Commit: Brad King CommitDate: Wed Feb 10 09:54:36 2016 -0500 FortranCInterface: Convert docs to a bracket comment Use a bracket comment to hold the documentation instead of a block of line comments. This will make further updates easier. diff --git a/Modules/FortranCInterface.cmake b/Modules/FortranCInterface.cmake index 70c3fd7..881e8b1 100644 --- a/Modules/FortranCInterface.cmake +++ b/Modules/FortranCInterface.cmake @@ -1,129 +1,130 @@ -#.rst: -# FortranCInterface -# ----------------- -# -# Fortran/C Interface Detection -# -# This module automatically detects the API by which C and Fortran -# languages interact. Variables indicate if the mangling is found: -# -# :: -# -# FortranCInterface_GLOBAL_FOUND = Global subroutines and functions -# FortranCInterface_MODULE_FOUND = Module subroutines and functions -# (declared by "MODULE PROCEDURE") -# -# A function is provided to generate a C header file containing macros -# to mangle symbol names: -# -# :: -# -# FortranCInterface_HEADER( -# [MACRO_NAMESPACE ] -# [SYMBOL_NAMESPACE ] -# [SYMBOLS [:] ...]) -# -# It generates in definitions of the following macros: -# -# :: -# -# #define FortranCInterface_GLOBAL (name,NAME) ... -# #define FortranCInterface_GLOBAL_(name,NAME) ... -# #define FortranCInterface_MODULE (mod,name, MOD,NAME) ... -# #define FortranCInterface_MODULE_(mod,name, MOD,NAME) ... -# -# These macros mangle four categories of Fortran symbols, respectively: -# -# :: -# -# - Global symbols without '_': call mysub() -# - Global symbols with '_' : call my_sub() -# - Module symbols without '_': use mymod; call mysub() -# - Module symbols with '_' : use mymod; call my_sub() -# -# If mangling for a category is not known, its macro is left undefined. -# All macros require raw names in both lower case and upper case. The -# MACRO_NAMESPACE option replaces the default "FortranCInterface_" -# prefix with a given namespace "". -# -# The SYMBOLS option lists symbols to mangle automatically with C -# preprocessor definitions: -# -# :: -# -# ==> #define ... -# : ==> #define _ ... -# -# If the mangling for some symbol is not known then no preprocessor -# definition is created, and a warning is displayed. The -# SYMBOL_NAMESPACE option prefixes all preprocessor definitions -# generated by the SYMBOLS option with a given namespace "". -# -# Example usage: -# -# :: -# -# include(FortranCInterface) -# FortranCInterface_HEADER(FC.h MACRO_NAMESPACE "FC_") -# -# This creates a "FC.h" header that defines mangling macros FC_GLOBAL(), -# FC_GLOBAL_(), FC_MODULE(), and FC_MODULE_(). -# -# Example usage: -# -# :: -# -# include(FortranCInterface) -# FortranCInterface_HEADER(FCMangle.h -# MACRO_NAMESPACE "FC_" -# SYMBOL_NAMESPACE "FC_" -# SYMBOLS mysub mymod:my_sub) -# -# This creates a "FCMangle.h" header that defines the same FC_*() -# mangling macros as the previous example plus preprocessor symbols -# FC_mysub and FC_mymod_my_sub. -# -# Another function is provided to verify that the Fortran and C/C++ -# compilers work together: -# -# :: -# -# FortranCInterface_VERIFY([CXX] [QUIET]) -# -# It tests whether a simple test executable using Fortran and C (and C++ -# when the CXX option is given) compiles and links successfully. The -# result is stored in the cache entry FortranCInterface_VERIFIED_C (or -# FortranCInterface_VERIFIED_CXX if CXX is given) as a boolean. If the -# check fails and QUIET is not given the function terminates with a -# FATAL_ERROR message describing the problem. The purpose of this check -# is to stop a build early for incompatible compiler combinations. The -# test is built in the Release configuration. -# -# FortranCInterface is aware of possible GLOBAL and MODULE manglings for -# many Fortran compilers, but it also provides an interface to specify -# new possible manglings. Set the variables -# -# :: -# -# FortranCInterface_GLOBAL_SYMBOLS -# FortranCInterface_MODULE_SYMBOLS -# -# before including FortranCInterface to specify manglings of the symbols -# "MySub", "My_Sub", "MyModule:MySub", and "My_Module:My_Sub". For -# example, the code: -# -# :: -# -# set(FortranCInterface_GLOBAL_SYMBOLS mysub_ my_sub__ MYSUB_) -# # ^^^^^ ^^^^^^ ^^^^^ -# set(FortranCInterface_MODULE_SYMBOLS -# __mymodule_MOD_mysub __my_module_MOD_my_sub) -# # ^^^^^^^^ ^^^^^ ^^^^^^^^^ ^^^^^^ -# include(FortranCInterface) -# -# tells FortranCInterface to try given GLOBAL and MODULE manglings. -# (The carets point at raw symbol names for clarity in this example but -# are not needed.) +#[=======================================================================[.rst: +FortranCInterface +----------------- + +Fortran/C Interface Detection + +This module automatically detects the API by which C and Fortran +languages interact. Variables indicate if the mangling is found: + +:: + + FortranCInterface_GLOBAL_FOUND = Global subroutines and functions + FortranCInterface_MODULE_FOUND = Module subroutines and functions + (declared by "MODULE PROCEDURE") + +A function is provided to generate a C header file containing macros +to mangle symbol names: + +:: + + FortranCInterface_HEADER( + [MACRO_NAMESPACE ] + [SYMBOL_NAMESPACE ] + [SYMBOLS [:] ...]) + +It generates in definitions of the following macros: + +:: + + #define FortranCInterface_GLOBAL (name,NAME) ... + #define FortranCInterface_GLOBAL_(name,NAME) ... + #define FortranCInterface_MODULE (mod,name, MOD,NAME) ... + #define FortranCInterface_MODULE_(mod,name, MOD,NAME) ... + +These macros mangle four categories of Fortran symbols, respectively: + +:: + + - Global symbols without '_': call mysub() + - Global symbols with '_' : call my_sub() + - Module symbols without '_': use mymod; call mysub() + - Module symbols with '_' : use mymod; call my_sub() + +If mangling for a category is not known, its macro is left undefined. +All macros require raw names in both lower case and upper case. The +MACRO_NAMESPACE option replaces the default "FortranCInterface_" +prefix with a given namespace "". + +The SYMBOLS option lists symbols to mangle automatically with C +preprocessor definitions: + +:: + + ==> #define ... + : ==> #define _ ... + +If the mangling for some symbol is not known then no preprocessor +definition is created, and a warning is displayed. The +SYMBOL_NAMESPACE option prefixes all preprocessor definitions +generated by the SYMBOLS option with a given namespace "". + +Example usage: + +:: + + include(FortranCInterface) + FortranCInterface_HEADER(FC.h MACRO_NAMESPACE "FC_") + +This creates a "FC.h" header that defines mangling macros FC_GLOBAL(), +FC_GLOBAL_(), FC_MODULE(), and FC_MODULE_(). + +Example usage: + +:: + + include(FortranCInterface) + FortranCInterface_HEADER(FCMangle.h + MACRO_NAMESPACE "FC_" + SYMBOL_NAMESPACE "FC_" + SYMBOLS mysub mymod:my_sub) + +This creates a "FCMangle.h" header that defines the same FC_*() +mangling macros as the previous example plus preprocessor symbols +FC_mysub and FC_mymod_my_sub. + +Another function is provided to verify that the Fortran and C/C++ +compilers work together: + +:: + + FortranCInterface_VERIFY([CXX] [QUIET]) + +It tests whether a simple test executable using Fortran and C (and C++ +when the CXX option is given) compiles and links successfully. The +result is stored in the cache entry FortranCInterface_VERIFIED_C (or +FortranCInterface_VERIFIED_CXX if CXX is given) as a boolean. If the +check fails and QUIET is not given the function terminates with a +FATAL_ERROR message describing the problem. The purpose of this check +is to stop a build early for incompatible compiler combinations. The +test is built in the Release configuration. + +FortranCInterface is aware of possible GLOBAL and MODULE manglings for +many Fortran compilers, but it also provides an interface to specify +new possible manglings. Set the variables + +:: + + FortranCInterface_GLOBAL_SYMBOLS + FortranCInterface_MODULE_SYMBOLS + +before including FortranCInterface to specify manglings of the symbols +"MySub", "My_Sub", "MyModule:MySub", and "My_Module:My_Sub". For +example, the code: + +:: + + set(FortranCInterface_GLOBAL_SYMBOLS mysub_ my_sub__ MYSUB_) + # ^^^^^ ^^^^^^ ^^^^^ + set(FortranCInterface_MODULE_SYMBOLS + __mymodule_MOD_mysub __my_module_MOD_my_sub) + # ^^^^^^^^ ^^^^^ ^^^^^^^^^ ^^^^^^ + include(FortranCInterface) + +tells FortranCInterface to try given GLOBAL and MODULE manglings. +(The carets point at raw symbol names for clarity in this example but +are not needed.) +#]=======================================================================] #============================================================================= # Copyright 2008-2009 Kitware, Inc. ----------------------------------------------------------------------- Summary of changes: Modules/FortranCInterface.cmake | 313 +++++++++++++++++++++++---------------- 1 file changed, 187 insertions(+), 126 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 10 14:12:36 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 10 Feb 2016 14:12:36 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-122-geb10155 Message-ID: <20160210191236.DF01DE3E01@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, next has been updated via eb101557671a0dd39864ac3e1fee586bb749cdf1 (commit) via 27e6a98bfd609a9d46d7711bdd2c762cb5c2e6c4 (commit) from ddc180100229fd76d25a97f4310ca97ff738b2cb (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=eb101557671a0dd39864ac3e1fee586bb749cdf1 commit eb101557671a0dd39864ac3e1fee586bb749cdf1 Merge: ddc1801 27e6a98 Author: Brad King AuthorDate: Wed Feb 10 14:12:36 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 10 14:12:36 2016 -0500 Merge topic 'ninja-deterministic-gen' into next 27e6a98b Ninja: Fix non-determinism in generated build statement order (#15968) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=27e6a98bfd609a9d46d7711bdd2c762cb5c2e6c4 commit 27e6a98bfd609a9d46d7711bdd2c762cb5c2e6c4 Author: Brad King AuthorDate: Wed Feb 10 14:08:48 2016 -0500 Commit: Brad King CommitDate: Wed Feb 10 14:09:17 2016 -0500 Ninja: Fix non-determinism in generated build statement order (#15968) Generate custom command build statements in the order we encounter source files specifying them. Do not depend on pointer values of internally allocated structures for ordering. diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx index b2927a9..8a68af6 100644 --- a/Source/cmLocalNinjaGenerator.cxx +++ b/Source/cmLocalNinjaGenerator.cxx @@ -454,13 +454,24 @@ cmLocalNinjaGenerator::WriteCustomCommandBuildStatement( void cmLocalNinjaGenerator::AddCustomCommandTarget(cmCustomCommand const* cc, cmGeneratorTarget* target) { - this->CustomCommandTargets[cc].insert(target); + CustomCommandTargetMap::value_type v(cc, std::set()); + std::pair + ins = this->CustomCommandTargets.insert(v); + if (ins.second) + { + this->CustomCommands.push_back(cc); + } + ins.first->second.insert(target); } void cmLocalNinjaGenerator::WriteCustomCommandBuildStatements() { - for (CustomCommandTargetMap::iterator i = this->CustomCommandTargets.begin(); - i != this->CustomCommandTargets.end(); ++i) { + for (std::vector::iterator vi = + this->CustomCommands.begin(); vi != this->CustomCommands.end(); ++vi) + { + CustomCommandTargetMap::iterator i = this->CustomCommandTargets.find(*vi); + assert(i != this->CustomCommandTargets.end()); + // A custom command may appear on multiple targets. However, some build // systems exist where the target dependencies on some of the targets are // overspecified, leading to a dependency cycle. If we assume all target diff --git a/Source/cmLocalNinjaGenerator.h b/Source/cmLocalNinjaGenerator.h index b6987ef..5e1d6f2 100644 --- a/Source/cmLocalNinjaGenerator.h +++ b/Source/cmLocalNinjaGenerator.h @@ -106,6 +106,7 @@ private: typedef std::map > CustomCommandTargetMap; CustomCommandTargetMap CustomCommandTargets; + std::vector CustomCommands; }; #endif // ! cmLocalNinjaGenerator_h ----------------------------------------------------------------------- Summary of changes: Source/cmLocalNinjaGenerator.cxx | 17 ++++++++++++++--- Source/cmLocalNinjaGenerator.h | 1 + 2 files changed, 15 insertions(+), 3 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 10 14:23:57 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 10 Feb 2016 14:23:57 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-124-g92b83e8 Message-ID: <20160210192357.5D07AE4EBB@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, next has been updated via 92b83e8a59da7486afa330f7cd0b8f6201892650 (commit) via e81ba4ffea9612395ee01016c97824870801cb70 (commit) from eb101557671a0dd39864ac3e1fee586bb749cdf1 (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=92b83e8a59da7486afa330f7cd0b8f6201892650 commit 92b83e8a59da7486afa330f7cd0b8f6201892650 Merge: eb10155 e81ba4f Author: Brad King AuthorDate: Wed Feb 10 14:23:50 2016 -0500 Commit: Brad King CommitDate: Wed Feb 10 14:23:50 2016 -0500 Merge branch 'master' into next https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e81ba4ffea9612395ee01016c97824870801cb70 commit e81ba4ffea9612395ee01016c97824870801cb70 Merge: 4f593ab 8d1b37a Author: Brad King AuthorDate: Wed Feb 10 14:23:43 2016 -0500 Commit: Brad King CommitDate: Wed Feb 10 14:23:43 2016 -0500 Merge branch 'release' ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 10 14:24:08 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 10 Feb 2016 14:24:08 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc1-70-ge81ba4f Message-ID: <20160210192408.01D30E4B1C@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 e81ba4ffea9612395ee01016c97824870801cb70 (commit) via 8d1b37a2b207956c05e017645de3681a077d0a5b (commit) from 4f593abe7270d43ba5a9c882067ae34328fdf30b (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: hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 10 14:24:08 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 10 Feb 2016 14:24:08 -0500 (EST) Subject: [Cmake-commits] CMake branch, release, updated. v3.5.0-rc1-23-g8d1b37a Message-ID: <20160210192408.137BDE4B1C@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 8d1b37a2b207956c05e017645de3681a077d0a5b (commit) from b162dd9ea0c7c08b4b5c0afcb107ebf870064ee2 (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 robert.maynard at kitware.com Wed Feb 10 15:37:53 2016 From: robert.maynard at kitware.com (Robert Maynard) Date: Wed, 10 Feb 2016 15:37:53 -0500 (EST) Subject: [Cmake-commits] CMake annotated tag, v3.5.0-rc2, created. v3.5.0-rc2 Message-ID: <20160210203801.9740AE50DD@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.5.0-rc2 has been created at a8227079ea35fe5ef8689319e43029d71bd25e4a (tag) tagging 8d1b37a2b207956c05e017645de3681a077d0a5b (commit) replaces v3.5.0-rc1 tagged by Brad King on Wed Feb 10 14:20:52 2016 -0500 - Log ----------------------------------------------------------------- CMake 3.5.0-rc2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJWu42UAAoJEC0s7xA0khaE2XEP/1XgY7egloMXA64+UVJREwTx C5oz+l50c7FGJmCU0jGJP//eAsolutFeVA+zIBKo2JWm6OcP7/RAhYtzvlT1dvis csQL3xy7ubNoezey3qo3UIhev4obZ8LZzqrJdPzI8OibqGi+IRDOvZXwQWD5zAbX r7vOVK542o/Jb0AyRxlwdxlVHWMJXOXUB/+nbtCJuBZVWxsk9p78pGLTnWtpztc1 EYvnP6xb/TSc2sOlp3qzJbNcGBPQt58DBzXkLiCKo/UW9jYtIykKHM+BOqK+jC7d 1UuBNvxGS913eK3UJDtj7k5GbPqL22HS9lwxWqjMiQWL9yQ3Y8MXAbCis9Vq6DjK hgwYZaNvEYuOvBLc6l0naunq4MJIIT1DwvZDD4raeUBMJnJckmFWwp0C5D06tB0x sY5Ihgmcr4d5ezgwx/p5p3nooND6nWRMqzaeo+GNNSwhAPaf7dsd6BTj8wHsOdQL 98GkGFtbXS1beSkxP/aSk8ClhfI1RgI69nt7OpdrZ/QIMYvUCt6UXn8CzpbfCduM RsxMoI/NxtNe4oj4jUGohJJ4vabydcsB42hi85grD3+HPjwemf0Yx0NCXLm/sIb/ rIyYxUGRUEwAYUcK5VHOMKdocTB0Tbifx3hnmdAIPv/LxnPHq5rsIye0qscH++PW PxBPbaoNrK+SsynCCOY0 =wbBG -----END PGP SIGNATURE----- Brad King (19): Fix dependency scanning configuration in subdirectories Tests: Use newer policy settings in RunCMake.install test install(EXPORT): Fix crash on target in another directory ExternalProject: Be compatible with projects setting CMAKE_CFG_INTDIR Install ccmake.1 and cmake-gui.1 conditionally with their tools (#15957) Merge branch 'fix-Fortran-module-in-subdir' into release Merge branch 'ExternalProject-build-config-compat' into release Merge branch 'fix-doc-typos' into release Merge branch 'install-man-conditionally' into release Merge branch 'test-ctest_submit-update' into release Tests: Avoid OS X 10.5 limitation warning in RunCMake.install test Merge branch 'fix-install-EXPORT-crash' into release Fix internal target lookup performance regression Improve internal generator target structure lookup Merge branch 'fix-target-lookup-performance-regression' into release Merge branch 'wix-prevent-nsis-overwrite' into release cmCurl: Fix compilation with system curl versions prior to 7.21.5 Merge branch 'curl-pre-7.21.5' into release CMake 3.5.0-rc2 Horst Kronstorfer (1): Help: Fix command specification for cmake_minimum_required Nils Gladitz (1): CMake: Prevent WiX installations over existing NSIS installations Orion Poplawski (1): Tests: Extend ctest_submit host lookup failure matching (#15958) Paul Wilkinson (1): Help: Fix mistake in cmake-buildsystem(7) example ----------------------------------------------------------------------- hooks/post-receive -- CMake From kwrobot at kitware.com Thu Feb 11 00:01:06 2016 From: kwrobot at kitware.com (Kitware Robot) Date: Thu, 11 Feb 2016 00:01:06 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc2-48-gd83abbf Message-ID: <20160211050106.86746E520C@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 d83abbf9e3f0d5c46ef7f828c7b49f3413647fee (commit) from e81ba4ffea9612395ee01016c97824870801cb70 (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=d83abbf9e3f0d5c46ef7f828c7b49f3413647fee commit d83abbf9e3f0d5c46ef7f828c7b49f3413647fee Author: Kitware Robot AuthorDate: Thu Feb 11 00:01:04 2016 -0500 Commit: Kitware Robot CommitDate: Thu Feb 11 00:01:04 2016 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index b8bdc48..9f3731d 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 5) -set(CMake_VERSION_PATCH 20160210) +set(CMake_VERSION_PATCH 20160211) #set(CMake_VERSION_RC 1) ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 11 08:47:40 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 11 Feb 2016 08:47:40 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-104-geb9e0d1 Message-ID: <20160211134741.31666E4D14@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, next has been updated via eb9e0d130321d0538e3d3cc3e373581f007995dc (commit) via 51b0501a7ff3812a2669caf474742b164d776e81 (commit) via d83abbf9e3f0d5c46ef7f828c7b49f3413647fee (commit) from 92b83e8a59da7486afa330f7cd0b8f6201892650 (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=eb9e0d130321d0538e3d3cc3e373581f007995dc commit eb9e0d130321d0538e3d3cc3e373581f007995dc Merge: 92b83e8 51b0501 Author: Brad King AuthorDate: Thu Feb 11 08:47:39 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Feb 11 08:47:39 2016 -0500 Merge topic 'FindProtobuf-select-library-config' into next 51b0501a FindProtobuf: prevent redundant PROTOBUF_LIBRARIES d83abbf9 CMake Nightly Date Stamp https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51b0501a7ff3812a2669caf474742b164d776e81 commit 51b0501a7ff3812a2669caf474742b164d776e81 Author: Antonio Perez Barrero AuthorDate: Thu Feb 11 09:24:27 2016 +0100 Commit: Brad King CommitDate: Thu Feb 11 08:45:41 2016 -0500 FindProtobuf: prevent redundant PROTOBUF_LIBRARIES Before this change, the variable PROTOBUF_LIBRARIES might get redundant value for debug and optimized configurations, e.g. `optimized;/usr/lib/libprotobuf.so;debug;/usr/lib/libprotobuf.so`. diff --git a/Modules/FindProtobuf.cmake b/Modules/FindProtobuf.cmake index 2f13b09..0875349 100644 --- a/Modules/FindProtobuf.cmake +++ b/Modules/FindProtobuf.cmake @@ -210,32 +210,33 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 8) set(_PROTOBUF_ARCH_DIR x64/) endif() +include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake) + # Internal function: search for normal library as well as a debug one # if the debug one is specified also include debug/optimized keywords # in *_LIBRARIES variable function(_protobuf_find_libraries name filename) - find_library(${name}_LIBRARY - NAMES ${filename} - PATHS ${PROTOBUF_SRC_ROOT_FOLDER}/vsprojects/${_PROTOBUF_ARCH_DIR}Release) - mark_as_advanced(${name}_LIBRARY) - - find_library(${name}_LIBRARY_DEBUG - NAMES ${filename} - PATHS ${PROTOBUF_SRC_ROOT_FOLDER}/vsprojects/${_PROTOBUF_ARCH_DIR}Debug) - mark_as_advanced(${name}_LIBRARY_DEBUG) - - if(NOT ${name}_LIBRARY_DEBUG) - # There is no debug library - set(${name}_LIBRARY_DEBUG ${${name}_LIBRARY} PARENT_SCOPE) - set(${name}_LIBRARIES ${${name}_LIBRARY} PARENT_SCOPE) - else() - # There IS a debug library - set(${name}_LIBRARIES - optimized ${${name}_LIBRARY} - debug ${${name}_LIBRARY_DEBUG} - PARENT_SCOPE - ) - endif() + if(${name}_LIBRARIES) + # Use result recorded by a previous call. + return() + elseif(${name}_LIBRARY) + # Honor cache entry used by CMake 3.5 and lower. + set(${name}_LIBRARIES "${${name}_LIBRARY}" PARENT_SCOPE) + else() + find_library(${name}_LIBRARY_RELEASE + NAMES ${filename} + PATHS ${PROTOBUF_SRC_ROOT_FOLDER}/vsprojects/${_PROTOBUF_ARCH_DIR}Release) + mark_as_advanced(${name}_LIBRARY_RELEASE) + + find_library(${name}_LIBRARY_DEBUG + NAMES ${filename} + PATHS ${PROTOBUF_SRC_ROOT_FOLDER}/vsprojects/${_PROTOBUF_ARCH_DIR}Debug) + mark_as_advanced(${name}_LIBRARY_DEBUG) + + select_library_configurations(${name}) + set(${name}_LIBRARY "${${name}_LIBRARY}" PARENT_SCOPE) + set(${name}_LIBRARIES "${${name}_LIBRARIES}" PARENT_SCOPE) + endif() endfunction() # Internal function: find threads library ----------------------------------------------------------------------- Summary of changes: Modules/FindProtobuf.cmake | 45 ++++++++++++++++++++++---------------------- Source/CMakeVersion.cmake | 2 +- 2 files changed, 24 insertions(+), 23 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 11 08:51:03 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 11 Feb 2016 08:51:03 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-106-gf90cc17 Message-ID: <20160211135104.24A06E4F0F@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, next has been updated via f90cc170a03e7d7f695fcc93c5013ab69b023fc4 (commit) via e422f738e4eb27dbf24a0b45d56e0f21a1d45cbc (commit) from eb9e0d130321d0538e3d3cc3e373581f007995dc (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=f90cc170a03e7d7f695fcc93c5013ab69b023fc4 commit f90cc170a03e7d7f695fcc93c5013ab69b023fc4 Merge: eb9e0d1 e422f73 Author: Brad King AuthorDate: Thu Feb 11 08:51:02 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Feb 11 08:51:02 2016 -0500 Merge topic 'BundleUtilities-dylib-in-framework' into next e422f738 BundleUtilities: Fix treatment of .dylib inside .framework folders https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e422f738e4eb27dbf24a0b45d56e0f21a1d45cbc commit e422f738e4eb27dbf24a0b45d56e0f21a1d45cbc Author: Christian Askeland AuthorDate: Thu Feb 11 14:15:06 2016 +0100 Commit: Brad King CommitDate: Thu Feb 11 08:49:06 2016 -0500 BundleUtilities: Fix treatment of .dylib inside .framework folders The specific cause is when e.g. /Library/Frameworks/GStreamer.framework/Versions/1.0/lib/libgio-2.0.0.dylib is detected by fixup_bundle. set_bundle_key_values() interprets this as a framework, thus doing a string replace that creates an embedded_item that is equal to the original path, i.e. it is not embedded. diff --git a/Modules/BundleUtilities.cmake b/Modules/BundleUtilities.cmake index 45dda40..73ff0af 100644 --- a/Modules/BundleUtilities.cmake +++ b/Modules/BundleUtilities.cmake @@ -479,7 +479,7 @@ function(set_bundle_key_values keys_var context item exepath dirs copyflag) get_item_rpaths("${resolved_item}" item_rpaths) - if(item MATCHES "[^/]+\\.framework/") + if((item NOT MATCHES "\\.dylib$") AND (item MATCHES "[^/]+\\.framework/")) # For frameworks, construct the name under the embedded path from the # opening "${item_name}.framework/" to the closing "/${item_name}": # ----------------------------------------------------------------------- Summary of changes: Modules/BundleUtilities.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 11 08:55:50 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 11 Feb 2016 08:55:50 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-108-g35c20b4 Message-ID: <20160211135551.4DB7CE5115@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, next has been updated via 35c20b47d86644be7bc840b9584cbb85f5ff95a5 (commit) via 59ade844ef01f0c8a4db3a5593f79210edcf6cbc (commit) from f90cc170a03e7d7f695fcc93c5013ab69b023fc4 (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=35c20b47d86644be7bc840b9584cbb85f5ff95a5 commit 35c20b47d86644be7bc840b9584cbb85f5ff95a5 Merge: f90cc17 59ade84 Author: Brad King AuthorDate: Thu Feb 11 08:55:49 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Feb 11 08:55:49 2016 -0500 Merge topic 'ninja-deterministic-gen' into next 59ade844 Ninja: Fix non-determinism in generated build statement order (#15968) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=59ade844ef01f0c8a4db3a5593f79210edcf6cbc commit 59ade844ef01f0c8a4db3a5593f79210edcf6cbc Author: Brad King AuthorDate: Wed Feb 10 14:08:48 2016 -0500 Commit: Brad King CommitDate: Thu Feb 11 08:53:37 2016 -0500 Ninja: Fix non-determinism in generated build statement order (#15968) Generate custom command build statements in the order we encounter source files specifying them. Do not depend on pointer values of internally allocated structures for ordering. diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx index b2927a9..8a68af6 100644 --- a/Source/cmLocalNinjaGenerator.cxx +++ b/Source/cmLocalNinjaGenerator.cxx @@ -454,13 +454,24 @@ cmLocalNinjaGenerator::WriteCustomCommandBuildStatement( void cmLocalNinjaGenerator::AddCustomCommandTarget(cmCustomCommand const* cc, cmGeneratorTarget* target) { - this->CustomCommandTargets[cc].insert(target); + CustomCommandTargetMap::value_type v(cc, std::set()); + std::pair + ins = this->CustomCommandTargets.insert(v); + if (ins.second) + { + this->CustomCommands.push_back(cc); + } + ins.first->second.insert(target); } void cmLocalNinjaGenerator::WriteCustomCommandBuildStatements() { - for (CustomCommandTargetMap::iterator i = this->CustomCommandTargets.begin(); - i != this->CustomCommandTargets.end(); ++i) { + for (std::vector::iterator vi = + this->CustomCommands.begin(); vi != this->CustomCommands.end(); ++vi) + { + CustomCommandTargetMap::iterator i = this->CustomCommandTargets.find(*vi); + assert(i != this->CustomCommandTargets.end()); + // A custom command may appear on multiple targets. However, some build // systems exist where the target dependencies on some of the targets are // overspecified, leading to a dependency cycle. If we assume all target diff --git a/Source/cmLocalNinjaGenerator.h b/Source/cmLocalNinjaGenerator.h index b6987ef..5e1d6f2 100644 --- a/Source/cmLocalNinjaGenerator.h +++ b/Source/cmLocalNinjaGenerator.h @@ -106,6 +106,7 @@ private: typedef std::map > CustomCommandTargetMap; CustomCommandTargetMap CustomCommandTargets; + std::vector CustomCommands; }; #endif // ! cmLocalNinjaGenerator_h ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 11 09:56:06 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 11 Feb 2016 09:56:06 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-110-gf262c1d Message-ID: <20160211145606.2A818E4FAA@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, next has been updated via f262c1da2776195a49fd09de2115e5dddbfc5b5a (commit) via 878632c90e4811ed08e5d1c298de8ae61d79f620 (commit) from 35c20b47d86644be7bc840b9584cbb85f5ff95a5 (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=f262c1da2776195a49fd09de2115e5dddbfc5b5a commit f262c1da2776195a49fd09de2115e5dddbfc5b5a Merge: 35c20b4 878632c Author: Brad King AuthorDate: Thu Feb 11 09:56:03 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Feb 11 09:56:03 2016 -0500 Merge topic 'doc-xcode-escaping-fix' into next 878632c9 Help: Add release note about Xcode escaping fix (#15969) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=878632c90e4811ed08e5d1c298de8ae61d79f620 commit 878632c90e4811ed08e5d1c298de8ae61d79f620 Author: Brad King AuthorDate: Thu Feb 11 09:52:37 2016 -0500 Commit: Brad King CommitDate: Thu Feb 11 09:53:34 2016 -0500 Help: Add release note about Xcode escaping fix (#15969) The fix in commit v3.5.0-rc1~84^2 (Xcode: Escape all backslashes in strings, 2015-12-27) is a change in behavior that can break existing projects that worked around the inconsistency with other generators. Add a release note to call attention to this change in behavior. diff --git a/Help/release/3.5.rst b/Help/release/3.5.rst index 3d1e3b4..62703b3 100644 --- a/Help/release/3.5.rst +++ b/Help/release/3.5.rst @@ -167,6 +167,12 @@ Deprecated and Removed Features may break scripts that worked around the bug with their own extra quoting or escaping. +* The :generator:`Xcode` generator was fixed to escape backslashes in + strings consistently with other generators. Projects that previously + worked around the inconsistecy with an extra level of backslashes + conditioned on the Xcode generator must be updated to remove the + workaround for CMake 3.5 and greater. + Other Changes ============= ----------------------------------------------------------------------- Summary of changes: Help/release/3.5.rst | 6 ++++++ 1 file changed, 6 insertions(+) hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 11 10:41:09 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 11 Feb 2016 10:41:09 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc2-50-ge07688e Message-ID: <20160211154110.F0734E3A61@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 e07688e684c74eb71921f5490e2663c86c276468 (commit) via 062045b8b6887cd8a59c384dfca23b83747568b5 (commit) from d83abbf9e3f0d5c46ef7f828c7b49f3413647fee (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=e07688e684c74eb71921f5490e2663c86c276468 commit e07688e684c74eb71921f5490e2663c86c276468 Merge: d83abbf 062045b Author: Brad King AuthorDate: Thu Feb 11 10:41:06 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Feb 11 10:41:06 2016 -0500 Merge topic 'cross_subproject_coverage' 062045b8 More options for CTestCoverageCollectGCOV ----------------------------------------------------------------------- Summary of changes: Modules/CTestCoverageCollectGCOV.cmake | 64 +++++++++++++++++++++++--------- 1 file changed, 47 insertions(+), 17 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 11 10:41:15 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 11 Feb 2016 10:41:15 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc2-54-g08ccb83 Message-ID: <20160211154117.5B598E24DB@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 08ccb837c3b5b5eed38adbb96e2f1811af7bfe5f (commit) via 4f3f75a2461af79bf1eb01b61a06d396d89521c5 (commit) via 47f24cbccaaeb125a8b7ead420340d2bf8bf89ef (commit) via 9d1f40ccc1e45b918498800029034f3bebafb031 (commit) from e07688e684c74eb71921f5490e2663c86c276468 (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=08ccb837c3b5b5eed38adbb96e2f1811af7bfe5f commit 08ccb837c3b5b5eed38adbb96e2f1811af7bfe5f Merge: e07688e 4f3f75a Author: Brad King AuthorDate: Thu Feb 11 10:41:13 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Feb 11 10:41:13 2016 -0500 Merge topic 'doc-FortranCInterface-variables' 4f3f75a2 FortranCInterface: Document mangling result variables publicly 47f24cbc FortranCInterface: Improve documentation formatting and organization 9d1f40cc FortranCInterface: Convert docs to a bracket comment ----------------------------------------------------------------------- Summary of changes: Modules/FortranCInterface.cmake | 313 +++++++++++++++++++++++---------------- 1 file changed, 187 insertions(+), 126 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 11 10:41:21 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 11 Feb 2016 10:41:21 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc2-56-g53108f8 Message-ID: <20160211154121.8D1B0E24DB@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 53108f800841f3889ef9dc644a12b803a017ce34 (commit) via 59ade844ef01f0c8a4db3a5593f79210edcf6cbc (commit) from 08ccb837c3b5b5eed38adbb96e2f1811af7bfe5f (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=53108f800841f3889ef9dc644a12b803a017ce34 commit 53108f800841f3889ef9dc644a12b803a017ce34 Merge: 08ccb83 59ade84 Author: Brad King AuthorDate: Thu Feb 11 10:41:18 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Feb 11 10:41:18 2016 -0500 Merge topic 'ninja-deterministic-gen' 59ade844 Ninja: Fix non-determinism in generated build statement order (#15968) ----------------------------------------------------------------------- Summary of changes: Source/cmLocalNinjaGenerator.cxx | 17 ++++++++++++++--- Source/cmLocalNinjaGenerator.h | 1 + 2 files changed, 15 insertions(+), 3 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 11 10:41:24 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 11 Feb 2016 10:41:24 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc2-58-g7db269d Message-ID: <20160211154124.A8DBDE3EB9@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 7db269ddd1ffa2e673c33e508221811bf9ec55f1 (commit) via 878632c90e4811ed08e5d1c298de8ae61d79f620 (commit) from 53108f800841f3889ef9dc644a12b803a017ce34 (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=7db269ddd1ffa2e673c33e508221811bf9ec55f1 commit 7db269ddd1ffa2e673c33e508221811bf9ec55f1 Merge: 53108f8 878632c Author: Brad King AuthorDate: Thu Feb 11 10:41:22 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Feb 11 10:41:22 2016 -0500 Merge topic 'doc-xcode-escaping-fix' 878632c9 Help: Add release note about Xcode escaping fix (#15969) ----------------------------------------------------------------------- Summary of changes: Help/release/3.5.rst | 6 ++++++ 1 file changed, 6 insertions(+) hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 11 10:42:07 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 11 Feb 2016 10:42:07 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-115-gd8d3f4d Message-ID: <20160211154208.4255BE41D9@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, next has been updated via d8d3f4de5032f005548a6651904f9041865181d0 (commit) via 7db269ddd1ffa2e673c33e508221811bf9ec55f1 (commit) via 53108f800841f3889ef9dc644a12b803a017ce34 (commit) via 08ccb837c3b5b5eed38adbb96e2f1811af7bfe5f (commit) via e07688e684c74eb71921f5490e2663c86c276468 (commit) from f262c1da2776195a49fd09de2115e5dddbfc5b5a (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=d8d3f4de5032f005548a6651904f9041865181d0 commit d8d3f4de5032f005548a6651904f9041865181d0 Merge: f262c1d 7db269d Author: Brad King AuthorDate: Thu Feb 11 10:41:40 2016 -0500 Commit: Brad King CommitDate: Thu Feb 11 10:41:40 2016 -0500 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 11 13:39:16 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 11 Feb 2016 13:39:16 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-117-ge163cb5 Message-ID: <20160211183920.5516AB56@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, next has been updated via e163cb5d65ea5c31d33ad543e25f8b984bc62e10 (commit) via e1ea1df07ec6c5a5514cad2ca44bbef9bd41c587 (commit) from d8d3f4de5032f005548a6651904f9041865181d0 (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=e163cb5d65ea5c31d33ad543e25f8b984bc62e10 commit e163cb5d65ea5c31d33ad543e25f8b984bc62e10 Merge: d8d3f4d e1ea1df Author: Brad King AuthorDate: Thu Feb 11 13:39:15 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Feb 11 13:39:15 2016 -0500 Merge topic 'fix-warnings' into next e1ea1df0 cmListFileCache: Fix warning about inconsistent use of class/struct https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e1ea1df07ec6c5a5514cad2ca44bbef9bd41c587 commit e1ea1df07ec6c5a5514cad2ca44bbef9bd41c587 Author: Tobias Hunger AuthorDate: Thu Feb 11 17:47:42 2016 +0100 Commit: Brad King CommitDate: Thu Feb 11 13:38:02 2016 -0500 cmListFileCache: Fix warning about inconsistent use of class/struct Exposed by Clang trunk. diff --git a/Source/cmListFileCache.h b/Source/cmListFileCache.h index 03e0abe..4d3055f 100644 --- a/Source/cmListFileCache.h +++ b/Source/cmListFileCache.h @@ -58,8 +58,9 @@ struct cmListFileArgument long Line; }; -struct cmListFileContext +class cmListFileContext { +public: std::string Name; std::string FilePath; long Line; ----------------------------------------------------------------------- Summary of changes: Source/cmListFileCache.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) hooks/post-receive -- CMake From kwrobot at kitware.com Fri Feb 12 00:01:06 2016 From: kwrobot at kitware.com (Kitware Robot) Date: Fri, 12 Feb 2016 00:01:06 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc2-59-g3fd3266 Message-ID: <20160212050106.AB942E4FEA@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 3fd326695f32efe8dedc2c22b62437612ba59616 (commit) from 7db269ddd1ffa2e673c33e508221811bf9ec55f1 (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=3fd326695f32efe8dedc2c22b62437612ba59616 commit 3fd326695f32efe8dedc2c22b62437612ba59616 Author: Kitware Robot AuthorDate: Fri Feb 12 00:01:04 2016 -0500 Commit: Kitware Robot CommitDate: Fri Feb 12 00:01:04 2016 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 9f3731d..df07c51 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 5) -set(CMake_VERSION_PATCH 20160211) +set(CMake_VERSION_PATCH 20160212) #set(CMake_VERSION_RC 1) ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Fri Feb 12 08:57:57 2016 From: brad.king at kitware.com (Brad King) Date: Fri, 12 Feb 2016 08:57:57 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-119-g609e86f Message-ID: <20160212135757.1A63FE4D69@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, next has been updated via 609e86fa70ef7f00103e37fb8cf0e5e444853ae2 (commit) via 46fa9583624b3dd2b2dad978cb0313b78eae5f53 (commit) from e163cb5d65ea5c31d33ad543e25f8b984bc62e10 (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=609e86fa70ef7f00103e37fb8cf0e5e444853ae2 commit 609e86fa70ef7f00103e37fb8cf0e5e444853ae2 Merge: e163cb5 46fa958 Author: Brad King AuthorDate: Fri Feb 12 08:57:56 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 12 08:57:56 2016 -0500 Merge topic 'ninja-deterministic-gen' into next 46fa9583 Ninja: Fix non-determinism in generated target dependency order (#15968) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=46fa9583624b3dd2b2dad978cb0313b78eae5f53 commit 46fa9583624b3dd2b2dad978cb0313b78eae5f53 Author: Brad King AuthorDate: Fri Feb 12 08:45:09 2016 -0500 Commit: Brad King CommitDate: Fri Feb 12 08:51:58 2016 -0500 Ninja: Fix non-determinism in generated target dependency order (#15968) We represent target dependency sets as `set` which orders by a `cmGeneratorTarget const*` pointer value. Therefore the order of dependencies encountered in AppendTargetDepends is not predictable. Sort them by content to make the result deterministic. diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 0f06e43..bb5f921 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -991,6 +991,7 @@ cmGlobalNinjaGenerator std::set const& utils = target->GetUtilities(); std::copy(utils.begin(), utils.end(), std::back_inserter(outputs)); } else { + cmNinjaDeps outs; cmTargetDependSet const& targetDeps = this->GetTargetDirectDepends(target); for (cmTargetDependSet::const_iterator i = targetDeps.begin(); i != targetDeps.end(); ++i) @@ -999,8 +1000,10 @@ cmGlobalNinjaGenerator { continue; } - this->AppendTargetOutputs(*i, outputs); + this->AppendTargetOutputs(*i, outs); } + std::sort(outs.begin(), outs.end()); + outputs.insert(outputs.end(), outs.begin(), outs.end()); } } ----------------------------------------------------------------------- Summary of changes: Source/cmGlobalNinjaGenerator.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Fri Feb 12 09:03:54 2016 From: brad.king at kitware.com (Brad King) Date: Fri, 12 Feb 2016 09:03:54 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc2-61-g1c8dadd Message-ID: <20160212140354.190F6E4E9F@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 1c8dadd914518e5185c73a4f5edba6167ced8b07 (commit) via e1ea1df07ec6c5a5514cad2ca44bbef9bd41c587 (commit) from 3fd326695f32efe8dedc2c22b62437612ba59616 (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=1c8dadd914518e5185c73a4f5edba6167ced8b07 commit 1c8dadd914518e5185c73a4f5edba6167ced8b07 Merge: 3fd3266 e1ea1df Author: Brad King AuthorDate: Fri Feb 12 09:03:52 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 12 09:03:52 2016 -0500 Merge topic 'fix-warnings' e1ea1df0 cmListFileCache: Fix warning about inconsistent use of class/struct ----------------------------------------------------------------------- Summary of changes: Source/cmListFileCache.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Fri Feb 12 09:03:56 2016 From: brad.king at kitware.com (Brad King) Date: Fri, 12 Feb 2016 09:03:56 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc2-63-g10f03d1 Message-ID: <20160212140356.5813FE4E3C@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 10f03d1baab5721cdff0550bd39664a6d9cd941d (commit) via 51b0501a7ff3812a2669caf474742b164d776e81 (commit) from 1c8dadd914518e5185c73a4f5edba6167ced8b07 (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=10f03d1baab5721cdff0550bd39664a6d9cd941d commit 10f03d1baab5721cdff0550bd39664a6d9cd941d Merge: 1c8dadd 51b0501 Author: Brad King AuthorDate: Fri Feb 12 09:03:54 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 12 09:03:54 2016 -0500 Merge topic 'FindProtobuf-select-library-config' 51b0501a FindProtobuf: prevent redundant PROTOBUF_LIBRARIES ----------------------------------------------------------------------- Summary of changes: Modules/FindProtobuf.cmake | 45 ++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Fri Feb 12 09:03:58 2016 From: brad.king at kitware.com (Brad King) Date: Fri, 12 Feb 2016 09:03:58 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc2-65-g86d2f32 Message-ID: <20160212140358.8ECC7E4EAD@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 86d2f3252591f413e57a623e297911bbf03b481e (commit) via e422f738e4eb27dbf24a0b45d56e0f21a1d45cbc (commit) from 10f03d1baab5721cdff0550bd39664a6d9cd941d (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=86d2f3252591f413e57a623e297911bbf03b481e commit 86d2f3252591f413e57a623e297911bbf03b481e Merge: 10f03d1 e422f73 Author: Brad King AuthorDate: Fri Feb 12 09:03:57 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 12 09:03:57 2016 -0500 Merge topic 'BundleUtilities-dylib-in-framework' e422f738 BundleUtilities: Fix treatment of .dylib inside .framework folders ----------------------------------------------------------------------- Summary of changes: Modules/BundleUtilities.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Fri Feb 12 09:04:16 2016 From: brad.king at kitware.com (Brad King) Date: Fri, 12 Feb 2016 09:04:16 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-124-g3a8af0c Message-ID: <20160212140416.8EA3DE4EA5@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, next has been updated via 3a8af0c5b500b6c08d7c4b47d4f9345c04d56aeb (commit) via 86d2f3252591f413e57a623e297911bbf03b481e (commit) via 10f03d1baab5721cdff0550bd39664a6d9cd941d (commit) via 1c8dadd914518e5185c73a4f5edba6167ced8b07 (commit) via 3fd326695f32efe8dedc2c22b62437612ba59616 (commit) from 609e86fa70ef7f00103e37fb8cf0e5e444853ae2 (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=3a8af0c5b500b6c08d7c4b47d4f9345c04d56aeb commit 3a8af0c5b500b6c08d7c4b47d4f9345c04d56aeb Merge: 609e86f 86d2f32 Author: Brad King AuthorDate: Fri Feb 12 09:04:08 2016 -0500 Commit: Brad King CommitDate: Fri Feb 12 09:04:08 2016 -0500 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Fri Feb 12 10:22:23 2016 From: brad.king at kitware.com (Brad King) Date: Fri, 12 Feb 2016 10:22:23 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-126-g1c6bc3a Message-ID: <20160212152223.3B373E4E68@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, next has been updated via 1c6bc3adaa84f5fb311f57e193e180530ea84702 (commit) via da490e11599e7948bb0a3ed3a53cdf5f80253b2d (commit) from 3a8af0c5b500b6c08d7c4b47d4f9345c04d56aeb (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=1c6bc3adaa84f5fb311f57e193e180530ea84702 commit 1c6bc3adaa84f5fb311f57e193e180530ea84702 Merge: 3a8af0c da490e1 Author: Brad King AuthorDate: Fri Feb 12 10:22:22 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 12 10:22:22 2016 -0500 Merge topic 'cmake-gui-reset-generator' into next da490e11 cmake-gui: Fix cmState initialization when changing generators (#15959) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da490e11599e7948bb0a3ed3a53cdf5f80253b2d commit da490e11599e7948bb0a3ed3a53cdf5f80253b2d Author: Brad King AuthorDate: Fri Feb 12 10:15:11 2016 -0500 Commit: Brad King CommitDate: Fri Feb 12 10:21:00 2016 -0500 cmake-gui: Fix cmState initialization when changing generators (#15959) Refactoring in commit v3.3.0-rc1~29^2~1 (cmState: Host some state from the cmGlobalGenerator, 2015-05-24) moved storage of some generator traits over to cmState. However, it accidentally removed initialization of the values from the cmGlobalGenerator constructor. This is needed because generator subclasses update the settings in their constructors. Since a single cmState instance is shared across multiple build trees by cmake-gui, initializing the values in its constructor is not enough. Fix this by restoring the needed initializations to the cmGlobalGenerator constructor. diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index d7bec44..7ffd5af 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -86,6 +86,13 @@ cmGlobalGenerator::cmGlobalGenerator(cmake* cm) this->TryCompileOuterMakefile = 0; this->ConfigureDoneCMP0026AndCMP0024 = false; + + cm->GetState()->SetMinGWMake(false); + cm->GetState()->SetMSYSShell(false); + cm->GetState()->SetNMake(false); + cm->GetState()->SetWatcomWMake(false); + cm->GetState()->SetWindowsShell(false); + cm->GetState()->SetWindowsVSIDE(false); } cmGlobalGenerator::~cmGlobalGenerator() ----------------------------------------------------------------------- Summary of changes: Source/cmGlobalGenerator.cxx | 7 +++++++ 1 file changed, 7 insertions(+) hooks/post-receive -- CMake From brad.king at kitware.com Fri Feb 12 11:25:28 2016 From: brad.king at kitware.com (Brad King) Date: Fri, 12 Feb 2016 11:25:28 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-128-g2b1f8d5 Message-ID: <20160212162528.6A396E4D8C@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, next has been updated via 2b1f8d5217d2b179d976dfca1bf5982f6be06c00 (commit) via c8c45a2c4e10715e5cf05acaa0ac2c80f28b9a6a (commit) from 1c6bc3adaa84f5fb311f57e193e180530ea84702 (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=2b1f8d5217d2b179d976dfca1bf5982f6be06c00 commit 2b1f8d5217d2b179d976dfca1bf5982f6be06c00 Merge: 1c6bc3a c8c45a2 Author: Brad King AuthorDate: Fri Feb 12 11:25:27 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 12 11:25:27 2016 -0500 Merge topic 'fix-cmake_parse_arguments-expansion' into next c8c45a2c cmake_parse_arguments: Restore ;-list argument flattening https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c8c45a2c4e10715e5cf05acaa0ac2c80f28b9a6a commit c8c45a2c4e10715e5cf05acaa0ac2c80f28b9a6a Author: Dimitar Yordanov AuthorDate: Fri Feb 12 13:21:12 2016 +0100 Commit: Brad King CommitDate: Fri Feb 12 11:19:40 2016 -0500 cmake_parse_arguments: Restore ;-list argument flattening The re-implementation in commit v3.5.0-rc1~116^2~1 (CMakeParseArguments: replace by native cmake_parse_arguments command, 2015-12-05) introduced a regression when parsing the ARGN arguments with cmake_parse_arguments. The original implementation used foreach(currentArg ${ARGN}) to iterate over input arguments. This flattened ;-lists within the arguments whether they were quoted or not. Fix our new implementation to preserve this behavior and add a test case to cover it. Signed-off-by: Dimitar Yordanov Signed-off-by: Matthias Maennich diff --git a/Source/cmParseArgumentsCommand.cxx b/Source/cmParseArgumentsCommand.cxx index a861965..ca76c88 100644 --- a/Source/cmParseArgumentsCommand.cxx +++ b/Source/cmParseArgumentsCommand.cxx @@ -97,10 +97,18 @@ bool cmParseArgumentsCommand } insideValues = NONE; std::string currentArgName; - // now iterate over the remaining arguments - // and fill in the values where applicable + // Flatten ;-lists in the arguments into a single list as was done + // by the original function(CMAKE_PARSE_ARGUMENTS). + list.clear(); for(; argIter != argEnd; ++argIter) { + cmSystemTools::ExpandListArgument(*argIter, list); + } + + // iterate over the arguments list and fill in the values where applicable + for (argIter = list.begin(), argEnd = list.end(); + argIter != argEnd; ++argIter) + { const options_map::iterator optIter = options.find(*argIter); if (optIter != options.end()) { diff --git a/Tests/RunCMake/cmake_parse_arguments/CornerCases.cmake b/Tests/RunCMake/cmake_parse_arguments/CornerCases.cmake index 9a727dd..72c82ab 100644 --- a/Tests/RunCMake/cmake_parse_arguments/CornerCases.cmake +++ b/Tests/RunCMake/cmake_parse_arguments/CornerCases.cmake @@ -13,3 +13,22 @@ cmake_parse_arguments(MY_INSTALL "${options}" "${oneValueArgs}" TEST(MY_INSTALL_DESTINATION UNDEFINED) TEST(MY_INSTALL_OPTIONAL TRUE) + +macro(foo) + set(_options ) + set(_oneValueArgs FOO) + set(_multiValueArgs ) + cmake_parse_arguments(_FOO2 "${_options}" + "${_oneValueArgs}" + "${_multiValueArgs}" + "${ARGN}") + cmake_parse_arguments(_FOO1 "${_options}" + "${_oneValueArgs}" + "${_multiValueArgs}" + ${ARGN}) +endmacro() + +foo(FOO foo) + +TEST(_FOO1_FOO foo) +TEST(_FOO2_FOO foo) ----------------------------------------------------------------------- Summary of changes: Source/cmParseArgumentsCommand.cxx | 12 ++++++++++-- .../cmake_parse_arguments/CornerCases.cmake | 19 +++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Fri Feb 12 13:57:59 2016 From: brad.king at kitware.com (Brad King) Date: Fri, 12 Feb 2016 13:57:59 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-130-g26ab8b8 Message-ID: <20160212185759.97B1EE4E84@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, next has been updated via 26ab8b8e7deb6a583de55edc80d59eb91e74a8cd (commit) via 326ad9949fb8c74b2e266c152bcc9437ea2d484e (commit) from 2b1f8d5217d2b179d976dfca1bf5982f6be06c00 (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=26ab8b8e7deb6a583de55edc80d59eb91e74a8cd commit 26ab8b8e7deb6a583de55edc80d59eb91e74a8cd Merge: 2b1f8d5 326ad99 Author: Brad King AuthorDate: Fri Feb 12 13:57:58 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 12 13:57:58 2016 -0500 Merge topic 'fix-export-header-test' into next 326ad994 Tests: fix GenerateExportHeader directory definitions https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=326ad9949fb8c74b2e266c152bcc9437ea2d484e commit 326ad9949fb8c74b2e266c152bcc9437ea2d484e Author: Ben Boeckel AuthorDate: Fri Feb 12 13:14:59 2016 -0500 Commit: Ben Boeckel CommitDate: Fri Feb 12 13:50:32 2016 -0500 Tests: fix GenerateExportHeader directory definitions There's no need to stringify the values, but instead just pass in strings. The core problem is that the path may have tokens which are replaced by the preprocessor which causes an invalid path to be used. diff --git a/Tests/Module/GenerateExportHeader/CMakeLists.txt b/Tests/Module/GenerateExportHeader/CMakeLists.txt index 8cd25a4..7fce330 100644 --- a/Tests/Module/GenerateExportHeader/CMakeLists.txt +++ b/Tests/Module/GenerateExportHeader/CMakeLists.txt @@ -124,6 +124,6 @@ endif() message("#### Testing reference: ${_platform}") target_compile_definitions(GenerateExportHeader PRIVATE - "SRC_DIR=${CMAKE_CURRENT_SOURCE_DIR}/reference/${_platform}" - "BIN_DIR=${CMAKE_CURRENT_BINARY_DIR}" + "SRC_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/reference/${_platform}\"" + "BIN_DIR=\"${CMAKE_CURRENT_BINARY_DIR}\"" ) diff --git a/Tests/Module/GenerateExportHeader/exportheader_test.cpp b/Tests/Module/GenerateExportHeader/exportheader_test.cpp index 4f45f37..7802c43 100644 --- a/Tests/Module/GenerateExportHeader/exportheader_test.cpp +++ b/Tests/Module/GenerateExportHeader/exportheader_test.cpp @@ -136,13 +136,10 @@ int main() libstatic_not_exported(); libstatic_excluded(); -#define STRINGIFY_IMPL(A) #A -#define STRINGIFY(A) STRINGIFY_IMPL(A) - - compare(STRINGIFY(SRC_DIR) "/libshared_export.h", - STRINGIFY(BIN_DIR) "/libshared/libshared_export.h"); - compare(STRINGIFY(SRC_DIR) "/libstatic_export.h", - STRINGIFY(BIN_DIR) "/libstatic/libstatic_export.h"); + compare(SRC_DIR "/libshared_export.h", + BIN_DIR "/libshared/libshared_export.h"); + compare(SRC_DIR "/libstatic_export.h", + BIN_DIR "/libstatic/libstatic_export.h"); return 0; } ----------------------------------------------------------------------- Summary of changes: Tests/Module/GenerateExportHeader/CMakeLists.txt | 4 ++-- Tests/Module/GenerateExportHeader/exportheader_test.cpp | 11 ++++------- 2 files changed, 6 insertions(+), 9 deletions(-) hooks/post-receive -- CMake From domen.vrankar at gmail.com Fri Feb 12 20:11:38 2016 From: domen.vrankar at gmail.com (Domen Vrankar) Date: Fri, 12 Feb 2016 20:11:38 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-132-gb7388f1 Message-ID: <20160213011139.13DAAE39B5@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, next has been updated via b7388f1342b591056e513338f23097ed4a8b983c (commit) via 7c7efd1ed92e3c423f463c0249e1c05a33ff8049 (commit) from 26ab8b8e7deb6a583de55edc80d59eb91e74a8cd (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=b7388f1342b591056e513338f23097ed4a8b983c commit b7388f1342b591056e513338f23097ed4a8b983c Merge: 26ab8b8 7c7efd1 Author: Domen Vrankar AuthorDate: Fri Feb 12 20:11:34 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 12 20:11:34 2016 -0500 Merge topic 'cpack-rpm-upper-cased-components' into next 7c7efd1e CPack/RPM support for upper cased component variables https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7c7efd1ed92e3c423f463c0249e1c05a33ff8049 commit 7c7efd1ed92e3c423f463c0249e1c05a33ff8049 Author: Domen Vrankar AuthorDate: Sat Feb 13 02:09:32 2016 +0100 Commit: Domen Vrankar CommitDate: Sat Feb 13 02:09:32 2016 +0100 CPack/RPM support for upper cased component variables CPACK_* variables expect component name in upper case. CPACK_RPM_* variables expected component name to be in same case as component name. This patch adds support for CPACK_RPM_* variables with upper case component names to match the convention with CPACK_* variables and also preserves same case component names for back compatibility. diff --git a/Help/release/dev/cpack-rpm-upper-cased-components.rst b/Help/release/dev/cpack-rpm-upper-cased-components.rst new file mode 100644 index 0000000..a5fb233 --- /dev/null +++ b/Help/release/dev/cpack-rpm-upper-cased-components.rst @@ -0,0 +1,15 @@ +cpack-rpm-upper-cased-components +-------------------------------- + +* The "CPackRPM" module now supports upper cased component name + in per component CPackRPM specific variables. + E.g. component named ``foo`` now expects component specific + variable to be ``CPACK_RPM_FOO_PACKAGE_NAME`` while before + it expected ``CPACK_RPM_foo_PACKAGE_NAME``. + Upper cased component name part in variables is compatible + with convention used for other CPack variables. + For back compatibility old format of variables is still valid + and prefered if both versions of variable are set, but the + preferred future use is upper cased component names in variables. + New variables that will be added to CPackRPM in later versions + will only support upper cased component variable format. diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake index 7fb11c3..7ffec13 100644 --- a/Modules/CPackRPM.cmake +++ b/Modules/CPackRPM.cmake @@ -7,25 +7,35 @@ # Variables specific to CPack RPM generator # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ # -# CPackRPM may be used to create RPM package using CPack. CPackRPM is a -# CPack generator thus it uses the CPACK_XXX variables used by CPack : -# https://cmake.org/Wiki/CMake:CPackConfiguration -# -# However CPackRPM has specific features which are controlled by the -# specifics CPACK_RPM_XXX variables. CPackRPM is a component aware -# generator so when CPACK_RPM_COMPONENT_INSTALL is ON some more -# CPACK_RPM__XXXX variables may be used in order to have -# component specific values. Note however that refers -# to the **grouping name**. This may be either a component name or a -# component GROUP name. Usually those vars correspond to RPM spec file -# entities, one may find information about spec files here -# http://www.rpm.org/wiki/Docs. You'll find a detailed usage of -# CPackRPM on the wiki: -# -# :: +# CPackRPM may be used to create RPM package using CPack. +# CPackRPM is a CPack generator thus it uses the ``CPACK_XXX`` variables +# used by CPack : https://cmake.org/Wiki/CMake:CPackConfiguration. # -# https://cmake.org/Wiki/CMake:CPackPackageGenerators#RPM_.28Unix_Only.29 +# CPackRPM has specific features which are controlled by the specifics +# :code:`CPACK_RPM_XXX` variables. # +# :code:`CPACK_RPM__XXXX` variables may be used in order to have +# **component** specific values. Note however that ```` refers to the +# **grouping name** written in upper case. It may be either a component name or +# a component GROUP name. Usually those vars correspond to RPM spec file +# entities, one may find information about spec files here +# http://www.rpm.org/wiki/Docs +# +# .. note:: +# +# `` part of variables is prefered to be in upper case (for e.g. if +# component is named `foo` then use `CPACK_RPM_FOO_XXXX` variable name format) +# as is with other `CPACK__XXXX` variables. +# For the purposes of back compatibility (CMake/CPack version 3.5 and lower) +# support for same cased component (e.g. `fOo` would be used as +# `CPACK_RPM_fOo_XXXX`) is still supported for variables defined in older +# versions of CMake/CPack but is not guaranteed for variables that +# will be added in the future. For the sake of back compatibility same cased +# component variables also override upper cased versions where both are +# present. +# +# List of CPack/RPM specific variables: +# https://cmake.org/Wiki/CMake:CPackPackageGenerators#DEB_.28UNIX_only.29 . # However as a handy reminder here comes the list of specific variables: # # .. variable:: CPACK_RPM_PACKAGE_SUMMARY @@ -557,7 +567,7 @@ # invalid location. #============================================================================= -# Copyright 2007-2009 Kitware, Inc. +# Copyright 2007-2016 Kitware, Inc. # # Distributed under the OSI-approved BSD License (the "License"); # see accompanying file Copyright.txt for details. @@ -575,6 +585,8 @@ function(cpack_rpm_prepare_relocation_paths) # set appropriate prefix, remove possible trailing slash and convert backslashes to slashes if(CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_PREFIX) file(TO_CMAKE_PATH "${CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_PREFIX}" PATH_PREFIX) + elseif(CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT_UPPER}_PACKAGE_PREFIX) + file(TO_CMAKE_PATH "${CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT_UPPER}_PACKAGE_PREFIX}" PATH_PREFIX) else() file(TO_CMAKE_PATH "${CPACK_PACKAGING_INSTALL_PREFIX}" PATH_PREFIX) endif() @@ -585,7 +597,8 @@ function(cpack_rpm_prepare_relocation_paths) # set base path prefix if(EXISTS "${WDIR}/${PATH_PREFIX}") if(NOT CPACK_RPM_NO_INSTALL_PREFIX_RELOCATION AND - NOT CPACK_RPM_NO_${CPACK_RPM_PACKAGE_COMPONENT}_INSTALL_PREFIX_RELOCATION) + NOT CPACK_RPM_NO_${CPACK_RPM_PACKAGE_COMPONENT}_INSTALL_PREFIX_RELOCATION AND + NOT CPACK_RPM_NO_${CPACK_RPM_PACKAGE_COMPONENT_UPPER}_INSTALL_PREFIX_RELOCATION) set(TMP_RPM_PREFIXES "${TMP_RPM_PREFIXES}Prefix: ${PATH_PREFIX}\n") list(APPEND RPM_USED_PACKAGE_PREFIXES "${PATH_PREFIX}") @@ -1044,6 +1057,17 @@ if(NOT UNIX) message(FATAL_ERROR "CPackRPM.cmake may only be used under UNIX.") endif() +function(cpack_rpm_variable_fallback OUTPUT_VAR_NAME) + set(FALLBACK_VAR_NAMES ${ARGN}) + + foreach(variable_name IN LISTS FALLBACK_VAR_NAMES) + if(${variable_name}) + set(${OUTPUT_VAR_NAME} "${${variable_name}}" PARENT_SCOPE) + break() + endif() + endforeach() +endfunction() + function(cpack_rpm_generate_package) # rpmbuild is the basic command for building RPM package # it may be a simple (symbolic) link to rpm command. @@ -1124,12 +1148,10 @@ function(cpack_rpm_generate_package) # CPACK_RPM_PACKAGE_SUMMARY (mandatory) - #Check for component summary first. - #If not set, it will use regular package summary logic. if(CPACK_RPM_PACKAGE_COMPONENT) - if(CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_SUMMARY) - set(CPACK_RPM_PACKAGE_SUMMARY ${CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_SUMMARY}) - endif() + cpack_rpm_variable_fallback("CPACK_RPM_PACKAGE_SUMMARY" + "CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_SUMMARY" + "CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT_UPPER}_PACKAGE_SUMMARY") endif() if(NOT CPACK_RPM_PACKAGE_SUMMARY) @@ -1142,17 +1164,15 @@ function(cpack_rpm_generate_package) endif() # CPACK_RPM_PACKAGE_NAME (mandatory) - if(NOT CPACK_RPM_PACKAGE_NAME) string(TOLOWER "${CPACK_PACKAGE_NAME}" CPACK_RPM_PACKAGE_NAME) endif() if(CPACK_RPM_PACKAGE_COMPONENT) - if(CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_NAME) - set(CPACK_RPM_PACKAGE_NAME ${CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_NAME}) - else() - set(CPACK_RPM_PACKAGE_NAME ${CPACK_RPM_PACKAGE_NAME}-${CPACK_RPM_PACKAGE_COMPONENT}) - endif() + set(CPACK_RPM_PACKAGE_NAME "${CPACK_RPM_PACKAGE_NAME}-${CPACK_RPM_PACKAGE_COMPONENT}") + cpack_rpm_variable_fallback("CPACK_RPM_PACKAGE_NAME" + "CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_NAME" + "CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT_UPPER}_PACKAGE_NAME") endif() # CPACK_RPM_PACKAGE_VERSION (mandatory) @@ -1179,19 +1199,18 @@ function(cpack_rpm_generate_package) endif() endif() - set(_CPACK_RPM_PACKAGE_ARCHITECTURE ${CPACK_RPM_PACKAGE_ARCHITECTURE}) - - #prefer component architecture if(CPACK_RPM_PACKAGE_COMPONENT) - if(CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_ARCHITECTURE) - set(_CPACK_RPM_PACKAGE_ARCHITECTURE ${CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_ARCHITECTURE}) - if(CPACK_RPM_PACKAGE_DEBUG) - message("CPackRPM:Debug: using component build arch = ${_CPACK_RPM_PACKAGE_ARCHITECTURE}") - endif() + cpack_rpm_variable_fallback("CPACK_RPM_PACKAGE_ARCHITECTURE" + "CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_ARCHITECTURE" + "CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT_UPPER}_PACKAGE_ARCHITECTURE") + + if(CPACK_RPM_PACKAGE_DEBUG) + message("CPackRPM:Debug: using component build arch = ${CPACK_RPM_PACKAGE_ARCHITECTURE}") endif() endif() - if(${_CPACK_RPM_PACKAGE_ARCHITECTURE} STREQUAL "noarch") - set(TMP_RPM_BUILDARCH "Buildarch: ${_CPACK_RPM_PACKAGE_ARCHITECTURE}") + + if(${CPACK_RPM_PACKAGE_ARCHITECTURE} STREQUAL "noarch") + set(TMP_RPM_BUILDARCH "Buildarch: ${CPACK_RPM_PACKAGE_ARCHITECTURE}") else() set(TMP_RPM_BUILDARCH "") endif() @@ -1214,13 +1233,10 @@ function(cpack_rpm_generate_package) endif() # CPACK_RPM_PACKAGE_GROUP - - #Check for component group first. - #If not set, it will use regular package group logic. if(CPACK_RPM_PACKAGE_COMPONENT) - if(CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_GROUP) - set(CPACK_RPM_PACKAGE_GROUP ${CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_GROUP}) - endif() + cpack_rpm_variable_fallback("CPACK_RPM_PACKAGE_GROUP" + "CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_GROUP" + "CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT_UPPER}_PACKAGE_GROUP") endif() if(NOT CPACK_RPM_PACKAGE_GROUP) @@ -1247,14 +1263,11 @@ function(cpack_rpm_generate_package) # - set to a default value # - #Check for a component description first. - #If not set, it will use regular package description logic. if(CPACK_RPM_PACKAGE_COMPONENT) - if(CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_DESCRIPTION) - set(CPACK_RPM_PACKAGE_DESCRIPTION ${CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_DESCRIPTION}) - elseif(CPACK_COMPONENT_${CPACK_RPM_PACKAGE_COMPONENT_UPPER}_DESCRIPTION) - set(CPACK_RPM_PACKAGE_DESCRIPTION ${CPACK_COMPONENT_${CPACK_RPM_PACKAGE_COMPONENT_UPPER}_DESCRIPTION}) - endif() + cpack_rpm_variable_fallback("CPACK_RPM_PACKAGE_DESCRIPTION" + "CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_DESCRIPTION" + "CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT_UPPER}_PACKAGE_DESCRIPTION" + "CPACK_COMPONENT_${CPACK_RPM_PACKAGE_COMPONENT_UPPER}_DESCRIPTION") endif() if(NOT CPACK_RPM_PACKAGE_DESCRIPTION) @@ -1306,32 +1319,21 @@ function(cpack_rpm_generate_package) # If component specific var is not provided we use the global one # for each component foreach(_RPM_SPEC_HEADER URL REQUIRES SUGGESTS PROVIDES OBSOLETES PREFIX CONFLICTS AUTOPROV AUTOREQ AUTOREQPROV REQUIRES_PRE REQUIRES_POST REQUIRES_PREUN REQUIRES_POSTUN) + if(CPACK_RPM_PACKAGE_DEBUG) + message("CPackRPM:Debug: processing ${_RPM_SPEC_HEADER}") + endif() + if(CPACK_RPM_PACKAGE_COMPONENT) + cpack_rpm_variable_fallback("CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}" + "CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_${_RPM_SPEC_HEADER}" + "CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT_UPPER}_PACKAGE_${_RPM_SPEC_HEADER}") + endif() + + if(DEFINED CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}) if(CPACK_RPM_PACKAGE_DEBUG) - message("CPackRPM:Debug: processing ${_RPM_SPEC_HEADER}") - endif() - if(CPACK_RPM_PACKAGE_COMPONENT) - if(DEFINED CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_${_RPM_SPEC_HEADER}) - if(CPACK_RPM_PACKAGE_DEBUG) - message("CPackRPM:Debug: using CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_${_RPM_SPEC_HEADER}") - endif() - set(CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}_TMP ${CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_${_RPM_SPEC_HEADER}}) - else() - if(DEFINED CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}) - if(CPACK_RPM_PACKAGE_DEBUG) - message("CPackRPM:Debug: CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PACKAGE_${_RPM_SPEC_HEADER} not defined") - message("CPackRPM:Debug: using CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}") - endif() - set(CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}_TMP ${CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}}) - endif() - endif() - else() - if(DEFINED CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}) - if(CPACK_RPM_PACKAGE_DEBUG) - message("CPackRPM:Debug: using CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}") - endif() - set(CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}_TMP ${CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}}) - endif() + message("CPackRPM:Debug: using CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}") endif() + set(CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}_TMP ${CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}}) + endif() # Treat the RPM Spec keyword iff it has been properly defined if(DEFINED CPACK_RPM_PACKAGE_${_RPM_SPEC_HEADER}_TMP) @@ -1373,94 +1375,38 @@ function(cpack_rpm_generate_package) # May be used to embed a post (un)installation script in the spec file. # The refered script file(s) will be read and directly # put after the %post or %postun section - if(CPACK_RPM_PACKAGE_COMPONENT) - if(CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_POST_INSTALL_SCRIPT_FILE) - set(CPACK_RPM_POST_INSTALL_READ_FILE ${CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_POST_INSTALL_SCRIPT_FILE}) - else() - set(CPACK_RPM_POST_INSTALL_READ_FILE ${CPACK_RPM_POST_INSTALL_SCRIPT_FILE}) - endif() - if(CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_POST_UNINSTALL_SCRIPT_FILE) - set(CPACK_RPM_POST_UNINSTALL_READ_FILE ${CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_POST_UNINSTALL_SCRIPT_FILE}) - else() - set(CPACK_RPM_POST_UNINSTALL_READ_FILE ${CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE}) - endif() - else() - set(CPACK_RPM_POST_INSTALL_READ_FILE ${CPACK_RPM_POST_INSTALL_SCRIPT_FILE}) - set(CPACK_RPM_POST_UNINSTALL_READ_FILE ${CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE}) - endif() - - # Handle post-install file if it has been specified - if(CPACK_RPM_POST_INSTALL_READ_FILE) - if(EXISTS ${CPACK_RPM_POST_INSTALL_READ_FILE}) - file(READ ${CPACK_RPM_POST_INSTALL_READ_FILE} CPACK_RPM_SPEC_POSTINSTALL) - else() - message("CPackRPM:Warning: CPACK_RPM_POST_INSTALL_SCRIPT_FILE <${CPACK_RPM_POST_INSTALL_READ_FILE}> does not exists - ignoring") - endif() - else() - # reset SPEC var value if no post install file has been specified - # (either globally or component-wise) - set(CPACK_RPM_SPEC_POSTINSTALL "") - endif() - - # Handle post-uninstall file if it has been specified - if(CPACK_RPM_POST_UNINSTALL_READ_FILE) - if(EXISTS ${CPACK_RPM_POST_UNINSTALL_READ_FILE}) - file(READ ${CPACK_RPM_POST_UNINSTALL_READ_FILE} CPACK_RPM_SPEC_POSTUNINSTALL) - else() - message("CPackRPM:Warning: CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE <${CPACK_RPM_POST_UNINSTALL_READ_FILE}> does not exists - ignoring") - endif() - else() - # reset SPEC var value if no post uninstall file has been specified - # (either globally or component-wise) - set(CPACK_RPM_SPEC_POSTUNINSTALL "") - endif() - + # ---------------------------------------------------------------- # 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 # put after the %pre or %preun section - if(CPACK_RPM_PACKAGE_COMPONENT) - if(CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PRE_INSTALL_SCRIPT_FILE) - set(CPACK_RPM_PRE_INSTALL_READ_FILE ${CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PRE_INSTALL_SCRIPT_FILE}) - else() - set(CPACK_RPM_PRE_INSTALL_READ_FILE ${CPACK_RPM_PRE_INSTALL_SCRIPT_FILE}) - endif() - if(CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PRE_UNINSTALL_SCRIPT_FILE) - set(CPACK_RPM_PRE_UNINSTALL_READ_FILE ${CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_PRE_UNINSTALL_SCRIPT_FILE}) - else() - set(CPACK_RPM_PRE_UNINSTALL_READ_FILE ${CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE}) - endif() - else() - set(CPACK_RPM_PRE_INSTALL_READ_FILE ${CPACK_RPM_PRE_INSTALL_SCRIPT_FILE}) - set(CPACK_RPM_PRE_UNINSTALL_READ_FILE ${CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE}) - endif() + foreach(RPM_SCRIPT_FILE_TYPE_ "INSTALL" "UNINSTALL") + foreach(RPM_SCRIPT_FILE_TIME_ "PRE" "POST") + set("CPACK_RPM_${RPM_SCRIPT_FILE_TIME_}_${RPM_SCRIPT_FILE_TYPE_}_READ_FILE" + "${CPACK_RPM_${RPM_SCRIPT_FILE_TIME_}_${RPM_SCRIPT_FILE_TYPE_}_SCRIPT_FILE}") - # Handle pre-install file if it has been specified - if(CPACK_RPM_PRE_INSTALL_READ_FILE) - if(EXISTS ${CPACK_RPM_PRE_INSTALL_READ_FILE}) - file(READ ${CPACK_RPM_PRE_INSTALL_READ_FILE} CPACK_RPM_SPEC_PREINSTALL) - else() - message("CPackRPM:Warning: CPACK_RPM_PRE_INSTALL_SCRIPT_FILE <${CPACK_RPM_PRE_INSTALL_READ_FILE}> does not exists - ignoring") - endif() - else() - # reset SPEC var value if no pre-install file has been specified - # (either globally or component-wise) - set(CPACK_RPM_SPEC_PREINSTALL "") - endif() + if(CPACK_RPM_PACKAGE_COMPONENT) + cpack_rpm_variable_fallback("CPACK_RPM_${RPM_SCRIPT_FILE_TIME_}_${RPM_SCRIPT_FILE_TYPE_}_READ_FILE" + "CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_${RPM_SCRIPT_FILE_TIME_}_${RPM_SCRIPT_FILE_TYPE_}_SCRIPT_FILE" + "CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT_UPPER}_${RPM_SCRIPT_FILE_TIME_}_${RPM_SCRIPT_FILE_TYPE_}_SCRIPT_FILE") + endif() - # Handle pre-uninstall file if it has been specified - if(CPACK_RPM_PRE_UNINSTALL_READ_FILE) - if(EXISTS ${CPACK_RPM_PRE_UNINSTALL_READ_FILE}) - file(READ ${CPACK_RPM_PRE_UNINSTALL_READ_FILE} CPACK_RPM_SPEC_PREUNINSTALL) - else() - message("CPackRPM:Warning: CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE <${CPACK_RPM_PRE_UNINSTALL_READ_FILE}> does not exists - ignoring") - endif() - else() - # reset SPEC var value if no pre-uninstall file has been specified - # (either globally or component-wise) - set(CPACK_RPM_SPEC_PREUNINSTALL "") - endif() + # Handle file if it has been specified + if(CPACK_RPM_${RPM_SCRIPT_FILE_TIME_}_${RPM_SCRIPT_FILE_TYPE_}_READ_FILE) + if(EXISTS ${CPACK_RPM_${RPM_SCRIPT_FILE_TIME_}_${RPM_SCRIPT_FILE_TYPE_}_READ_FILE}) + file(READ ${CPACK_RPM_${RPM_SCRIPT_FILE_TIME_}_${RPM_SCRIPT_FILE_TYPE_}_READ_FILE} + "CPACK_RPM_SPEC_${RPM_SCRIPT_FILE_TIME_}${RPM_SCRIPT_FILE_TYPE_}") + else() + message("CPackRPM:Warning: CPACK_RPM_${RPM_SCRIPT_FILE_TIME_}_${RPM_SCRIPT_FILE_TYPE_}_SCRIPT_FILE <${CPACK_RPM_${RPM_SCRIPT_FILE_TIME_}_${RPM_SCRIPT_FILE_TYPE_}_READ_FILE}> does not exists - ignoring") + endif() + else() + # reset SPEC var value if no file has been specified + # (either globally or component-wise) + set("CPACK_RPM_SPEC_${RPM_SCRIPT_FILE_TIME_}${RPM_SCRIPT_FILE_TYPE_}" "") + endif() + endforeach() + endforeach() # CPACK_RPM_CHANGELOG_FILE # May be used to embed a changelog in the spec file. @@ -1495,7 +1441,7 @@ function(cpack_rpm_generate_package) file(MAKE_DIRECTORY ${CPACK_RPM_ROOTDIR}/SPECS) file(MAKE_DIRECTORY ${CPACK_RPM_ROOTDIR}/SRPMS) - #set(CPACK_RPM_FILE_NAME "${CPACK_RPM_PACKAGE_NAME}-${CPACK_RPM_PACKAGE_VERSION}-${CPACK_RPM_PACKAGE_RELEASE}-${_CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm") + #set(CPACK_RPM_FILE_NAME "${CPACK_RPM_PACKAGE_NAME}-${CPACK_RPM_PACKAGE_VERSION}-${CPACK_RPM_PACKAGE_RELEASE}-${CPACK_RPM_PACKAGE_ARCHITECTURE}.rpm") set(CPACK_RPM_FILE_NAME "${CPACK_OUTPUT_FILE_NAME}") # it seems rpmbuild can't handle spaces in the path # neither escaping (as below) nor putting quotes around the path seem to help @@ -1510,12 +1456,14 @@ function(cpack_rpm_generate_package) # This must be done BEFORE the CPACK_ABSOLUTE_DESTINATION_FILES_INTERNAL handling if(CPACK_RPM_PACKAGE_COMPONENT) if(CPACK_ABSOLUTE_DESTINATION_FILES) - set(COMPONENT_FILES_TAG "CPACK_ABSOLUTE_DESTINATION_FILES_${CPACK_RPM_PACKAGE_COMPONENT}") - set(CPACK_ABSOLUTE_DESTINATION_FILES_INTERNAL "${${COMPONENT_FILES_TAG}}") - if(CPACK_RPM_PACKAGE_DEBUG) - message("CPackRPM:Debug: Handling Absolute Destination Files: <${CPACK_ABSOLUTE_DESTINATION_FILES_INTERNAL}>") - message("CPackRPM:Debug: in component = ${CPACK_RPM_PACKAGE_COMPONENT}") - endif() + cpack_rpm_variable_fallback("COMPONENT_FILES_TAG" + "CPACK_ABSOLUTE_DESTINATION_FILES_${CPACK_RPM_PACKAGE_COMPONENT}" + "CPACK_ABSOLUTE_DESTINATION_FILES_${CPACK_RPM_PACKAGE_COMPONENT_UPPER}") + set(CPACK_ABSOLUTE_DESTINATION_FILES_INTERNAL "${${COMPONENT_FILES_TAG}}") + if(CPACK_RPM_PACKAGE_DEBUG) + message("CPackRPM:Debug: Handling Absolute Destination Files: <${CPACK_ABSOLUTE_DESTINATION_FILES_INTERNAL}>") + message("CPackRPM:Debug: in component = ${CPACK_RPM_PACKAGE_COMPONENT}") + endif() endif() else() if(CPACK_ABSOLUTE_DESTINATION_FILES) @@ -1524,22 +1472,18 @@ function(cpack_rpm_generate_package) endif() # In component case, set CPACK_RPM_USER_FILELIST_INTERNAL with CPACK_RPM__USER_FILELIST. + set(CPACK_RPM_USER_FILELIST_INTERNAL "") if(CPACK_RPM_PACKAGE_COMPONENT) - if(CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_USER_FILELIST) - set(CPACK_RPM_USER_FILELIST_INTERNAL ${CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_USER_FILELIST}) - if(CPACK_RPM_PACKAGE_DEBUG) - message("CPackRPM:Debug: Handling User Filelist: <${CPACK_RPM_USER_FILELIST_INTERNAL}>") - message("CPackRPM:Debug: in component = ${CPACK_RPM_PACKAGE_COMPONENT}") - endif() - else() - set(CPACK_RPM_USER_FILELIST_INTERNAL "") - endif() - else() - if(CPACK_RPM_USER_FILELIST) - set(CPACK_RPM_USER_FILELIST_INTERNAL "${CPACK_RPM_USER_FILELIST}") - else() - set(CPACK_RPM_USER_FILELIST_INTERNAL "") + cpack_rpm_variable_fallback("CPACK_RPM_USER_FILELIST_INTERNAL" + "CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_USER_FILELIST" + "CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT_UPPER}_USER_FILELIST") + + if(CPACK_RPM_PACKAGE_DEBUG AND CPACK_RPM_USER_FILELIST_INTERNAL) + message("CPackRPM:Debug: Handling User Filelist: <${CPACK_RPM_USER_FILELIST_INTERNAL}>") + message("CPackRPM:Debug: in component = ${CPACK_RPM_PACKAGE_COMPONENT}") endif() + elseif(CPACK_RPM_USER_FILELIST) + set(CPACK_RPM_USER_FILELIST_INTERNAL "${CPACK_RPM_USER_FILELIST}") endif() # Handle user specified file line list in CPACK_RPM_USER_FILELIST_INTERNAL @@ -1578,7 +1522,6 @@ function(cpack_rpm_generate_package) if (CPACK_ABSOLUTE_DESTINATION_FILES_INTERNAL) list(REMOVE_ITEM CPACK_ABSOLUTE_DESTINATION_FILES_INTERNAL ${F_PATH}) endif() - endforeach() # Rebuild CPACK_RPM_INSTALL_FILES @@ -1650,8 +1593,10 @@ function(cpack_rpm_generate_package) # # We can have a component specific spec file. - if(CPACK_RPM_PACKAGE_COMPONENT AND CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_USER_BINARY_SPECFILE) - set(CPACK_RPM_USER_BINARY_SPECFILE ${CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_USER_BINARY_SPECFILE}) + if(CPACK_RPM_PACKAGE_COMPONENT) + cpack_rpm_variable_fallback("CPACK_RPM_USER_BINARY_SPECFILE" + "CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT}_USER_BINARY_SPECFILE" + "CPACK_RPM_${CPACK_RPM_PACKAGE_COMPONENT_UPPER}_USER_BINARY_SPECFILE") endif() # We should generate a USER spec file template: @@ -1762,7 +1707,7 @@ mv \"\@CPACK_TOPLEVEL_DIRECTORY\@/tmpBBroot\" $RPM_BUILD_ROOT COMMAND "${RPMBUILD_EXECUTABLE}" -bb --define "_topdir ${CPACK_RPM_DIRECTORY}" --buildroot "${CPACK_RPM_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}${CPACK_RPM_PACKAGE_COMPONENT_PART_PATH}" - --target "${_CPACK_RPM_PACKAGE_ARCHITECTURE}" + --target "${CPACK_RPM_PACKAGE_ARCHITECTURE}" "${CPACK_RPM_BINARY_SPECFILE}" WORKING_DIRECTORY "${CPACK_TOPLEVEL_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}${CPACK_RPM_PACKAGE_COMPONENT_PART_PATH}" RESULT_VARIABLE CPACK_RPMBUILD_EXEC_RESULT diff --git a/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in b/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in index ac9b552..0f2b774 100644 --- a/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in +++ b/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in @@ -14,24 +14,24 @@ if(CPACK_GENERATOR MATCHES "RPM") set(CPACK_PACKAGING_INSTALL_PREFIX "/usr/foo/bar") # test requires - set(CPACK_RPM_applications_PACKAGE_REQUIRES "mylib-libraries") + set(CPACK_RPM_APPLICATIONS_PACKAGE_REQUIRES "mylib-libraries") # test a "noarch" rpm - set(CPACK_RPM_headers_PACKAGE_ARCHITECTURE "noarch") + set(CPACK_RPM_HEADERS_PACKAGE_ARCHITECTURE "noarch") # test cross-built rpm - set(CPACK_RPM_applications_PACKAGE_ARCHITECTURE "armv7hf") + set(CPACK_RPM_APPLICATIONS_PACKAGE_ARCHITECTURE "armv7hf") # test package summary override - headers rpm is generated in the middle set(CPACK_RPM_PACKAGE_SUMMARY "default summary") - set(CPACK_RPM_headers_PACKAGE_SUMMARY "headers summary") + set(CPACK_RPM_HEADERS_PACKAGE_SUMMARY "headers summary") # test package description override - headers rpm is generated in the middle - set(CPACK_RPM_headers_PACKAGE_DESCRIPTION "headers description") + set(CPACK_RPM_HEADERS_PACKAGE_DESCRIPTION "headers description") # test package do not use CPACK_PACKAGING_INSTALL_PREFIX # as relocation path - set(CPACK_RPM_NO_libraries_INSTALL_PREFIX_RELOCATION true) + set(CPACK_RPM_NO_LIBRARIES_INSTALL_PREFIX_RELOCATION true) endif() if(CPACK_GENERATOR MATCHES "DEB") diff --git a/Tests/CPackComponentsForAll/MyLibCPackConfig-OnePackPerGroup.cmake.in b/Tests/CPackComponentsForAll/MyLibCPackConfig-OnePackPerGroup.cmake.in index 60bdd06..ac65dc9 100644 --- a/Tests/CPackComponentsForAll/MyLibCPackConfig-OnePackPerGroup.cmake.in +++ b/Tests/CPackComponentsForAll/MyLibCPackConfig-OnePackPerGroup.cmake.in @@ -7,7 +7,7 @@ endif() if(CPACK_GENERATOR MATCHES "RPM") set(CPACK_RPM_COMPONENT_INSTALL "ON") - set(CPACK_RPM_Development_PACKAGE_REQUIRES "mylib-Runtime") + set(CPACK_RPM_DEVELOPMENT_PACKAGE_REQUIRES "mylib-Runtime") endif() if(CPACK_GENERATOR MATCHES "DEB") diff --git a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake index d94a477..34b9c82 100644 --- a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake +++ b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake @@ -136,8 +136,8 @@ if(CPackGen MATCHES "RPM") endif() set(CPACK_RPM_PACKAGE_SUMMARY "default summary") - set(CPACK_RPM_headers_PACKAGE_SUMMARY "headers summary") - set(CPACK_RPM_headers_PACKAGE_DESCRIPTION "headers description") + set(CPACK_RPM_HEADERS_PACKAGE_SUMMARY "headers summary") + set(CPACK_RPM_HEADERS_PACKAGE_DESCRIPTION "headers description") set(CPACK_COMPONENT_APPLICATIONS_DESCRIPTION "An extremely useful application that makes use of MyLib") set(CPACK_COMPONENT_LIBRARIES_DESCRIPTION @@ -206,8 +206,8 @@ if(CPackGen MATCHES "RPM") /usr/foo/bar/other_relocatable /usr/foo/bar/other_relocatable/depth_two$") elseif(check_file_headers_match) - set(check_file_match_expected_summary ".*${CPACK_RPM_headers_PACKAGE_SUMMARY}.*") - set(check_file_match_expected_description ".*${CPACK_RPM_headers_PACKAGE_DESCRIPTION}.*") + set(check_file_match_expected_summary ".*${CPACK_RPM_HEADERS_PACKAGE_SUMMARY}.*") + set(check_file_match_expected_description ".*${CPACK_RPM_HEADERS_PACKAGE_DESCRIPTION}.*") set(check_file_match_expected_relocation_path "Relocations${whitespaces}:${whitespaces}${CPACK_PACKAGING_INSTALL_PREFIX}${whitespaces}${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}") set(check_file_match_expected_architecture "noarch") set(spec_regex "*headers*") diff --git a/Tests/RunCMake/CPack/INSTALL_SCRIPTS.cmake b/Tests/RunCMake/CPack/INSTALL_SCRIPTS.cmake new file mode 100644 index 0000000..13aa77b --- /dev/null +++ b/Tests/RunCMake/CPack/INSTALL_SCRIPTS.cmake @@ -0,0 +1,26 @@ +set(CMAKE_BUILD_WITH_INSTALL_RPATH 1) + +# default +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/pre_install.sh" + "echo \"pre install\"\n") +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/post_install.sh" + "echo \"post install\"\n") +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/pre_uninstall.sh" + "echo \"pre uninstall\"\n") +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/post_uninstall.sh" + "echo \"post uninstall\"\n") + +# specific +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/pre_install_foo.sh" + "echo \"pre install foo\"\n") +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/post_install_foo.sh" + "echo \"post install foo\"\n") +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/pre_uninstall_foo.sh" + "echo \"pre uninstall foo\"\n") +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/post_uninstall_foo.sh" + "echo \"post uninstall foo\"\n") + +install(FILES CMakeLists.txt DESTINATION foo COMPONENT foo) +install(FILES CMakeLists.txt DESTINATION bar COMPONENT bar) + +set(CPACK_PACKAGE_NAME "install_scripts") diff --git a/Tests/RunCMake/CPack/RPM/DEPENDENCIES-specifics.cmake b/Tests/RunCMake/CPack/RPM/DEPENDENCIES-specifics.cmake index 2cdfece..8b7fb1e 100644 --- a/Tests/RunCMake/CPack/RPM/DEPENDENCIES-specifics.cmake +++ b/Tests/RunCMake/CPack/RPM/DEPENDENCIES-specifics.cmake @@ -4,19 +4,19 @@ set(CPACK_RPM_COMPONENT_INSTALL "ON") # does not use them correctly: https://bugs.launchpad.net/rpm/+bug/1475755 set(CPACK_RPM_PACKAGE_AUTOREQ "no") set(CPACK_RPM_PACKAGE_AUTOPROV "no") -set(CPACK_RPM_applications_auto_PACKAGE_AUTOREQPROV "yes") -set(CPACK_RPM_libs_auto_PACKAGE_AUTOREQPROV "yes") +set(CPACK_RPM_APPLICATIONS_AUTO_PACKAGE_AUTOREQPROV "yes") +set(CPACK_RPM_LIBS_AUTO_PACKAGE_AUTOREQPROV "yes") set(CPACK_RPM_PACKAGE_REQUIRES "depend-default, depend-default-b") -set(CPACK_RPM_applications_PACKAGE_REQUIRES "depend-application, depend-application-b") -set(CPACK_RPM_applications_auto_PACKAGE_REQUIRES "depend-application, depend-application-b") -set(CPACK_RPM_headers_PACKAGE_REQUIRES "depend-headers") +set(CPACK_RPM_APPLICATIONS_PACKAGE_REQUIRES "depend-application, depend-application-b") +set(CPACK_RPM_APPLICATIONS_AUTO_PACKAGE_REQUIRES "depend-application, depend-application-b") +set(CPACK_RPM_HEADERS_PACKAGE_REQUIRES "depend-headers") set(CPACK_RPM_PACKAGE_CONFLICTS "conflict-default, conflict-default-b") -set(CPACK_RPM_applications_PACKAGE_CONFLICTS "conflict-application, conflict-application-b") -set(CPACK_RPM_applications_auto_PACKAGE_CONFLICTS "conflict-application, conflict-application-b") -set(CPACK_RPM_headers_PACKAGE_CONFLICTS "conflict-headers") +set(CPACK_RPM_APPLICATIONS_PACKAGE_CONFLICTS "conflict-application, conflict-application-b") +set(CPACK_RPM_APPLICATIONS_AUTO_PACKAGE_CONFLICTS "conflict-application, conflict-application-b") +set(CPACK_RPM_HEADERS_PACKAGE_CONFLICTS "conflict-headers") set(CPACK_RPM_PACKAGE_PROVIDES "provided-default, provided-default-b") -set(CPACK_RPM_libs_PACKAGE_PROVIDES "provided-lib") -set(CPACK_RPM_libs_auto_PACKAGE_PROVIDES "provided-lib_auto, provided-lib_auto-b") +set(CPACK_RPM_LIBS_PACKAGE_PROVIDES "provided-lib") +set(CPACK_RPM_LIBS_AUTO_PACKAGE_PROVIDES "provided-lib_auto, provided-lib_auto-b") diff --git a/Tests/RunCMake/CPack/RPM/INSTALL_SCRIPTS-ExpectedFiles.cmake b/Tests/RunCMake/CPack/RPM/INSTALL_SCRIPTS-ExpectedFiles.cmake new file mode 100644 index 0000000..033a45d --- /dev/null +++ b/Tests/RunCMake/CPack/RPM/INSTALL_SCRIPTS-ExpectedFiles.cmake @@ -0,0 +1,7 @@ +set(whitespaces_ "[\t\n\r ]*") + +set(EXPECTED_FILES_COUNT "2") +set(EXPECTED_FILE_1 "install_scripts*-foo.rpm") +set(EXPECTED_FILE_CONTENT_1 "^/usr/foo${whitespaces_}/usr/foo/CMakeLists.txt$") +set(EXPECTED_FILE_2 "install_scripts*-bar.rpm") +set(EXPECTED_FILE_CONTENT_2 "^/usr/bar${whitespaces_}/usr/bar/CMakeLists.txt$") diff --git a/Tests/RunCMake/CPack/RPM/INSTALL_SCRIPTS-VerifyResult.cmake b/Tests/RunCMake/CPack/RPM/INSTALL_SCRIPTS-VerifyResult.cmake new file mode 100644 index 0000000..d7d82f2 --- /dev/null +++ b/Tests/RunCMake/CPack/RPM/INSTALL_SCRIPTS-VerifyResult.cmake @@ -0,0 +1,29 @@ +function(checkScripts_ FILE COMPARE_LIST) + set(whitespaces_ "[\t\n\r ]*") + + execute_process(COMMAND ${RPM_EXECUTABLE} -qp --scripts ${FILE} + WORKING_DIRECTORY "${CPACK_TEMPORARY_DIRECTORY}" + OUTPUT_VARIABLE FILE_SCRIPTS_ + ERROR_QUIET + OUTPUT_STRIP_TRAILING_WHITESPACE) + + string(REPLACE "\n" ";" FILE_SCRIPTS_LIST_ "${FILE_SCRIPTS_}") + + foreach(COMPARE_REGEX_ IN LISTS COMPARE_LIST) + unset(FOUND_) + + foreach(COMPARE_ IN LISTS FILE_SCRIPTS_LIST_) + if(COMPARE_ MATCHES "${COMPARE_REGEX_}") + set(FOUND_ true) + break() + endif() + endforeach() + + if(NOT FOUND_) + message(FATAL_ERROR "Missing scripts in '${FILE}'; file info: '${FILE_SCRIPTS_}'; missing: '${COMPARE_REGEX_}'") + endif() + endforeach() +endfunction() + +checkScripts_("${FOUND_FILE_1}" "echo \"pre install foo\";echo \"post install foo\";echo \"pre uninstall foo\";echo \"post uninstall foo\"") +checkScripts_("${FOUND_FILE_2}" "echo \"pre install\";echo \"post install\";echo \"pre uninstall\";echo \"post uninstall\"") diff --git a/Tests/RunCMake/CPack/RPM/INSTALL_SCRIPTS-specifics.cmake b/Tests/RunCMake/CPack/RPM/INSTALL_SCRIPTS-specifics.cmake new file mode 100644 index 0000000..4eb53c3 --- /dev/null +++ b/Tests/RunCMake/CPack/RPM/INSTALL_SCRIPTS-specifics.cmake @@ -0,0 +1,19 @@ +set(CPACK_RPM_COMPONENT_INSTALL "ON") + +set(CPACK_RPM_PRE_INSTALL_SCRIPT_FILE + "${CMAKE_CURRENT_BINARY_DIR}/pre_install.sh") +set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE + "${CMAKE_CURRENT_BINARY_DIR}/post_install.sh") +set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE + "${CMAKE_CURRENT_BINARY_DIR}/pre_uninstall.sh") +set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE + "${CMAKE_CURRENT_BINARY_DIR}/post_uninstall.sh") + +set(CPACK_RPM_foo_PRE_INSTALL_SCRIPT_FILE + "${CMAKE_CURRENT_BINARY_DIR}/pre_install_foo.sh") +set(CPACK_RPM_foo_POST_INSTALL_SCRIPT_FILE + "${CMAKE_CURRENT_BINARY_DIR}/post_install_foo.sh") +set(CPACK_RPM_foo_PRE_UNINSTALL_SCRIPT_FILE + "${CMAKE_CURRENT_BINARY_DIR}/pre_uninstall_foo.sh") +set(CPACK_RPM_foo_POST_UNINSTALL_SCRIPT_FILE + "${CMAKE_CURRENT_BINARY_DIR}/post_uninstall_foo.sh") diff --git a/Tests/RunCMake/CPack/RPM/PER_COMPONENT_FIELDS-specifics.cmake b/Tests/RunCMake/CPack/RPM/PER_COMPONENT_FIELDS-specifics.cmake index d398168..524ef0c 100644 --- a/Tests/RunCMake/CPack/RPM/PER_COMPONENT_FIELDS-specifics.cmake +++ b/Tests/RunCMake/CPack/RPM/PER_COMPONENT_FIELDS-specifics.cmake @@ -1,5 +1,5 @@ set(CPACK_RPM_COMPONENT_INSTALL "ON") set(CPACK_RPM_PACKAGE_GROUP "default") -set(CPACK_RPM_pkg_2_PACKAGE_NAME "second") -set(CPACK_RPM_pkg_2_PACKAGE_GROUP "second_group") +set(CPACK_RPM_PKG_2_PACKAGE_NAME "second") +set(CPACK_RPM_PKG_2_PACKAGE_GROUP "second_group") diff --git a/Tests/RunCMake/CPack/RunCMakeTest.cmake b/Tests/RunCMake/CPack/RunCMakeTest.cmake index fe2b48b..ee4112d 100644 --- a/Tests/RunCMake/CPack/RunCMakeTest.cmake +++ b/Tests/RunCMake/CPack/RunCMakeTest.cmake @@ -11,3 +11,4 @@ run_cpack_test(DEPENDENCIES "RPM;DEB" true) run_cpack_test(EMPTY_DIR "RPM;DEB;TGZ" true) run_cpack_test(COMPONENTS_EMPTY_DIR "RPM;DEB;TGZ" true) run_cpack_test(PER_COMPONENT_FIELDS "RPM;DEB" false) +run_cpack_test(INSTALL_SCRIPTS "RPM" false) ----------------------------------------------------------------------- Summary of changes: .../dev/cpack-rpm-upper-cased-components.rst | 15 + Modules/CPackRPM.cmake | 311 ++++++++------------ .../MyLibCPackConfig-IgnoreGroup.cmake.in | 12 +- .../MyLibCPackConfig-OnePackPerGroup.cmake.in | 2 +- .../RunCPackVerifyResult.cmake | 8 +- Tests/RunCMake/CPack/INSTALL_SCRIPTS.cmake | 26 ++ .../CPack/RPM/DEPENDENCIES-specifics.cmake | 20 +- .../CPack/RPM/INSTALL_SCRIPTS-ExpectedFiles.cmake | 7 + .../CPack/RPM/INSTALL_SCRIPTS-VerifyResult.cmake | 29 ++ .../CPack/RPM/INSTALL_SCRIPTS-specifics.cmake | 19 ++ .../CPack/RPM/PER_COMPONENT_FIELDS-specifics.cmake | 4 +- Tests/RunCMake/CPack/RunCMakeTest.cmake | 1 + 12 files changed, 248 insertions(+), 206 deletions(-) create mode 100644 Help/release/dev/cpack-rpm-upper-cased-components.rst create mode 100644 Tests/RunCMake/CPack/INSTALL_SCRIPTS.cmake create mode 100644 Tests/RunCMake/CPack/RPM/INSTALL_SCRIPTS-ExpectedFiles.cmake create mode 100644 Tests/RunCMake/CPack/RPM/INSTALL_SCRIPTS-VerifyResult.cmake create mode 100644 Tests/RunCMake/CPack/RPM/INSTALL_SCRIPTS-specifics.cmake hooks/post-receive -- CMake From kwrobot at kitware.com Sat Feb 13 00:01:12 2016 From: kwrobot at kitware.com (Kitware Robot) Date: Sat, 13 Feb 2016 00:01:12 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc2-66-gdec7d5c Message-ID: <20160213050112.55A7CE4F13@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 dec7d5c4de7870ecc4396eababe1edba20d8cbd2 (commit) from 86d2f3252591f413e57a623e297911bbf03b481e (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=dec7d5c4de7870ecc4396eababe1edba20d8cbd2 commit dec7d5c4de7870ecc4396eababe1edba20d8cbd2 Author: Kitware Robot AuthorDate: Sat Feb 13 00:01:09 2016 -0500 Commit: Kitware Robot CommitDate: Sat Feb 13 00:01:09 2016 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index df07c51..b20ca19 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 5) -set(CMake_VERSION_PATCH 20160212) +set(CMake_VERSION_PATCH 20160213) #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 Feb 14 00:01:06 2016 From: kwrobot at kitware.com (Kitware Robot) Date: Sun, 14 Feb 2016 00:01:06 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc2-67-g7534a4d Message-ID: <20160214050106.C4BACE561F@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 7534a4d5672265b458b2fb5ca890b929b325e563 (commit) from dec7d5c4de7870ecc4396eababe1edba20d8cbd2 (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=7534a4d5672265b458b2fb5ca890b929b325e563 commit 7534a4d5672265b458b2fb5ca890b929b325e563 Author: Kitware Robot AuthorDate: Sun Feb 14 00:01:03 2016 -0500 Commit: Kitware Robot CommitDate: Sun Feb 14 00:01:03 2016 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index b20ca19..d1ee7f6 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 5) -set(CMake_VERSION_PATCH 20160213) +set(CMake_VERSION_PATCH 20160214) #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 Feb 15 00:01:08 2016 From: kwrobot at kitware.com (Kitware Robot) Date: Mon, 15 Feb 2016 00:01:08 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc2-68-gf03cb19 Message-ID: <20160215050108.91943E54D6@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 f03cb192e9e0d954f313b7fe3f6825d13a68a1ef (commit) from 7534a4d5672265b458b2fb5ca890b929b325e563 (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=f03cb192e9e0d954f313b7fe3f6825d13a68a1ef commit f03cb192e9e0d954f313b7fe3f6825d13a68a1ef Author: Kitware Robot AuthorDate: Mon Feb 15 00:01:04 2016 -0500 Commit: Kitware Robot CommitDate: Mon Feb 15 00:01:04 2016 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index d1ee7f6..58d91cc 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 5) -set(CMake_VERSION_PATCH 20160214) +set(CMake_VERSION_PATCH 20160215) #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 Tue Feb 16 00:01:06 2016 From: kwrobot at kitware.com (Kitware Robot) Date: Tue, 16 Feb 2016 00:01:06 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc2-69-g28126b8 Message-ID: <20160216050106.51E1DE57B2@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 28126b8927353cb7da183ee61faea9bf7271b676 (commit) from f03cb192e9e0d954f313b7fe3f6825d13a68a1ef (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=28126b8927353cb7da183ee61faea9bf7271b676 commit 28126b8927353cb7da183ee61faea9bf7271b676 Author: Kitware Robot AuthorDate: Tue Feb 16 00:01:03 2016 -0500 Commit: Kitware Robot CommitDate: Tue Feb 16 00:01:03 2016 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 58d91cc..d81477a 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 5) -set(CMake_VERSION_PATCH 20160215) +set(CMake_VERSION_PATCH 20160216) #set(CMake_VERSION_RC 1) ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Tue Feb 16 09:52:27 2016 From: brad.king at kitware.com (Brad King) Date: Tue, 16 Feb 2016 09:52:27 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc2-71-gc0a0c7d Message-ID: <20160216145227.649F8E565C@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 c0a0c7d3f226943818c0152bbcb9a0d026c3274e (commit) via 46fa9583624b3dd2b2dad978cb0313b78eae5f53 (commit) from 28126b8927353cb7da183ee61faea9bf7271b676 (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=c0a0c7d3f226943818c0152bbcb9a0d026c3274e commit c0a0c7d3f226943818c0152bbcb9a0d026c3274e Merge: 28126b8 46fa958 Author: Brad King AuthorDate: Tue Feb 16 09:52:25 2016 -0500 Commit: CMake Topic Stage CommitDate: Tue Feb 16 09:52:25 2016 -0500 Merge topic 'ninja-deterministic-gen' 46fa9583 Ninja: Fix non-determinism in generated target dependency order (#15968) ----------------------------------------------------------------------- Summary of changes: Source/cmGlobalNinjaGenerator.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Tue Feb 16 09:52:29 2016 From: brad.king at kitware.com (Brad King) Date: Tue, 16 Feb 2016 09:52:29 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc2-73-gc92547e Message-ID: <20160216145230.1EA92E567D@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 c92547e88c64777094f47fbde222f8bd8d3ab41d (commit) via 326ad9949fb8c74b2e266c152bcc9437ea2d484e (commit) from c0a0c7d3f226943818c0152bbcb9a0d026c3274e (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=c92547e88c64777094f47fbde222f8bd8d3ab41d commit c92547e88c64777094f47fbde222f8bd8d3ab41d Merge: c0a0c7d 326ad99 Author: Brad King AuthorDate: Tue Feb 16 09:52:28 2016 -0500 Commit: CMake Topic Stage CommitDate: Tue Feb 16 09:52:28 2016 -0500 Merge topic 'fix-export-header-test' 326ad994 Tests: fix GenerateExportHeader directory definitions ----------------------------------------------------------------------- Summary of changes: Tests/Module/GenerateExportHeader/CMakeLists.txt | 4 ++-- Tests/Module/GenerateExportHeader/exportheader_test.cpp | 11 ++++------- 2 files changed, 6 insertions(+), 9 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Tue Feb 16 09:52:33 2016 From: brad.king at kitware.com (Brad King) Date: Tue, 16 Feb 2016 09:52:33 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc2-75-gdde82df Message-ID: <20160216145233.4F663E566B@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 dde82df24c44338f56171e2989729f6b86677900 (commit) via 7c7efd1ed92e3c423f463c0249e1c05a33ff8049 (commit) from c92547e88c64777094f47fbde222f8bd8d3ab41d (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=dde82df24c44338f56171e2989729f6b86677900 commit dde82df24c44338f56171e2989729f6b86677900 Merge: c92547e 7c7efd1 Author: Brad King AuthorDate: Tue Feb 16 09:52:30 2016 -0500 Commit: CMake Topic Stage CommitDate: Tue Feb 16 09:52:30 2016 -0500 Merge topic 'cpack-rpm-upper-cased-components' 7c7efd1e CPack/RPM support for upper cased component variables ----------------------------------------------------------------------- Summary of changes: .../dev/cpack-rpm-upper-cased-components.rst | 15 + Modules/CPackRPM.cmake | 311 ++++++++------------ .../MyLibCPackConfig-IgnoreGroup.cmake.in | 12 +- .../MyLibCPackConfig-OnePackPerGroup.cmake.in | 2 +- .../RunCPackVerifyResult.cmake | 8 +- Tests/RunCMake/CPack/INSTALL_SCRIPTS.cmake | 26 ++ .../CPack/RPM/DEPENDENCIES-specifics.cmake | 20 +- .../CPack/RPM/INSTALL_SCRIPTS-ExpectedFiles.cmake | 7 + .../CPack/RPM/INSTALL_SCRIPTS-VerifyResult.cmake | 29 ++ .../CPack/RPM/INSTALL_SCRIPTS-specifics.cmake | 19 ++ .../CPack/RPM/PER_COMPONENT_FIELDS-specifics.cmake | 4 +- Tests/RunCMake/CPack/RunCMakeTest.cmake | 1 + 12 files changed, 248 insertions(+), 206 deletions(-) create mode 100644 Help/release/dev/cpack-rpm-upper-cased-components.rst create mode 100644 Tests/RunCMake/CPack/INSTALL_SCRIPTS.cmake create mode 100644 Tests/RunCMake/CPack/RPM/INSTALL_SCRIPTS-ExpectedFiles.cmake create mode 100644 Tests/RunCMake/CPack/RPM/INSTALL_SCRIPTS-VerifyResult.cmake create mode 100644 Tests/RunCMake/CPack/RPM/INSTALL_SCRIPTS-specifics.cmake hooks/post-receive -- CMake From brad.king at kitware.com Tue Feb 16 09:52:35 2016 From: brad.king at kitware.com (Brad King) Date: Tue, 16 Feb 2016 09:52:35 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc2-77-ge0a3009 Message-ID: <20160216145235.8FC1DE567D@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 e0a3009cda60c51cefda2f7cb7100786eca2e219 (commit) via c8c45a2c4e10715e5cf05acaa0ac2c80f28b9a6a (commit) from dde82df24c44338f56171e2989729f6b86677900 (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=e0a3009cda60c51cefda2f7cb7100786eca2e219 commit e0a3009cda60c51cefda2f7cb7100786eca2e219 Merge: dde82df c8c45a2 Author: Brad King AuthorDate: Tue Feb 16 09:52:34 2016 -0500 Commit: CMake Topic Stage CommitDate: Tue Feb 16 09:52:34 2016 -0500 Merge topic 'fix-cmake_parse_arguments-expansion' c8c45a2c cmake_parse_arguments: Restore ;-list argument flattening ----------------------------------------------------------------------- Summary of changes: Source/cmParseArgumentsCommand.cxx | 12 ++++++++++-- .../cmake_parse_arguments/CornerCases.cmake | 19 +++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Tue Feb 16 09:52:37 2016 From: brad.king at kitware.com (Brad King) Date: Tue, 16 Feb 2016 09:52:37 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc2-79-ga64fa04 Message-ID: <20160216145238.00AF2E5685@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 a64fa04b4be72a288ecfd443d1eb5ac9edc48cc6 (commit) via da490e11599e7948bb0a3ed3a53cdf5f80253b2d (commit) from e0a3009cda60c51cefda2f7cb7100786eca2e219 (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=a64fa04b4be72a288ecfd443d1eb5ac9edc48cc6 commit a64fa04b4be72a288ecfd443d1eb5ac9edc48cc6 Merge: e0a3009 da490e1 Author: Brad King AuthorDate: Tue Feb 16 09:52:36 2016 -0500 Commit: CMake Topic Stage CommitDate: Tue Feb 16 09:52:36 2016 -0500 Merge topic 'cmake-gui-reset-generator' da490e11 cmake-gui: Fix cmState initialization when changing generators (#15959) ----------------------------------------------------------------------- Summary of changes: Source/cmGlobalGenerator.cxx | 7 +++++++ 1 file changed, 7 insertions(+) hooks/post-receive -- CMake From brad.king at kitware.com Tue Feb 16 09:53:15 2016 From: brad.king at kitware.com (Brad King) Date: Tue, 16 Feb 2016 09:53:15 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-142-g42e50cb Message-ID: <20160216145315.C0947E56A2@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, next has been updated via 42e50cbdc846a33afdfd10b647afc7a52816454b (commit) via a64fa04b4be72a288ecfd443d1eb5ac9edc48cc6 (commit) via e0a3009cda60c51cefda2f7cb7100786eca2e219 (commit) via dde82df24c44338f56171e2989729f6b86677900 (commit) via c92547e88c64777094f47fbde222f8bd8d3ab41d (commit) via c0a0c7d3f226943818c0152bbcb9a0d026c3274e (commit) via 28126b8927353cb7da183ee61faea9bf7271b676 (commit) via f03cb192e9e0d954f313b7fe3f6825d13a68a1ef (commit) via 7534a4d5672265b458b2fb5ca890b929b325e563 (commit) via dec7d5c4de7870ecc4396eababe1edba20d8cbd2 (commit) from b7388f1342b591056e513338f23097ed4a8b983c (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=42e50cbdc846a33afdfd10b647afc7a52816454b commit 42e50cbdc846a33afdfd10b647afc7a52816454b Merge: b7388f1 a64fa04 Author: Brad King AuthorDate: Tue Feb 16 09:52:58 2016 -0500 Commit: Brad King CommitDate: Tue Feb 16 09:52:58 2016 -0500 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Tue Feb 16 09:54:51 2016 From: brad.king at kitware.com (Brad King) Date: Tue, 16 Feb 2016 09:54:51 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc2-83-g8dfb6f8 Message-ID: <20160216145451.70CD1E571D@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 8dfb6f8b372b159c050b6ea5e16b4e44dd9ed095 (commit) via 229a5bc9034549c8d9693878b1031b5f886eb1b7 (commit) via 2410a20ebb01e6ff88f7bbd43e1d65fcd9385d09 (commit) via 3e966ef734230848cf834fc444dc2695a07ff398 (commit) from a64fa04b4be72a288ecfd443d1eb5ac9edc48cc6 (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: hooks/post-receive -- CMake From brad.king at kitware.com Tue Feb 16 09:54:51 2016 From: brad.king at kitware.com (Brad King) Date: Tue, 16 Feb 2016 09:54:51 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-147-g7e4d38e Message-ID: <20160216145451.8392CE5720@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, next has been updated via 7e4d38ed5c38d96713746574ab6d8207dcdaec06 (commit) via 8dfb6f8b372b159c050b6ea5e16b4e44dd9ed095 (commit) via 229a5bc9034549c8d9693878b1031b5f886eb1b7 (commit) via 2410a20ebb01e6ff88f7bbd43e1d65fcd9385d09 (commit) via 3e966ef734230848cf834fc444dc2695a07ff398 (commit) from 42e50cbdc846a33afdfd10b647afc7a52816454b (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=7e4d38ed5c38d96713746574ab6d8207dcdaec06 commit 7e4d38ed5c38d96713746574ab6d8207dcdaec06 Merge: 42e50cb 8dfb6f8 Author: Brad King AuthorDate: Tue Feb 16 09:54:38 2016 -0500 Commit: Brad King CommitDate: Tue Feb 16 09:54:38 2016 -0500 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake From brad.king at kitware.com Tue Feb 16 09:54:51 2016 From: brad.king at kitware.com (Brad King) Date: Tue, 16 Feb 2016 09:54:51 -0500 (EST) Subject: [Cmake-commits] CMake branch, release, updated. v3.5.0-rc2-6-g229a5bc Message-ID: <20160216145451.9A1E9E5720@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 229a5bc9034549c8d9693878b1031b5f886eb1b7 (commit) via c8c45a2c4e10715e5cf05acaa0ac2c80f28b9a6a (commit) via 2410a20ebb01e6ff88f7bbd43e1d65fcd9385d09 (commit) via da490e11599e7948bb0a3ed3a53cdf5f80253b2d (commit) via 3e966ef734230848cf834fc444dc2695a07ff398 (commit) via 878632c90e4811ed08e5d1c298de8ae61d79f620 (commit) from 8d1b37a2b207956c05e017645de3681a077d0a5b (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: Help/release/3.5.rst | 6 ++++++ Source/cmGlobalGenerator.cxx | 7 +++++++ Source/cmParseArgumentsCommand.cxx | 12 ++++++++++-- .../cmake_parse_arguments/CornerCases.cmake | 19 +++++++++++++++++++ 4 files changed, 42 insertions(+), 2 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Tue Feb 16 10:14:54 2016 From: brad.king at kitware.com (Brad King) Date: Tue, 16 Feb 2016 10:14:54 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-149-gb60c67c Message-ID: <20160216151454.85CE9E5210@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, next has been updated via b60c67cc1f225fcdd270d2ed298b1b8b1b9f0697 (commit) via bb7a41ab9b0b6a5a2cee3f330a2e223392ee4a70 (commit) from 7e4d38ed5c38d96713746574ab6d8207dcdaec06 (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=b60c67cc1f225fcdd270d2ed298b1b8b1b9f0697 commit b60c67cc1f225fcdd270d2ed298b1b8b1b9f0697 Merge: 7e4d38e bb7a41a Author: Brad King AuthorDate: Tue Feb 16 10:14:53 2016 -0500 Commit: CMake Topic Stage CommitDate: Tue Feb 16 10:14:53 2016 -0500 Merge topic 'FindProtobuf-version' into next bb7a41ab FindProtobuf: check version https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bb7a41ab9b0b6a5a2cee3f330a2e223392ee4a70 commit bb7a41ab9b0b6a5a2cee3f330a2e223392ee4a70 Author: Antonio Perez Barrero AuthorDate: Fri Feb 12 08:23:44 2016 +0100 Commit: Brad King CommitDate: Tue Feb 16 10:09:39 2016 -0500 FindProtobuf: check version Check found libraries version to match user required version. Protobuf compiler executable version is checked to be aligned with found libraries, raising a warning message otherwise. diff --git a/Help/release/dev/FindProtobuf-version.rst b/Help/release/dev/FindProtobuf-version.rst new file mode 100644 index 0000000..2bfd9f4 --- /dev/null +++ b/Help/release/dev/FindProtobuf-version.rst @@ -0,0 +1,6 @@ +FindProtobuf-version +-------------------- + +* The :module:`FindProtobuf` module learned to provide a ``PROTOBUF_VERSION`` + variable and check the version number requested in a :command:`find_package` + call. diff --git a/Modules/FindProtobuf.cmake b/Modules/FindProtobuf.cmake index 0875349..95e3b1e 100644 --- a/Modules/FindProtobuf.cmake +++ b/Modules/FindProtobuf.cmake @@ -15,12 +15,16 @@ # ``PROTOBUF_IMPORT_DIRS`` # List of additional directories to be searched for # imported .proto files. +# ``PROTOBUF_DEBUG`` +# Show debug messages. # # Defines the following variables: # # ``PROTOBUF_FOUND`` # Found the Google Protocol Buffers library # (libprotobuf & header files) +# ``PROTOBUF_VERSION`` +# Version of package found. # ``PROTOBUF_INCLUDE_DIRS`` # Include directories for Google Protocol Buffers # ``PROTOBUF_LIBRARIES`` @@ -304,10 +308,61 @@ find_program(PROTOBUF_PROTOC_EXECUTABLE ) mark_as_advanced(PROTOBUF_PROTOC_EXECUTABLE) +if(PROTOBUF_DEBUG) + message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " + "requested version of Google Protobuf is ${Protobuf_FIND_VERSION}") +endif() + +if(PROTOBUF_INCLUDE_DIR) + set(_PROTOBUF_COMMON_HEADER ${PROTOBUF_INCLUDE_DIR}/google/protobuf/stubs/common.h) + + if(PROTOBUF_DEBUG) + message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " + "location of common.h: ${_PROTOBUF_COMMON_HEADER}") + endif() + + set(PROTOBUF_VERSION "") + set(PROTOBUF_LIB_VERSION "") + file(STRINGS ${_PROTOBUF_COMMON_HEADER} _PROTOBUF_COMMON_H_CONTENTS REGEX "#define[ \t]+GOOGLE_PROTOBUF_VERSION[ \t]+") + if(_PROTOBUF_COMMON_H_CONTENTS MATCHES "#define[ \t]+GOOGLE_PROTOBUF_VERSION[ \t]+([0-9]+)") + set(PROTOBUF_LIB_VERSION "${CMAKE_MATCH_1}") + endif() + unset(_PROTOBUF_COMMON_H_CONTENTS) + + math(EXPR _PROTOBUF_MAJOR_VERSION "${PROTOBUF_LIB_VERSION} / 1000000") + math(EXPR _PROTOBUF_MINOR_VERSION "${PROTOBUF_LIB_VERSION} / 1000 % 1000") + math(EXPR _PROTOBUF_SUBMINOR_VERSION "${PROTOBUF_LIB_VERSION} % 1000") + set(PROTOBUF_VERSION "${_PROTOBUF_MAJOR_VERSION}.${_PROTOBUF_MINOR_VERSION}.${_PROTOBUF_SUBMINOR_VERSION}") + + if(PROTOBUF_DEBUG) + message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " + "${_PROTOBUF_COMMON_HEADER} reveals protobuf ${PROTOBUF_VERSION}") + endif() + + # Check Protobuf compiler version to be aligned with libraries version + execute_process(COMMAND ${PROTOBUF_PROTOC_EXECUTABLE} --version + OUTPUT_VARIABLE _PROTOBUF_PROTOC_EXECUTABLE_VERSION) + + if("${_PROTOBUF_PROTOC_EXECUTABLE_VERSION}" MATCHES "libprotoc ([0-9.]+)") + set(_PROTOBUF_PROTOC_EXECUTABLE_VERSION "${CMAKE_MATCH_1}") + endif() + + if(PROTOBUF_DEBUG) + message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " + "${PROTOBUF_PROTOC_EXECUTABLE} reveals version ${_PROTOBUF_PROTOC_EXECUTABLE_VERSION}") + endif() + + if(NOT "${_PROTOBUF_PROTOC_EXECUTABLE_VERSION}" VERSION_EQUAL "${PROTOBUF_VERSION}") + message(WARNING "Protobuf compiler version ${_PROTOBUF_PROTOC_EXECUTABLE_VERSION}" + " doesn't match library version ${PROTOBUF_VERSION}") + endif() +endif() include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Protobuf DEFAULT_MSG - PROTOBUF_LIBRARY PROTOBUF_INCLUDE_DIR) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(Protobuf + REQUIRED_VARS PROTOBUF_LIBRARIES PROTOBUF_INCLUDE_DIR + VERSION_VAR PROTOBUF_VERSION +) if(PROTOBUF_FOUND) set(PROTOBUF_INCLUDE_DIRS ${PROTOBUF_INCLUDE_DIR}) diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt index bdc2563..0aad161 100644 --- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt +++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt @@ -92,4 +92,5 @@ foreach(VTEST BISON Boost CUDA DOXYGEN FLEX GIF GTK2 endforeach() check_version_string(PYTHONINTERP PYTHON_VERSION_STRING) +check_version_string(Protobuf PROTOBUF_VERSION) check_version_string(SUBVERSION Subversion_VERSION_SVN) ----------------------------------------------------------------------- Summary of changes: Help/release/dev/FindProtobuf-version.rst | 6 +++ Modules/FindProtobuf.cmake | 59 ++++++++++++++++++++++++- Tests/CMakeOnly/AllFindModules/CMakeLists.txt | 1 + 3 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 Help/release/dev/FindProtobuf-version.rst hooks/post-receive -- CMake From brad.king at kitware.com Tue Feb 16 10:36:16 2016 From: brad.king at kitware.com (Brad King) Date: Tue, 16 Feb 2016 10:36:16 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-151-g10fd480 Message-ID: <20160216153616.B3111E5A6E@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, next has been updated via 10fd48038dd5d804caf41a3f169f1dc54595874c (commit) via 184da3f4f6ab74d2024455f8684286b2dbaa6a6e (commit) from b60c67cc1f225fcdd270d2ed298b1b8b1b9f0697 (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=10fd48038dd5d804caf41a3f169f1dc54595874c commit 10fd48038dd5d804caf41a3f169f1dc54595874c Merge: b60c67c 184da3f Author: Brad King AuthorDate: Tue Feb 16 10:36:16 2016 -0500 Commit: CMake Topic Stage CommitDate: Tue Feb 16 10:36:16 2016 -0500 Merge topic 'CodeBlocks-more-compilers' into next 184da3f4 CodeBlocks: improve support for different compilers https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=184da3f4f6ab74d2024455f8684286b2dbaa6a6e commit 184da3f4f6ab74d2024455f8684286b2dbaa6a6e Author: Melven Roehrig-Zoellner AuthorDate: Fri Feb 12 00:00:10 2016 +0100 Commit: Brad King CommitDate: Tue Feb 16 10:18:38 2016 -0500 CodeBlocks: improve support for different compilers More elaborate selection of the `compiler` tag in the generated CodeBlocks project file: * Fortran language support * support for several of the predefined compilers recognized by CodeBlocks (16.01) diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx index 9348ef2..026958a 100644 --- a/Source/cmExtraCodeBlocksGenerator.cxx +++ b/Source/cmExtraCodeBlocksGenerator.cxx @@ -684,18 +684,38 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout, std::string cmExtraCodeBlocksGenerator::GetCBCompilerId(const cmMakefile* mf) { // figure out which language to use - // for now care only for C and C++ - std::string compilerIdVar = "CMAKE_CXX_COMPILER_ID"; - if (this->GlobalGenerator->GetLanguageEnabled("CXX") == false) + // for now care only for C, C++, and Fortran + + // projects with C/C++ and Fortran are handled as C/C++ projects + bool pureFortran = false; + std::string compilerIdVar; + if (this->GlobalGenerator->GetLanguageEnabled("CXX") == true) + { + compilerIdVar = "CMAKE_CXX_COMPILER_ID"; + } + else if (this->GlobalGenerator->GetLanguageEnabled("C") == true) { compilerIdVar = "CMAKE_C_COMPILER_ID"; } + else if (this->GlobalGenerator->GetLanguageEnabled("Fortran") == true) + { + compilerIdVar = "CMAKE_Fortran_COMPILER_ID"; + pureFortran = true; + } + std::string compilerId = mf->GetSafeDefinition(compilerIdVar); std::string compiler = "gcc"; // default to gcc if (compilerId == "MSVC") { - compiler = "msvc8"; + if( mf->IsDefinitionSet("MSVC10") == true ) + { + compiler = "msvc10"; + } + else + { + compiler = "msvc8"; + } } else if (compilerId == "Borland") { @@ -707,15 +727,44 @@ std::string cmExtraCodeBlocksGenerator::GetCBCompilerId(const cmMakefile* mf) } else if (compilerId == "Intel") { - compiler = "icc"; + if (pureFortran && mf->IsDefinitionSet("WIN32")) + { + compiler = "ifcwin"; // Intel Fortran for Windows (known by cbFortran) + } + else + { + compiler = "icc"; + } } else if (compilerId == "Watcom" || compilerId == "OpenWatcom") { compiler = "ow"; } + else if (compilerId == "Clang") + { + compiler = "clang"; + } + else if (compilerId == "PGI") + { + if (pureFortran) + { + compiler = "pgifortran"; + } + else + { + compiler = "pgi"; // does not exist as default in CodeBlocks 16.01 + } + } else if (compilerId == "GNU") { - compiler = "gcc"; + if (pureFortran) + { + compiler = "gfortran"; + } + else + { + compiler = "gcc"; + } } return compiler; } ----------------------------------------------------------------------- Summary of changes: Source/cmExtraCodeBlocksGenerator.cxx | 61 +++++++++++++++++++++++++++++---- 1 file changed, 55 insertions(+), 6 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Tue Feb 16 10:46:50 2016 From: brad.king at kitware.com (Brad King) Date: Tue, 16 Feb 2016 10:46:50 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-153-gf2c877b Message-ID: <20160216154650.5EAD9E51C5@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, next has been updated via f2c877b6cd36bad7c36204a42d89ed39e3220be4 (commit) via 9beb2744d7685fca9cd5717308d4457dffdefcdc (commit) from 10fd48038dd5d804caf41a3f169f1dc54595874c (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=f2c877b6cd36bad7c36204a42d89ed39e3220be4 commit f2c877b6cd36bad7c36204a42d89ed39e3220be4 Merge: 10fd480 9beb274 Author: Brad King AuthorDate: Tue Feb 16 10:46:49 2016 -0500 Commit: CMake Topic Stage CommitDate: Tue Feb 16 10:46:49 2016 -0500 Merge topic 'automoc-src-per-dir' into next 9beb2744 Automoc: Fix support of files with the same name (#12873) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9beb2744d7685fca9cd5717308d4457dffdefcdc commit 9beb2744d7685fca9cd5717308d4457dffdefcdc Author: Mariusz Plucin?ski AuthorDate: Sat Feb 13 11:30:31 2016 +0100 Commit: Brad King CommitDate: Tue Feb 16 10:45:19 2016 -0500 Automoc: Fix support of files with the same name (#12873) diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index b16eccd..226ab43 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -1104,10 +1104,39 @@ void cmQtAutoGenerators::ParseHeaders(const std::set& absHeaders, std::cout << "AUTOGEN: Checking " << headerName << std::endl; } - const std::string basename = cmsys::SystemTools:: - GetFilenameWithoutLastExtension(headerName); + std::string headerDirectory; + if (cmsys::SystemTools::IsSubDirectory(headerName, + this->ProjectSourceDir)) + { + headerDirectory = this->ProjectSourceDir; + } + else if (cmsys::SystemTools::IsSubDirectory(headerName, + this->ProjectBinaryDir)) + { + headerDirectory = this->ProjectBinaryDir; + } + else + { + cmsys::SystemTools::SplitPathRootComponent(headerName, + &headerDirectory); + } + + std::string baseHeaderName = + cmsys::SystemTools::GetFilenameWithoutLastExtension(headerName); + + headerDirectory = cmsys::SystemTools::RelativePath( + headerDirectory, cmsys::SystemTools::GetParentDirectory(headerName)); + + if (!headerDirectory.empty()) + { + headerDirectory += "/"; + } + + std::string mocName = headerDirectory + baseHeaderName; + + cmSystemTools::ReplaceString(mocName, "/", "_"); - const std::string currentMoc = "moc_" + basename + ".cpp"; + const std::string currentMoc = "moc_" + mocName + ".cpp"; std::string macroName; if (requiresMocing(contents, macroName)) { diff --git a/Tests/QtAutogen/Adir/CMakeLists.txt b/Tests/QtAutogen/Adir/CMakeLists.txt index a1c36ff..0c7848d 100644 --- a/Tests/QtAutogen/Adir/CMakeLists.txt +++ b/Tests/QtAutogen/Adir/CMakeLists.txt @@ -3,6 +3,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) set(CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON) -add_library(libA SHARED libA.cpp) +add_library(libA SHARED libA.cpp foo.cpp bar/foo.cpp) target_link_libraries(libA LINK_PUBLIC ${QT_QTCORE_TARGET}) generate_export_header(libA) diff --git a/Tests/QtAutogen/Adir/bar/foo.cpp b/Tests/QtAutogen/Adir/bar/foo.cpp new file mode 100644 index 0000000..3f5e0a9 --- /dev/null +++ b/Tests/QtAutogen/Adir/bar/foo.cpp @@ -0,0 +1,4 @@ +#include "foo.h" + +bar::foo::foo() {} +bar::foo::~foo() {} diff --git a/Tests/QtAutogen/Adir/bar/foo.h b/Tests/QtAutogen/Adir/bar/foo.h new file mode 100644 index 0000000..daf2367 --- /dev/null +++ b/Tests/QtAutogen/Adir/bar/foo.h @@ -0,0 +1,10 @@ +#include + +namespace bar { + class foo: public QObject { + Q_OBJECT + public: + foo(); + ~foo(); + }; +} diff --git a/Tests/QtAutogen/Adir/foo.cpp b/Tests/QtAutogen/Adir/foo.cpp new file mode 100644 index 0000000..86e4d8e --- /dev/null +++ b/Tests/QtAutogen/Adir/foo.cpp @@ -0,0 +1,4 @@ +#include "foo.h" + +foo::foo() {} +foo::~foo() {} diff --git a/Tests/QtAutogen/Adir/foo.h b/Tests/QtAutogen/Adir/foo.h new file mode 100644 index 0000000..a51960c --- /dev/null +++ b/Tests/QtAutogen/Adir/foo.h @@ -0,0 +1,8 @@ +#include + +class foo: public QObject { + Q_OBJECT +public: + foo(); + ~foo(); +}; ----------------------------------------------------------------------- Summary of changes: Source/cmQtAutoGenerators.cxx | 35 ++++++++++++++++++++++++++++++++--- Tests/QtAutogen/Adir/CMakeLists.txt | 2 +- Tests/QtAutogen/Adir/bar/foo.cpp | 4 ++++ Tests/QtAutogen/Adir/bar/foo.h | 10 ++++++++++ Tests/QtAutogen/Adir/foo.cpp | 4 ++++ Tests/QtAutogen/Adir/foo.h | 8 ++++++++ 6 files changed, 59 insertions(+), 4 deletions(-) create mode 100644 Tests/QtAutogen/Adir/bar/foo.cpp create mode 100644 Tests/QtAutogen/Adir/bar/foo.h create mode 100644 Tests/QtAutogen/Adir/foo.cpp create mode 100644 Tests/QtAutogen/Adir/foo.h hooks/post-receive -- CMake From brad.king at kitware.com Tue Feb 16 14:16:18 2016 From: brad.king at kitware.com (Brad King) Date: Tue, 16 Feb 2016 14:16:18 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-155-g8f5d42d Message-ID: <20160216191618.5020AE54BF@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, next has been updated via 8f5d42db68e178c3dfa4610cee7b73e6c8f0cd2b (commit) via 843213d57191b29348a3a2debfe163355ae9fa70 (commit) from f2c877b6cd36bad7c36204a42d89ed39e3220be4 (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=8f5d42db68e178c3dfa4610cee7b73e6c8f0cd2b commit 8f5d42db68e178c3dfa4610cee7b73e6c8f0cd2b Merge: f2c877b 843213d Author: Brad King AuthorDate: Tue Feb 16 14:16:17 2016 -0500 Commit: CMake Topic Stage CommitDate: Tue Feb 16 14:16:17 2016 -0500 Merge topic 'FindwxWidgets-msys2-paths' into next 843213d5 FindwxWidgets: Resolve Cygwin/MSYS paths to Windows paths https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=843213d57191b29348a3a2debfe163355ae9fa70 commit 843213d57191b29348a3a2debfe163355ae9fa70 Author: Simon Richter AuthorDate: Sun Feb 14 20:51:11 2016 +0100 Commit: Brad King CommitDate: Tue Feb 16 14:15:29 2016 -0500 FindwxWidgets: Resolve Cygwin/MSYS paths to Windows paths We use `sh wx-config` to launch the `wx-config` tool so that it can run even on Windows. Since it is always a shell script its output may use POSIX paths even on Windows. Use `cygpath` to convert to Windows paths. diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake index 49ce57e..8c07e6c 100644 --- a/Modules/FindwxWidgets.cmake +++ b/Modules/FindwxWidgets.cmake @@ -835,6 +835,36 @@ else() endif() endif() + # When using wx-config in MSYS, the include paths are UNIX style paths which may or may + # not work correctly depending on you MSYS/MinGW configuration. CMake expects native + # paths internally. + if(wxWidgets_FOUND AND MSYS) + find_program(_cygpath_exe cygpath ONLY_CMAKE_FIND_ROOT_PATH) + DBG_MSG_V("_cygpath_exe: ${_cygpath_exe}") + if(_cygpath_exe) + set(_tmp_path "") + foreach(_path ${wxWidgets_INCLUDE_DIRS}) + execute_process( + COMMAND cygpath -w ${_path} + OUTPUT_VARIABLE _native_path + RESULT_VARIABLE _retv + OUTPUT_STRIP_TRAILING_WHITESPACE + ERROR_QUIET + ) + if(_retv EQUAL 0) + file(TO_CMAKE_PATH ${_native_path} _native_path) + DBG_MSG_V("Path ${_path} converted to ${_native_path}") + set(_tmp_path "${_tmp_path} ${_native_path}") + endif() + endforeach() + DBG_MSG("Setting wxWidgets_INCLUDE_DIRS = ${_tmp_path}") + set(wxWidgets_INCLUDE_DIRS ${_tmp_path}) + separate_arguments(wxWidgets_INCLUDE_DIRS) + list(REMOVE_ITEM wxWidgets_INCLUDE_DIRS "") + endif() + unset(_cygpath_exe CACHE) + endif() + #===================================================================== # Neither UNIX_FIND_STYLE, nor WIN32_FIND_STYLE #===================================================================== ----------------------------------------------------------------------- Summary of changes: Modules/FindwxWidgets.cmake | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) hooks/post-receive -- CMake From nilsgladitz at gmail.com Tue Feb 16 15:53:45 2016 From: nilsgladitz at gmail.com (Nils Gladitz) Date: Tue, 16 Feb 2016 15:53:45 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-157-gf61f981 Message-ID: <20160216205345.263C6E5B01@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, next has been updated via f61f981a2a14bff9654f6e30c5f33c8356900880 (commit) via 82c408ca0e67d86d0157670ff552b5879fa4c4c7 (commit) from 8f5d42db68e178c3dfa4610cee7b73e6c8f0cd2b (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=f61f981a2a14bff9654f6e30c5f33c8356900880 commit f61f981a2a14bff9654f6e30c5f33c8356900880 Merge: 8f5d42d 82c408c Author: Nils Gladitz AuthorDate: Tue Feb 16 15:53:42 2016 -0500 Commit: CMake Topic Stage CommitDate: Tue Feb 16 15:53:42 2016 -0500 Merge topic 'unix-timestamps' into next 82c408ca CMake: Extend TIMESTAMP sub-commands with new unix time format specifier https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82c408ca0e67d86d0157670ff552b5879fa4c4c7 commit 82c408ca0e67d86d0157670ff552b5879fa4c4c7 Author: Jose-Luis Blanco-Claraco AuthorDate: Tue Feb 16 21:48:56 2016 +0100 Commit: Nils Gladitz CommitDate: Tue Feb 16 21:50:51 2016 +0100 CMake: Extend TIMESTAMP sub-commands with new unix time format specifier The new %s format specifier is substituted by file()/string() TIMESTAMP sub-commands with the number of seconds since unix-epoch (1 January 1970 00:00:00 UTC). Co-Authored-By: Nils Gladitz diff --git a/Help/command/string.rst b/Help/command/string.rst index 0361c74..3f4050e 100644 --- a/Help/command/string.rst +++ b/Help/command/string.rst @@ -277,6 +277,7 @@ specifiers: %j The day of the current year (001-366). %m The month of the current year (01-12). %M The minute of the current hour (00-59). + %s Seconds since midnight (UTC) 1-Jan-1970 (UNIX time). %S The second of the current minute. 60 represents a leap second. (00-60) %U The week number of the current year (00-53). diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx index 6fd6ab7..b2f149c 100644 --- a/Source/cmTimestamp.cxx +++ b/Source/cmTimestamp.cxx @@ -12,9 +12,11 @@ #include "cmTimestamp.h" #include +#include #include #include +#include //---------------------------------------------------------------------------- std::string cmTimestamp::CurrentTime( @@ -44,7 +46,7 @@ std::string cmTimestamp::FileModificationTime(const char* path, //---------------------------------------------------------------------------- std::string cmTimestamp::CreateTimestampFromTimeT(time_t timeT, - std::string formatString, bool utcFlag) + std::string formatString, bool utcFlag) const { if(formatString.empty()) { @@ -55,8 +57,7 @@ std::string cmTimestamp::CreateTimestampFromTimeT(time_t timeT, } } - struct tm timeStruct; - memset(&timeStruct, 0, sizeof(timeStruct)); + struct tm timeStruct = {0}; struct tm* ptr = (struct tm*) 0; if(utcFlag) @@ -79,12 +80,12 @@ std::string cmTimestamp::CreateTimestampFromTimeT(time_t timeT, for(std::string::size_type i = 0; i < formatString.size(); ++i) { char c1 = formatString[i]; - char c2 = (i+1 < formatString.size()) ? - formatString[i+1] : static_cast(0); + char c2 = (i + 1 < formatString.size()) ? + formatString[i + 1] : static_cast(0); if(c1 == '%' && c2 != 0) { - result += AddTimestampComponent(c2, timeStruct); + result += AddTimestampComponent(c2, timeStruct, timeT); ++i; } else @@ -97,8 +98,42 @@ std::string cmTimestamp::CreateTimestampFromTimeT(time_t timeT, } //---------------------------------------------------------------------------- +time_t cmTimestamp::CreateUtcTimeTFromTm(struct tm &tm) const +{ +#ifdef _MSC_VER + return _mkgmtime(tm); +#else + // From Linux timegm() manpage. + + const char * tz = cmSystemTools::GetEnv("TZ"); + + if (tz) + { + tz = strdup(tz); + } + + // The standard says that "TZ=" or "TZ=[UNRECOGNIZED_TZ]" means UTC. + // It seems that "TZ=" does NOT work, at least under Windows + // with neither MSVC nor MinGW, so let's use explicit "TZ=UTC" + + cmSystemTools::PutEnv(std::string("TZ=UTC")); + + tzset(); + + time_t result = mktime(&tm); + + cmSystemTools::PutEnv(std::string("TZ=") + + std::string(tz ? tz : "")); + + tzset(); + + return result; +} +#endif + +//---------------------------------------------------------------------------- std::string cmTimestamp::AddTimestampComponent( - char flag, struct tm& timeStruct) + char flag, struct tm& timeStruct, const time_t timeT) const { std::string formatString = "%"; formatString += flag; @@ -117,6 +152,25 @@ std::string cmTimestamp::AddTimestampComponent( case 'y': case 'Y': break; + case 's': // Seconds since UNIX epoch (midnight 1-jan-1970) + { + // Build a time_t for UNIX epoch and substract from the input "timeT": + struct tm tm_unix_epoch = {0}; + tm_unix_epoch.tm_mday = 1; + tm_unix_epoch.tm_year = 1970-1900; + + const time_t unix_epoch = this->CreateUtcTimeTFromTm(tm_unix_epoch); + if (unix_epoch == -1) + { + cmSystemTools::Error("Error generating UNIX epoch in " + "STRING(TIMESTAMP ...). Please, file a bug report aginst CMake"); + return std::string(); + } + + std::stringstream ss; + ss << static_cast(difftime(timeT, unix_epoch)); + return ss.str(); + } default: { return formatString; diff --git a/Source/cmTimestamp.h b/Source/cmTimestamp.h index 24c1869..7c4b216 100644 --- a/Source/cmTimestamp.h +++ b/Source/cmTimestamp.h @@ -16,7 +16,7 @@ #include /** \class cmTimestamp - * \brief Utility class to generate sting representation of a timestamp + * \brief Utility class to generate string representation of a timestamp * */ class cmTimestamp @@ -30,10 +30,13 @@ public: const std::string& formatString, bool utcFlag); private: - std::string CreateTimestampFromTimeT(time_t timeT, - std::string formatString, bool utcFlag); + time_t CreateUtcTimeTFromTm(struct tm& timeStruct) const; - std::string AddTimestampComponent(char flag, struct tm& timeStruct); + std::string CreateTimestampFromTimeT( + time_t timeT, std::string formatString, bool utcFlag) const; + + std::string AddTimestampComponent( + char flag, struct tm& timeStruct, time_t timeT) const; }; diff --git a/Tests/CMakeTests/String-TIMESTAMP-UnixTime.cmake b/Tests/CMakeTests/String-TIMESTAMP-UnixTime.cmake new file mode 100644 index 0000000..a93e7f5 --- /dev/null +++ b/Tests/CMakeTests/String-TIMESTAMP-UnixTime.cmake @@ -0,0 +1,22 @@ +string(TIMESTAMP timestamp "[%Y-%m-%d %H:%M:%S] %s" UTC) + +string(TIMESTAMP unix_time "%s") + +string(TIMESTAMP year "%Y" UTC) +string(TIMESTAMP days "%j" UTC) + +# Doing proper date calculations here to verify unix timestamps +# could be error prone. +# At the very least use some safe lower and upper bounds to +# see if we are somewhere in the right region. + +math(EXPR years_since_epoch "${year} - 1970") +math(EXPR lower_bound "((${years_since_epoch} * 365) + ${days}) * 86400") +math(EXPR upper_bound "((${years_since_epoch} * 366) + ${days}) * 86400") + + +if(unix_time GREATER lower_bound AND unix_time LESS upper_bound) + message("~${unix_time}~") +else() + message(FATAL_ERROR "${timestamp} unix time not in expected range [${lower_bound}, ${upper_bound}]") +endif() diff --git a/Tests/CMakeTests/StringTest.cmake.in b/Tests/CMakeTests/StringTest.cmake.in index 92e70c3..aba35fe 100644 --- a/Tests/CMakeTests/StringTest.cmake.in +++ b/Tests/CMakeTests/StringTest.cmake.in @@ -36,6 +36,8 @@ set(TIMESTAMP-IncompleteSpecifier-RESULT 0) set(TIMESTAMP-IncompleteSpecifier-STDERR "~foobar%~") set(TIMESTAMP-AllSpecifiers-RESULT 0) set(TIMESTAMP-AllSpecifiers-STDERR "~[0-9]+(;[0-9]+)*~") +set(TIMESTAMP-UnixTime-RESULT 0) +set(TIMESTAMP-UnixTime-STDERR "~[1-9][0-9]+~") include("@CMAKE_CURRENT_SOURCE_DIR@/CheckCMakeTest.cmake") check_cmake_test(String @@ -58,6 +60,7 @@ check_cmake_test(String TIMESTAMP-UnknownSpecifier TIMESTAMP-IncompleteSpecifier TIMESTAMP-AllSpecifiers + TIMESTAMP-UnixTime ) # Execute each test listed in StringTestScript.cmake: @@ -68,9 +71,12 @@ set(number_of_tests_expected 70) include("@CMAKE_CURRENT_SOURCE_DIR@/ExecuteScriptTests.cmake") execute_all_script_tests(${scriptname} number_of_tests_executed) +string(TIMESTAMP timestamp "[%Y-%m-%d %H:%M:%S] UTC %s" UTC) + # And verify that number_of_tests_executed is at least as many as we know # about as of this writing... # +message(STATUS "timestamp='${timestamp}'") message(STATUS "scriptname='${scriptname}'") message(STATUS "number_of_tests_executed='${number_of_tests_executed}'") message(STATUS "number_of_tests_expected='${number_of_tests_expected}'") ----------------------------------------------------------------------- Summary of changes: Help/command/string.rst | 1 + Source/cmTimestamp.cxx | 68 +++++++++++++++++++--- Source/cmTimestamp.h | 11 ++-- Tests/CMakeTests/String-TIMESTAMP-UnixTime.cmake | 22 +++++++ Tests/CMakeTests/StringTest.cmake.in | 6 ++ 5 files changed, 97 insertions(+), 11 deletions(-) create mode 100644 Tests/CMakeTests/String-TIMESTAMP-UnixTime.cmake hooks/post-receive -- CMake From nilsgladitz at gmail.com Tue Feb 16 16:56:37 2016 From: nilsgladitz at gmail.com (Nils Gladitz) Date: Tue, 16 Feb 2016 16:56:37 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-159-g2c86958 Message-ID: <20160216215637.2DBA5E5AC0@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, next has been updated via 2c86958b1a86c1ad6af7758cea3153ba4615c801 (commit) via 81ade2e0aaed6ccafc76b05cf5e679723f523908 (commit) from f61f981a2a14bff9654f6e30c5f33c8356900880 (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=2c86958b1a86c1ad6af7758cea3153ba4615c801 commit 2c86958b1a86c1ad6af7758cea3153ba4615c801 Merge: f61f981 81ade2e Author: Nils Gladitz AuthorDate: Tue Feb 16 16:56:36 2016 -0500 Commit: CMake Topic Stage CommitDate: Tue Feb 16 16:56:36 2016 -0500 Merge topic 'unix-timestamps' into next 81ade2e0 !fixup CMake: Fix _mkgtime use in TIMESTAMP implementation https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=81ade2e0aaed6ccafc76b05cf5e679723f523908 commit 81ade2e0aaed6ccafc76b05cf5e679723f523908 Author: Nils Gladitz AuthorDate: Tue Feb 16 22:56:16 2016 +0100 Commit: Nils Gladitz CommitDate: Tue Feb 16 22:56:16 2016 +0100 !fixup CMake: Fix _mkgtime use in TIMESTAMP implementation diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx index b2f149c..302ea6d 100644 --- a/Source/cmTimestamp.cxx +++ b/Source/cmTimestamp.cxx @@ -100,8 +100,8 @@ std::string cmTimestamp::CreateTimestampFromTimeT(time_t timeT, //---------------------------------------------------------------------------- time_t cmTimestamp::CreateUtcTimeTFromTm(struct tm &tm) const { -#ifdef _MSC_VER - return _mkgmtime(tm); +#if defined(_MSC_VER) && _MSC_VER >= 1400 + return _mkgmtime(&tm); #else // From Linux timegm() manpage. ----------------------------------------------------------------------- Summary of changes: Source/cmTimestamp.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake From nilsgladitz at gmail.com Tue Feb 16 16:57:21 2016 From: nilsgladitz at gmail.com (Nils Gladitz) Date: Tue, 16 Feb 2016 16:57:21 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-161-g7c65509 Message-ID: <20160216215721.B0D71E5AF3@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, next has been updated via 7c655095751e2bf37bc04db9c5f77d95acd4c985 (commit) via 035802f4471fe1b94ad98c9daedd708ad294dd7b (commit) from 2c86958b1a86c1ad6af7758cea3153ba4615c801 (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=7c655095751e2bf37bc04db9c5f77d95acd4c985 commit 7c655095751e2bf37bc04db9c5f77d95acd4c985 Merge: 2c86958 035802f Author: Nils Gladitz AuthorDate: Tue Feb 16 16:57:21 2016 -0500 Commit: CMake Topic Stage CommitDate: Tue Feb 16 16:57:21 2016 -0500 Merge topic 'unix-timestamps' into next 035802f4 CMake: Extend TIMESTAMP sub-commands with new unix time format specifier https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=035802f4471fe1b94ad98c9daedd708ad294dd7b commit 035802f4471fe1b94ad98c9daedd708ad294dd7b Author: Jose-Luis Blanco-Claraco AuthorDate: Tue Feb 16 21:48:56 2016 +0100 Commit: Nils Gladitz CommitDate: Tue Feb 16 22:56:53 2016 +0100 CMake: Extend TIMESTAMP sub-commands with new unix time format specifier The new %s format specifier is substituted by file()/string() TIMESTAMP sub-commands with the number of seconds since unix-epoch (1 January 1970 00:00:00 UTC). Co-Authored-By: Nils Gladitz diff --git a/Help/command/string.rst b/Help/command/string.rst index 0361c74..3f4050e 100644 --- a/Help/command/string.rst +++ b/Help/command/string.rst @@ -277,6 +277,7 @@ specifiers: %j The day of the current year (001-366). %m The month of the current year (01-12). %M The minute of the current hour (00-59). + %s Seconds since midnight (UTC) 1-Jan-1970 (UNIX time). %S The second of the current minute. 60 represents a leap second. (00-60) %U The week number of the current year (00-53). diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx index 6fd6ab7..302ea6d 100644 --- a/Source/cmTimestamp.cxx +++ b/Source/cmTimestamp.cxx @@ -12,9 +12,11 @@ #include "cmTimestamp.h" #include +#include #include #include +#include //---------------------------------------------------------------------------- std::string cmTimestamp::CurrentTime( @@ -44,7 +46,7 @@ std::string cmTimestamp::FileModificationTime(const char* path, //---------------------------------------------------------------------------- std::string cmTimestamp::CreateTimestampFromTimeT(time_t timeT, - std::string formatString, bool utcFlag) + std::string formatString, bool utcFlag) const { if(formatString.empty()) { @@ -55,8 +57,7 @@ std::string cmTimestamp::CreateTimestampFromTimeT(time_t timeT, } } - struct tm timeStruct; - memset(&timeStruct, 0, sizeof(timeStruct)); + struct tm timeStruct = {0}; struct tm* ptr = (struct tm*) 0; if(utcFlag) @@ -79,12 +80,12 @@ std::string cmTimestamp::CreateTimestampFromTimeT(time_t timeT, for(std::string::size_type i = 0; i < formatString.size(); ++i) { char c1 = formatString[i]; - char c2 = (i+1 < formatString.size()) ? - formatString[i+1] : static_cast(0); + char c2 = (i + 1 < formatString.size()) ? + formatString[i + 1] : static_cast(0); if(c1 == '%' && c2 != 0) { - result += AddTimestampComponent(c2, timeStruct); + result += AddTimestampComponent(c2, timeStruct, timeT); ++i; } else @@ -97,8 +98,42 @@ std::string cmTimestamp::CreateTimestampFromTimeT(time_t timeT, } //---------------------------------------------------------------------------- +time_t cmTimestamp::CreateUtcTimeTFromTm(struct tm &tm) const +{ +#if defined(_MSC_VER) && _MSC_VER >= 1400 + return _mkgmtime(&tm); +#else + // From Linux timegm() manpage. + + const char * tz = cmSystemTools::GetEnv("TZ"); + + if (tz) + { + tz = strdup(tz); + } + + // The standard says that "TZ=" or "TZ=[UNRECOGNIZED_TZ]" means UTC. + // It seems that "TZ=" does NOT work, at least under Windows + // with neither MSVC nor MinGW, so let's use explicit "TZ=UTC" + + cmSystemTools::PutEnv(std::string("TZ=UTC")); + + tzset(); + + time_t result = mktime(&tm); + + cmSystemTools::PutEnv(std::string("TZ=") + + std::string(tz ? tz : "")); + + tzset(); + + return result; +} +#endif + +//---------------------------------------------------------------------------- std::string cmTimestamp::AddTimestampComponent( - char flag, struct tm& timeStruct) + char flag, struct tm& timeStruct, const time_t timeT) const { std::string formatString = "%"; formatString += flag; @@ -117,6 +152,25 @@ std::string cmTimestamp::AddTimestampComponent( case 'y': case 'Y': break; + case 's': // Seconds since UNIX epoch (midnight 1-jan-1970) + { + // Build a time_t for UNIX epoch and substract from the input "timeT": + struct tm tm_unix_epoch = {0}; + tm_unix_epoch.tm_mday = 1; + tm_unix_epoch.tm_year = 1970-1900; + + const time_t unix_epoch = this->CreateUtcTimeTFromTm(tm_unix_epoch); + if (unix_epoch == -1) + { + cmSystemTools::Error("Error generating UNIX epoch in " + "STRING(TIMESTAMP ...). Please, file a bug report aginst CMake"); + return std::string(); + } + + std::stringstream ss; + ss << static_cast(difftime(timeT, unix_epoch)); + return ss.str(); + } default: { return formatString; diff --git a/Source/cmTimestamp.h b/Source/cmTimestamp.h index 24c1869..7c4b216 100644 --- a/Source/cmTimestamp.h +++ b/Source/cmTimestamp.h @@ -16,7 +16,7 @@ #include /** \class cmTimestamp - * \brief Utility class to generate sting representation of a timestamp + * \brief Utility class to generate string representation of a timestamp * */ class cmTimestamp @@ -30,10 +30,13 @@ public: const std::string& formatString, bool utcFlag); private: - std::string CreateTimestampFromTimeT(time_t timeT, - std::string formatString, bool utcFlag); + time_t CreateUtcTimeTFromTm(struct tm& timeStruct) const; - std::string AddTimestampComponent(char flag, struct tm& timeStruct); + std::string CreateTimestampFromTimeT( + time_t timeT, std::string formatString, bool utcFlag) const; + + std::string AddTimestampComponent( + char flag, struct tm& timeStruct, time_t timeT) const; }; diff --git a/Tests/CMakeTests/String-TIMESTAMP-UnixTime.cmake b/Tests/CMakeTests/String-TIMESTAMP-UnixTime.cmake new file mode 100644 index 0000000..a93e7f5 --- /dev/null +++ b/Tests/CMakeTests/String-TIMESTAMP-UnixTime.cmake @@ -0,0 +1,22 @@ +string(TIMESTAMP timestamp "[%Y-%m-%d %H:%M:%S] %s" UTC) + +string(TIMESTAMP unix_time "%s") + +string(TIMESTAMP year "%Y" UTC) +string(TIMESTAMP days "%j" UTC) + +# Doing proper date calculations here to verify unix timestamps +# could be error prone. +# At the very least use some safe lower and upper bounds to +# see if we are somewhere in the right region. + +math(EXPR years_since_epoch "${year} - 1970") +math(EXPR lower_bound "((${years_since_epoch} * 365) + ${days}) * 86400") +math(EXPR upper_bound "((${years_since_epoch} * 366) + ${days}) * 86400") + + +if(unix_time GREATER lower_bound AND unix_time LESS upper_bound) + message("~${unix_time}~") +else() + message(FATAL_ERROR "${timestamp} unix time not in expected range [${lower_bound}, ${upper_bound}]") +endif() diff --git a/Tests/CMakeTests/StringTest.cmake.in b/Tests/CMakeTests/StringTest.cmake.in index 92e70c3..aba35fe 100644 --- a/Tests/CMakeTests/StringTest.cmake.in +++ b/Tests/CMakeTests/StringTest.cmake.in @@ -36,6 +36,8 @@ set(TIMESTAMP-IncompleteSpecifier-RESULT 0) set(TIMESTAMP-IncompleteSpecifier-STDERR "~foobar%~") set(TIMESTAMP-AllSpecifiers-RESULT 0) set(TIMESTAMP-AllSpecifiers-STDERR "~[0-9]+(;[0-9]+)*~") +set(TIMESTAMP-UnixTime-RESULT 0) +set(TIMESTAMP-UnixTime-STDERR "~[1-9][0-9]+~") include("@CMAKE_CURRENT_SOURCE_DIR@/CheckCMakeTest.cmake") check_cmake_test(String @@ -58,6 +60,7 @@ check_cmake_test(String TIMESTAMP-UnknownSpecifier TIMESTAMP-IncompleteSpecifier TIMESTAMP-AllSpecifiers + TIMESTAMP-UnixTime ) # Execute each test listed in StringTestScript.cmake: @@ -68,9 +71,12 @@ set(number_of_tests_expected 70) include("@CMAKE_CURRENT_SOURCE_DIR@/ExecuteScriptTests.cmake") execute_all_script_tests(${scriptname} number_of_tests_executed) +string(TIMESTAMP timestamp "[%Y-%m-%d %H:%M:%S] UTC %s" UTC) + # And verify that number_of_tests_executed is at least as many as we know # about as of this writing... # +message(STATUS "timestamp='${timestamp}'") message(STATUS "scriptname='${scriptname}'") message(STATUS "number_of_tests_executed='${number_of_tests_executed}'") message(STATUS "number_of_tests_expected='${number_of_tests_expected}'") ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake From nilsgladitz at gmail.com Tue Feb 16 18:05:31 2016 From: nilsgladitz at gmail.com (Nils Gladitz) Date: Tue, 16 Feb 2016 18:05:31 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-163-g22be9ed Message-ID: <20160216230531.57A10E5B38@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, next has been updated via 22be9ed8cfb5190671b606859354d7ab82d2c958 (commit) via 0197a73c2da37347844cf62842a17887eeb045fa (commit) from 7c655095751e2bf37bc04db9c5f77d95acd4c985 (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=22be9ed8cfb5190671b606859354d7ab82d2c958 commit 22be9ed8cfb5190671b606859354d7ab82d2c958 Merge: 7c65509 0197a73 Author: Nils Gladitz AuthorDate: Tue Feb 16 18:05:30 2016 -0500 Commit: CMake Topic Stage CommitDate: Tue Feb 16 18:05:30 2016 -0500 Merge topic 'unix-timestamps' into next 0197a73c !fixup CMake: Fix brackets in cmTimestamp MSVC branch https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0197a73c2da37347844cf62842a17887eeb045fa commit 0197a73c2da37347844cf62842a17887eeb045fa Author: Nils Gladitz AuthorDate: Wed Feb 17 00:05:17 2016 +0100 Commit: Nils Gladitz CommitDate: Wed Feb 17 00:05:17 2016 +0100 !fixup CMake: Fix brackets in cmTimestamp MSVC branch diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx index 302ea6d..6e059db 100644 --- a/Source/cmTimestamp.cxx +++ b/Source/cmTimestamp.cxx @@ -128,8 +128,8 @@ time_t cmTimestamp::CreateUtcTimeTFromTm(struct tm &tm) const tzset(); return result; -} #endif +} //---------------------------------------------------------------------------- std::string cmTimestamp::AddTimestampComponent( ----------------------------------------------------------------------- Summary of changes: Source/cmTimestamp.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From nilsgladitz at gmail.com Tue Feb 16 18:05:54 2016 From: nilsgladitz at gmail.com (Nils Gladitz) Date: Tue, 16 Feb 2016 18:05:54 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-165-g99ae7c1 Message-ID: <20160216230554.3991FE5B14@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, next has been updated via 99ae7c1b7e2338a18f054c927cbc64ed4b25e1a1 (commit) via 42a131b8b673535a8255a939b8bb6adc8dccc887 (commit) from 22be9ed8cfb5190671b606859354d7ab82d2c958 (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=99ae7c1b7e2338a18f054c927cbc64ed4b25e1a1 commit 99ae7c1b7e2338a18f054c927cbc64ed4b25e1a1 Merge: 22be9ed 42a131b Author: Nils Gladitz AuthorDate: Tue Feb 16 18:05:53 2016 -0500 Commit: CMake Topic Stage CommitDate: Tue Feb 16 18:05:53 2016 -0500 Merge topic 'unix-timestamps' into next 42a131b8 CMake: Extend TIMESTAMP sub-commands with new unix time format specifier https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=42a131b8b673535a8255a939b8bb6adc8dccc887 commit 42a131b8b673535a8255a939b8bb6adc8dccc887 Author: Jose-Luis Blanco-Claraco AuthorDate: Tue Feb 16 21:48:56 2016 +0100 Commit: Nils Gladitz CommitDate: Wed Feb 17 00:05:42 2016 +0100 CMake: Extend TIMESTAMP sub-commands with new unix time format specifier The new %s format specifier is substituted by file()/string() TIMESTAMP sub-commands with the number of seconds since unix-epoch (1 January 1970 00:00:00 UTC). Co-Authored-By: Nils Gladitz diff --git a/Help/command/string.rst b/Help/command/string.rst index 0361c74..3f4050e 100644 --- a/Help/command/string.rst +++ b/Help/command/string.rst @@ -277,6 +277,7 @@ specifiers: %j The day of the current year (001-366). %m The month of the current year (01-12). %M The minute of the current hour (00-59). + %s Seconds since midnight (UTC) 1-Jan-1970 (UNIX time). %S The second of the current minute. 60 represents a leap second. (00-60) %U The week number of the current year (00-53). diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx index 6fd6ab7..6e059db 100644 --- a/Source/cmTimestamp.cxx +++ b/Source/cmTimestamp.cxx @@ -12,9 +12,11 @@ #include "cmTimestamp.h" #include +#include #include #include +#include //---------------------------------------------------------------------------- std::string cmTimestamp::CurrentTime( @@ -44,7 +46,7 @@ std::string cmTimestamp::FileModificationTime(const char* path, //---------------------------------------------------------------------------- std::string cmTimestamp::CreateTimestampFromTimeT(time_t timeT, - std::string formatString, bool utcFlag) + std::string formatString, bool utcFlag) const { if(formatString.empty()) { @@ -55,8 +57,7 @@ std::string cmTimestamp::CreateTimestampFromTimeT(time_t timeT, } } - struct tm timeStruct; - memset(&timeStruct, 0, sizeof(timeStruct)); + struct tm timeStruct = {0}; struct tm* ptr = (struct tm*) 0; if(utcFlag) @@ -79,12 +80,12 @@ std::string cmTimestamp::CreateTimestampFromTimeT(time_t timeT, for(std::string::size_type i = 0; i < formatString.size(); ++i) { char c1 = formatString[i]; - char c2 = (i+1 < formatString.size()) ? - formatString[i+1] : static_cast(0); + char c2 = (i + 1 < formatString.size()) ? + formatString[i + 1] : static_cast(0); if(c1 == '%' && c2 != 0) { - result += AddTimestampComponent(c2, timeStruct); + result += AddTimestampComponent(c2, timeStruct, timeT); ++i; } else @@ -97,8 +98,42 @@ std::string cmTimestamp::CreateTimestampFromTimeT(time_t timeT, } //---------------------------------------------------------------------------- +time_t cmTimestamp::CreateUtcTimeTFromTm(struct tm &tm) const +{ +#if defined(_MSC_VER) && _MSC_VER >= 1400 + return _mkgmtime(&tm); +#else + // From Linux timegm() manpage. + + const char * tz = cmSystemTools::GetEnv("TZ"); + + if (tz) + { + tz = strdup(tz); + } + + // The standard says that "TZ=" or "TZ=[UNRECOGNIZED_TZ]" means UTC. + // It seems that "TZ=" does NOT work, at least under Windows + // with neither MSVC nor MinGW, so let's use explicit "TZ=UTC" + + cmSystemTools::PutEnv(std::string("TZ=UTC")); + + tzset(); + + time_t result = mktime(&tm); + + cmSystemTools::PutEnv(std::string("TZ=") + + std::string(tz ? tz : "")); + + tzset(); + + return result; +#endif +} + +//---------------------------------------------------------------------------- std::string cmTimestamp::AddTimestampComponent( - char flag, struct tm& timeStruct) + char flag, struct tm& timeStruct, const time_t timeT) const { std::string formatString = "%"; formatString += flag; @@ -117,6 +152,25 @@ std::string cmTimestamp::AddTimestampComponent( case 'y': case 'Y': break; + case 's': // Seconds since UNIX epoch (midnight 1-jan-1970) + { + // Build a time_t for UNIX epoch and substract from the input "timeT": + struct tm tm_unix_epoch = {0}; + tm_unix_epoch.tm_mday = 1; + tm_unix_epoch.tm_year = 1970-1900; + + const time_t unix_epoch = this->CreateUtcTimeTFromTm(tm_unix_epoch); + if (unix_epoch == -1) + { + cmSystemTools::Error("Error generating UNIX epoch in " + "STRING(TIMESTAMP ...). Please, file a bug report aginst CMake"); + return std::string(); + } + + std::stringstream ss; + ss << static_cast(difftime(timeT, unix_epoch)); + return ss.str(); + } default: { return formatString; diff --git a/Source/cmTimestamp.h b/Source/cmTimestamp.h index 24c1869..7c4b216 100644 --- a/Source/cmTimestamp.h +++ b/Source/cmTimestamp.h @@ -16,7 +16,7 @@ #include /** \class cmTimestamp - * \brief Utility class to generate sting representation of a timestamp + * \brief Utility class to generate string representation of a timestamp * */ class cmTimestamp @@ -30,10 +30,13 @@ public: const std::string& formatString, bool utcFlag); private: - std::string CreateTimestampFromTimeT(time_t timeT, - std::string formatString, bool utcFlag); + time_t CreateUtcTimeTFromTm(struct tm& timeStruct) const; - std::string AddTimestampComponent(char flag, struct tm& timeStruct); + std::string CreateTimestampFromTimeT( + time_t timeT, std::string formatString, bool utcFlag) const; + + std::string AddTimestampComponent( + char flag, struct tm& timeStruct, time_t timeT) const; }; diff --git a/Tests/CMakeTests/String-TIMESTAMP-UnixTime.cmake b/Tests/CMakeTests/String-TIMESTAMP-UnixTime.cmake new file mode 100644 index 0000000..a93e7f5 --- /dev/null +++ b/Tests/CMakeTests/String-TIMESTAMP-UnixTime.cmake @@ -0,0 +1,22 @@ +string(TIMESTAMP timestamp "[%Y-%m-%d %H:%M:%S] %s" UTC) + +string(TIMESTAMP unix_time "%s") + +string(TIMESTAMP year "%Y" UTC) +string(TIMESTAMP days "%j" UTC) + +# Doing proper date calculations here to verify unix timestamps +# could be error prone. +# At the very least use some safe lower and upper bounds to +# see if we are somewhere in the right region. + +math(EXPR years_since_epoch "${year} - 1970") +math(EXPR lower_bound "((${years_since_epoch} * 365) + ${days}) * 86400") +math(EXPR upper_bound "((${years_since_epoch} * 366) + ${days}) * 86400") + + +if(unix_time GREATER lower_bound AND unix_time LESS upper_bound) + message("~${unix_time}~") +else() + message(FATAL_ERROR "${timestamp} unix time not in expected range [${lower_bound}, ${upper_bound}]") +endif() diff --git a/Tests/CMakeTests/StringTest.cmake.in b/Tests/CMakeTests/StringTest.cmake.in index 92e70c3..aba35fe 100644 --- a/Tests/CMakeTests/StringTest.cmake.in +++ b/Tests/CMakeTests/StringTest.cmake.in @@ -36,6 +36,8 @@ set(TIMESTAMP-IncompleteSpecifier-RESULT 0) set(TIMESTAMP-IncompleteSpecifier-STDERR "~foobar%~") set(TIMESTAMP-AllSpecifiers-RESULT 0) set(TIMESTAMP-AllSpecifiers-STDERR "~[0-9]+(;[0-9]+)*~") +set(TIMESTAMP-UnixTime-RESULT 0) +set(TIMESTAMP-UnixTime-STDERR "~[1-9][0-9]+~") include("@CMAKE_CURRENT_SOURCE_DIR@/CheckCMakeTest.cmake") check_cmake_test(String @@ -58,6 +60,7 @@ check_cmake_test(String TIMESTAMP-UnknownSpecifier TIMESTAMP-IncompleteSpecifier TIMESTAMP-AllSpecifiers + TIMESTAMP-UnixTime ) # Execute each test listed in StringTestScript.cmake: @@ -68,9 +71,12 @@ set(number_of_tests_expected 70) include("@CMAKE_CURRENT_SOURCE_DIR@/ExecuteScriptTests.cmake") execute_all_script_tests(${scriptname} number_of_tests_executed) +string(TIMESTAMP timestamp "[%Y-%m-%d %H:%M:%S] UTC %s" UTC) + # And verify that number_of_tests_executed is at least as many as we know # about as of this writing... # +message(STATUS "timestamp='${timestamp}'") message(STATUS "scriptname='${scriptname}'") message(STATUS "number_of_tests_executed='${number_of_tests_executed}'") message(STATUS "number_of_tests_expected='${number_of_tests_expected}'") ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake From kwrobot at kitware.com Wed Feb 17 00:01:07 2016 From: kwrobot at kitware.com (Kitware Robot) Date: Wed, 17 Feb 2016 00:01:07 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc2-84-g4468e08 Message-ID: <20160217050107.83B7BE5963@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 4468e083f40c108d39c0d1799410eeb194d4215c (commit) from 8dfb6f8b372b159c050b6ea5e16b4e44dd9ed095 (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=4468e083f40c108d39c0d1799410eeb194d4215c commit 4468e083f40c108d39c0d1799410eeb194d4215c Author: Kitware Robot AuthorDate: Wed Feb 17 00:01:05 2016 -0500 Commit: Kitware Robot CommitDate: Wed Feb 17 00:01:05 2016 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index d81477a..533cff4 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 5) -set(CMake_VERSION_PATCH 20160216) +set(CMake_VERSION_PATCH 20160217) #set(CMake_VERSION_RC 1) ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 17 08:53:49 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 17 Feb 2016 08:53:49 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-167-gfd8d380 Message-ID: <20160217135349.89B54E565D@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, next has been updated via fd8d38038c72efac13f7fbf040669697890c3a94 (commit) via bf643286d32b569d20e7b7431ecc8755443fe5c4 (commit) from 99ae7c1b7e2338a18f054c927cbc64ed4b25e1a1 (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=fd8d38038c72efac13f7fbf040669697890c3a94 commit fd8d38038c72efac13f7fbf040669697890c3a94 Merge: 99ae7c1 bf64328 Author: Brad King AuthorDate: Wed Feb 17 08:53:48 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 17 08:53:48 2016 -0500 Merge topic 'FindwxWidgets-msys2-paths' into next bf643286 FindwxWidgets: Resolve Cygwin/MSYS paths to Windows paths https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf643286d32b569d20e7b7431ecc8755443fe5c4 commit bf643286d32b569d20e7b7431ecc8755443fe5c4 Author: Wayne Stambaugh AuthorDate: Sun Feb 14 20:51:11 2016 +0100 Commit: Brad King CommitDate: Wed Feb 17 08:52:56 2016 -0500 FindwxWidgets: Resolve Cygwin/MSYS paths to Windows paths We use `sh wx-config` to launch the `wx-config` tool so that it can run even on Windows. Since it is always a shell script its output may use POSIX paths even on Windows. Use `cygpath` to convert to Windows paths. diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake index 49ce57e..8c07e6c 100644 --- a/Modules/FindwxWidgets.cmake +++ b/Modules/FindwxWidgets.cmake @@ -835,6 +835,36 @@ else() endif() endif() + # When using wx-config in MSYS, the include paths are UNIX style paths which may or may + # not work correctly depending on you MSYS/MinGW configuration. CMake expects native + # paths internally. + if(wxWidgets_FOUND AND MSYS) + find_program(_cygpath_exe cygpath ONLY_CMAKE_FIND_ROOT_PATH) + DBG_MSG_V("_cygpath_exe: ${_cygpath_exe}") + if(_cygpath_exe) + set(_tmp_path "") + foreach(_path ${wxWidgets_INCLUDE_DIRS}) + execute_process( + COMMAND cygpath -w ${_path} + OUTPUT_VARIABLE _native_path + RESULT_VARIABLE _retv + OUTPUT_STRIP_TRAILING_WHITESPACE + ERROR_QUIET + ) + if(_retv EQUAL 0) + file(TO_CMAKE_PATH ${_native_path} _native_path) + DBG_MSG_V("Path ${_path} converted to ${_native_path}") + set(_tmp_path "${_tmp_path} ${_native_path}") + endif() + endforeach() + DBG_MSG("Setting wxWidgets_INCLUDE_DIRS = ${_tmp_path}") + set(wxWidgets_INCLUDE_DIRS ${_tmp_path}) + separate_arguments(wxWidgets_INCLUDE_DIRS) + list(REMOVE_ITEM wxWidgets_INCLUDE_DIRS "") + endif() + unset(_cygpath_exe CACHE) + endif() + #===================================================================== # Neither UNIX_FIND_STYLE, nor WIN32_FIND_STYLE #===================================================================== ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 17 09:05:02 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 17 Feb 2016 09:05:02 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-169-g02e0f70 Message-ID: <20160217140502.A8E6EE5838@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, next has been updated via 02e0f707a9b63eba1219563afb253e0bd91353bb (commit) via 8f153e9b9157236a14bc6a289453d6d4934ea048 (commit) from fd8d38038c72efac13f7fbf040669697890c3a94 (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=02e0f707a9b63eba1219563afb253e0bd91353bb commit 02e0f707a9b63eba1219563afb253e0bd91353bb Merge: fd8d380 8f153e9 Author: Brad King AuthorDate: Wed Feb 17 09:05:01 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 17 09:05:01 2016 -0500 Merge topic 'reduce-entropy-consumption' into next 8f153e9b cmSystemTools: Avoid excess entropy consumption by RandomSeed (#15976) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8f153e9b9157236a14bc6a289453d6d4934ea048 commit 8f153e9b9157236a14bc6a289453d6d4934ea048 Author: Cristian Rodr?guez AuthorDate: Wed Feb 17 09:02:04 2016 -0500 Commit: Brad King CommitDate: Wed Feb 17 09:04:44 2016 -0500 cmSystemTools: Avoid excess entropy consumption by RandomSeed (#15976) Read `/dev/urandom` without buffering to avoid taking more than we need. diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 3ba7287..5ad2475 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -2184,8 +2184,10 @@ unsigned int cmSystemTools::RandomSeed() } seed; // Try using a real random source. - cmsys::ifstream fin("/dev/urandom"); - if(fin && fin.read(seed.bytes, sizeof(seed)) && + cmsys::ifstream fin; + fin.rdbuf()->pubsetbuf(0, 0); // Unbuffered read. + fin.open("/dev/urandom"); + if(fin.good() && fin.read(seed.bytes, sizeof(seed)) && fin.gcount() == sizeof(seed)) { return seed.integer; ----------------------------------------------------------------------- Summary of changes: Source/cmSystemTools.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 17 09:22:40 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 17 Feb 2016 09:22:40 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-171-gbef0a59 Message-ID: <20160217142240.D7C96E56CD@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, next has been updated via bef0a59e9e6358bba3f678eec72469e2450f616e (commit) via beaa4fa5ddba4298dfc94b38e1695bac28ea5faf (commit) from 02e0f707a9b63eba1219563afb253e0bd91353bb (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=bef0a59e9e6358bba3f678eec72469e2450f616e commit bef0a59e9e6358bba3f678eec72469e2450f616e Merge: 02e0f70 beaa4fa Author: Brad King AuthorDate: Wed Feb 17 09:22:40 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 17 09:22:40 2016 -0500 Merge topic 'de-deprecate-CMakeForceCompiler' into next beaa4fa5 CMakeForceCompiler: De-deprecate until more use cases have alternatives https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=beaa4fa5ddba4298dfc94b38e1695bac28ea5faf commit beaa4fa5ddba4298dfc94b38e1695bac28ea5faf Author: Brad King AuthorDate: Wed Feb 17 09:14:20 2016 -0500 Commit: Brad King CommitDate: Wed Feb 17 09:15:18 2016 -0500 CMakeForceCompiler: De-deprecate until more use cases have alternatives We deprecated this module in commit v3.5.0-rc1~295^2 (CMakeForceCompiler: Deprecate this module and its macros, 2015-10-19) in order to determine whether anyone still has use cases that require it. Indeed we still need to provide a way to work with toolchains that cannot link binaries without special flags. Remove the deprecation warnings until we can provide an alternative to the module for this use case. diff --git a/Help/release/3.5.rst b/Help/release/3.5.rst index 62703b3..009eb3c 100644 --- a/Help/release/3.5.rst +++ b/Help/release/3.5.rst @@ -159,9 +159,6 @@ Other Deprecated and Removed Features =============================== -* The :module:`CMakeForceCompiler` module and its macros are now deprecated. - See module documentation for an explanation. - * The :manual:`cmake(1)` ``-E time`` command now properly passes arguments with spaces or special characters through to the child process. This may break scripts that worked around the bug with their own extra diff --git a/Modules/CMakeForceCompiler.cmake b/Modules/CMakeForceCompiler.cmake index 343ab3f..faa0dc5 100644 --- a/Modules/CMakeForceCompiler.cmake +++ b/Modules/CMakeForceCompiler.cmake @@ -2,7 +2,9 @@ # CMakeForceCompiler # ------------------ # -# Deprecated. Do not use. +# Discouraged. Avoid using this module if possible. It will be deprecated +# by a future version of CMake once alternatives have been provided for all +# toolchain file use cases. # # The macros provided by this module were once intended for use by # cross-compiling toolchain files when CMake was not able to automatically @@ -12,6 +14,12 @@ # CMake detects from a compiler is now too extensive to be provided by # toolchain files using these macros. # +# The only known remaining use case for these macros is to write toolchain +# files for cross-compilers that cannot link binaries without special flags or +# custom linker scripts. These macros cause CMake to skip checks it normally +# performs as part of enabling a language and introspecting the toolchain. +# However, skipping these checks may limit some generation functionality. +# # ------------------------------------------------------------------------- # # Macro CMAKE_FORCE_C_COMPILER has the following signature: @@ -70,8 +78,6 @@ # License text for the above reference.) macro(CMAKE_FORCE_C_COMPILER compiler id) - message(DEPRECATION "The CMAKE_FORCE_C_COMPILER macro is deprecated. " - "Instead just set CMAKE_C_COMPILER and allow CMake to identify the compiler.") set(CMAKE_C_COMPILER "${compiler}") set(CMAKE_C_COMPILER_ID_RUN TRUE) set(CMAKE_C_COMPILER_ID ${id}) @@ -84,8 +90,6 @@ macro(CMAKE_FORCE_C_COMPILER compiler id) endmacro() macro(CMAKE_FORCE_CXX_COMPILER compiler id) - message(DEPRECATION "The CMAKE_FORCE_CXX_COMPILER macro is deprecated. " - "Instead just set CMAKE_CXX_COMPILER and allow CMake to identify the compiler.") set(CMAKE_CXX_COMPILER "${compiler}") set(CMAKE_CXX_COMPILER_ID_RUN TRUE) set(CMAKE_CXX_COMPILER_ID ${id}) @@ -98,8 +102,6 @@ macro(CMAKE_FORCE_CXX_COMPILER compiler id) endmacro() macro(CMAKE_FORCE_Fortran_COMPILER compiler id) - message(DEPRECATION "The CMAKE_FORCE_Fortran_COMPILER macro is deprecated. " - "Instead just set CMAKE_Fortran_COMPILER and allow CMake to identify the compiler.") set(CMAKE_Fortran_COMPILER "${compiler}") set(CMAKE_Fortran_COMPILER_ID_RUN TRUE) set(CMAKE_Fortran_COMPILER_ID ${id}) ----------------------------------------------------------------------- Summary of changes: Help/release/3.5.rst | 3 --- Modules/CMakeForceCompiler.cmake | 16 +++++++++------- 2 files changed, 9 insertions(+), 10 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 17 10:18:01 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 17 Feb 2016 10:18:01 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-173-g7ed1d19 Message-ID: <20160217151801.8E600E5700@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, next has been updated via 7ed1d19a74cd9febfff80bde3d98c1f5f6a260d5 (commit) via c978223c859ba4a09cd30876e5f1f646748785e0 (commit) from bef0a59e9e6358bba3f678eec72469e2450f616e (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=7ed1d19a74cd9febfff80bde3d98c1f5f6a260d5 commit 7ed1d19a74cd9febfff80bde3d98c1f5f6a260d5 Merge: bef0a59 c978223 Author: Brad King AuthorDate: Wed Feb 17 10:18:00 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 17 10:18:00 2016 -0500 Merge topic 'doc-install-component-association' into next c978223c Help: Clarify install(TARGETS) INCLUDES DESTINATION option https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c978223c859ba4a09cd30876e5f1f646748785e0 commit c978223c859ba4a09cd30876e5f1f646748785e0 Author: Brad King AuthorDate: Wed Feb 17 10:11:01 2016 -0500 Commit: Brad King CommitDate: Wed Feb 17 10:14:54 2016 -0500 Help: Clarify install(TARGETS) INCLUDES DESTINATION option The option does not actually participate in argument groups like the others because it does not actually install anything. Fix the order in the documentation accordingly. Reported-by: Daniel Wirtz diff --git a/Help/command/install.rst b/Help/command/install.rst index 189b51c..aaf12cc 100644 --- a/Help/command/install.rst +++ b/Help/command/install.rst @@ -76,13 +76,14 @@ Installing Targets [[ARCHIVE|LIBRARY|RUNTIME|FRAMEWORK|BUNDLE| PRIVATE_HEADER|PUBLIC_HEADER|RESOURCE] [DESTINATION ] - [INCLUDES DESTINATION [ ...]] [PERMISSIONS permissions...] [CONFIGURATIONS [Debug|Release|...]] [COMPONENT ] [OPTIONAL] [EXCLUDE_FROM_ALL] [NAMELINK_ONLY|NAMELINK_SKIP] - ] [...]) + ] [...] + [INCLUDES DESTINATION [ ...]] + ) The ``TARGETS`` form specifies rules for installing targets from a project. There are five kinds of target files that may be installed: @@ -102,11 +103,7 @@ change the type of target to which the subsequent properties apply. If none is given the installation properties apply to all target types. If only one is given then only targets of that type will be installed (which can be used to install just a DLL or just an import -library). The ``INCLUDES DESTINATION`` specifies a list of directories -which will be added to the :prop_tgt:`INTERFACE_INCLUDE_DIRECTORIES` -target property of the ```` when exported by the -:command:`install(EXPORT)` command. If a relative path is -specified, it is treated as relative to the ``$``. +library). The ``PRIVATE_HEADER``, ``PUBLIC_HEADER``, and ``RESOURCE`` arguments cause subsequent properties to be applied to installing a ``FRAMEWORK`` @@ -136,6 +133,14 @@ option installs nothing. See the :prop_tgt:`VERSION` and :prop_tgt:`SOVERSION` target properties for details on creating versioned shared libraries. +The ``INCLUDES DESTINATION`` specifies a list of directories +which will be added to the :prop_tgt:`INTERFACE_INCLUDE_DIRECTORIES` +target property of the ```` when exported by the +:command:`install(EXPORT)` command. If a relative path is +specified, it is treated as relative to the ``$``. +This is independent of the rest of the argument groups and does +not actually install anything. + One or more groups of properties may be specified in a single call to the ``TARGETS`` form of this command. A target may be installed more than once to different locations. Consider hypothetical targets ``myExe``, ----------------------------------------------------------------------- Summary of changes: Help/command/install.rst | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 17 10:25:28 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 17 Feb 2016 10:25:28 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc2-86-g445a37f Message-ID: <20160217152528.3BA84E5AC6@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 445a37fc51ca1e295f3779b83c28d9f27624e9f0 (commit) via 184da3f4f6ab74d2024455f8684286b2dbaa6a6e (commit) from 4468e083f40c108d39c0d1799410eeb194d4215c (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=445a37fc51ca1e295f3779b83c28d9f27624e9f0 commit 445a37fc51ca1e295f3779b83c28d9f27624e9f0 Merge: 4468e08 184da3f Author: Brad King AuthorDate: Wed Feb 17 10:25:26 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 17 10:25:26 2016 -0500 Merge topic 'CodeBlocks-more-compilers' 184da3f4 CodeBlocks: improve support for different compilers ----------------------------------------------------------------------- Summary of changes: Source/cmExtraCodeBlocksGenerator.cxx | 61 +++++++++++++++++++++++++++++---- 1 file changed, 55 insertions(+), 6 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 17 10:25:30 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 17 Feb 2016 10:25:30 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc2-88-g0cd8633 Message-ID: <20160217152530.A9E04E574E@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 0cd86338e0ca8f7706945b20c41805529524a8d5 (commit) via bb7a41ab9b0b6a5a2cee3f330a2e223392ee4a70 (commit) from 445a37fc51ca1e295f3779b83c28d9f27624e9f0 (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=0cd86338e0ca8f7706945b20c41805529524a8d5 commit 0cd86338e0ca8f7706945b20c41805529524a8d5 Merge: 445a37f bb7a41a Author: Brad King AuthorDate: Wed Feb 17 10:25:28 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 17 10:25:28 2016 -0500 Merge topic 'FindProtobuf-version' bb7a41ab FindProtobuf: check version ----------------------------------------------------------------------- Summary of changes: Help/release/dev/FindProtobuf-version.rst | 6 +++ Modules/FindProtobuf.cmake | 59 ++++++++++++++++++++++++- Tests/CMakeOnly/AllFindModules/CMakeLists.txt | 1 + 3 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 Help/release/dev/FindProtobuf-version.rst hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 17 10:25:32 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 17 Feb 2016 10:25:32 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc2-90-ged1b343 Message-ID: <20160217152532.E6CEFE5AD1@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 ed1b3430fcfc906780b68fe4a073590c6d23ff08 (commit) via bf643286d32b569d20e7b7431ecc8755443fe5c4 (commit) from 0cd86338e0ca8f7706945b20c41805529524a8d5 (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=ed1b3430fcfc906780b68fe4a073590c6d23ff08 commit ed1b3430fcfc906780b68fe4a073590c6d23ff08 Merge: 0cd8633 bf64328 Author: Brad King AuthorDate: Wed Feb 17 10:25:31 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 17 10:25:31 2016 -0500 Merge topic 'FindwxWidgets-msys2-paths' bf643286 FindwxWidgets: Resolve Cygwin/MSYS paths to Windows paths ----------------------------------------------------------------------- Summary of changes: Modules/FindwxWidgets.cmake | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 17 10:25:48 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 17 Feb 2016 10:25:48 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-178-g46678f7 Message-ID: <20160217152548.22D21E5494@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, next has been updated via 46678f7d22fd0249e478f4896703fddc3035137c (commit) via ed1b3430fcfc906780b68fe4a073590c6d23ff08 (commit) via 0cd86338e0ca8f7706945b20c41805529524a8d5 (commit) via 445a37fc51ca1e295f3779b83c28d9f27624e9f0 (commit) via 4468e083f40c108d39c0d1799410eeb194d4215c (commit) from 7ed1d19a74cd9febfff80bde3d98c1f5f6a260d5 (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=46678f7d22fd0249e478f4896703fddc3035137c commit 46678f7d22fd0249e478f4896703fddc3035137c Merge: 7ed1d19 ed1b343 Author: Brad King AuthorDate: Wed Feb 17 10:25:40 2016 -0500 Commit: Brad King CommitDate: Wed Feb 17 10:25:40 2016 -0500 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From nilsgladitz at gmail.com Wed Feb 17 10:50:48 2016 From: nilsgladitz at gmail.com (Nils Gladitz) Date: Wed, 17 Feb 2016 10:50:48 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-180-g27dc919 Message-ID: <20160217155048.26B12E51B1@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, next has been updated via 27dc919a85b74389fe8335b4ac6bba990c82c3a1 (commit) via eb5f4ece7281a83775ae9dd409f23e77c67e4743 (commit) from 46678f7d22fd0249e478f4896703fddc3035137c (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=27dc919a85b74389fe8335b4ac6bba990c82c3a1 commit 27dc919a85b74389fe8335b4ac6bba990c82c3a1 Merge: 46678f7 eb5f4ec Author: Nils Gladitz AuthorDate: Wed Feb 17 10:50:47 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 17 10:50:47 2016 -0500 Merge topic 'unix-timestamps' into next eb5f4ece !fixup CMake: Work around compiler warnings; add release note https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eb5f4ece7281a83775ae9dd409f23e77c67e4743 commit eb5f4ece7281a83775ae9dd409f23e77c67e4743 Author: Nils Gladitz AuthorDate: Wed Feb 17 16:45:15 2016 +0100 Commit: Nils Gladitz CommitDate: Wed Feb 17 16:45:15 2016 +0100 !fixup CMake: Work around compiler warnings; add release note diff --git a/Help/release/dev/unix-timestamps.rst b/Help/release/dev/unix-timestamps.rst new file mode 100644 index 0000000..cdb0e5b --- /dev/null +++ b/Help/release/dev/unix-timestamps.rst @@ -0,0 +1,6 @@ +unix-timestamps +--------------- + +* The :command:`string(TIMESTAMP)` and :command:`file(TIMESTAMP)` + commands gained support for the ``%s`` placeholder. This is + the number of seconds since the UNIX Epoch. diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx index 6e059db..2724e2d 100644 --- a/Source/cmTimestamp.cxx +++ b/Source/cmTimestamp.cxx @@ -57,7 +57,8 @@ std::string cmTimestamp::CreateTimestampFromTimeT(time_t timeT, } } - struct tm timeStruct = {0}; + struct tm timeStruct; + memset(&timeStruct, 0, sizeof(timeStruct)); struct tm* ptr = (struct tm*) 0; if(utcFlag) @@ -155,12 +156,13 @@ std::string cmTimestamp::AddTimestampComponent( case 's': // Seconds since UNIX epoch (midnight 1-jan-1970) { // Build a time_t for UNIX epoch and substract from the input "timeT": - struct tm tm_unix_epoch = {0}; - tm_unix_epoch.tm_mday = 1; - tm_unix_epoch.tm_year = 1970-1900; + struct tm tmUnixEpoch; + memset(&timeStruct, 0, sizeof(tmUnixEpoch)); + tmUnixEpoch.tm_mday = 1; + tmUnixEpoch.tm_year = 1970-1900; - const time_t unix_epoch = this->CreateUtcTimeTFromTm(tm_unix_epoch); - if (unix_epoch == -1) + const time_t unixEpoch = this->CreateUtcTimeTFromTm(tmUnixEpoch); + if (unixEpoch == -1) { cmSystemTools::Error("Error generating UNIX epoch in " "STRING(TIMESTAMP ...). Please, file a bug report aginst CMake"); @@ -168,7 +170,7 @@ std::string cmTimestamp::AddTimestampComponent( } std::stringstream ss; - ss << static_cast(difftime(timeT, unix_epoch)); + ss << static_cast(difftime(timeT, unixEpoch)); return ss.str(); } default: ----------------------------------------------------------------------- Summary of changes: Help/release/dev/unix-timestamps.rst | 6 ++++++ Source/cmTimestamp.cxx | 16 +++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 Help/release/dev/unix-timestamps.rst hooks/post-receive -- CMake From nilsgladitz at gmail.com Wed Feb 17 10:51:25 2016 From: nilsgladitz at gmail.com (Nils Gladitz) Date: Wed, 17 Feb 2016 10:51:25 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-182-ga3e303b Message-ID: <20160217155125.14868E581D@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, next has been updated via a3e303bd63a4ac6c5ed6a2ef0863f677194ecef9 (commit) via 9e8463f5a987fe2372367ee7a07ce7b359c0317b (commit) from 27dc919a85b74389fe8335b4ac6bba990c82c3a1 (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=a3e303bd63a4ac6c5ed6a2ef0863f677194ecef9 commit a3e303bd63a4ac6c5ed6a2ef0863f677194ecef9 Merge: 27dc919 9e8463f Author: Nils Gladitz AuthorDate: Wed Feb 17 10:51:24 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 17 10:51:24 2016 -0500 Merge topic 'unix-timestamps' into next 9e8463f5 CMake: Extend TIMESTAMP sub-commands with new unix time format specifier https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9e8463f5a987fe2372367ee7a07ce7b359c0317b commit 9e8463f5a987fe2372367ee7a07ce7b359c0317b Author: Jose-Luis Blanco-Claraco AuthorDate: Tue Feb 16 21:48:56 2016 +0100 Commit: Nils Gladitz CommitDate: Wed Feb 17 16:51:02 2016 +0100 CMake: Extend TIMESTAMP sub-commands with new unix time format specifier The new %s format specifier is substituted by file()/string() TIMESTAMP sub-commands with the number of seconds since unix-epoch (1 January 1970 00:00:00 UTC). Co-Authored-By: Nils Gladitz diff --git a/Help/command/string.rst b/Help/command/string.rst index 0361c74..3f4050e 100644 --- a/Help/command/string.rst +++ b/Help/command/string.rst @@ -277,6 +277,7 @@ specifiers: %j The day of the current year (001-366). %m The month of the current year (01-12). %M The minute of the current hour (00-59). + %s Seconds since midnight (UTC) 1-Jan-1970 (UNIX time). %S The second of the current minute. 60 represents a leap second. (00-60) %U The week number of the current year (00-53). diff --git a/Help/release/dev/unix-timestamps.rst b/Help/release/dev/unix-timestamps.rst new file mode 100644 index 0000000..cdb0e5b --- /dev/null +++ b/Help/release/dev/unix-timestamps.rst @@ -0,0 +1,6 @@ +unix-timestamps +--------------- + +* The :command:`string(TIMESTAMP)` and :command:`file(TIMESTAMP)` + commands gained support for the ``%s`` placeholder. This is + the number of seconds since the UNIX Epoch. diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx index 6fd6ab7..2724e2d 100644 --- a/Source/cmTimestamp.cxx +++ b/Source/cmTimestamp.cxx @@ -12,9 +12,11 @@ #include "cmTimestamp.h" #include +#include #include #include +#include //---------------------------------------------------------------------------- std::string cmTimestamp::CurrentTime( @@ -44,7 +46,7 @@ std::string cmTimestamp::FileModificationTime(const char* path, //---------------------------------------------------------------------------- std::string cmTimestamp::CreateTimestampFromTimeT(time_t timeT, - std::string formatString, bool utcFlag) + std::string formatString, bool utcFlag) const { if(formatString.empty()) { @@ -79,12 +81,12 @@ std::string cmTimestamp::CreateTimestampFromTimeT(time_t timeT, for(std::string::size_type i = 0; i < formatString.size(); ++i) { char c1 = formatString[i]; - char c2 = (i+1 < formatString.size()) ? - formatString[i+1] : static_cast(0); + char c2 = (i + 1 < formatString.size()) ? + formatString[i + 1] : static_cast(0); if(c1 == '%' && c2 != 0) { - result += AddTimestampComponent(c2, timeStruct); + result += AddTimestampComponent(c2, timeStruct, timeT); ++i; } else @@ -97,8 +99,42 @@ std::string cmTimestamp::CreateTimestampFromTimeT(time_t timeT, } //---------------------------------------------------------------------------- +time_t cmTimestamp::CreateUtcTimeTFromTm(struct tm &tm) const +{ +#if defined(_MSC_VER) && _MSC_VER >= 1400 + return _mkgmtime(&tm); +#else + // From Linux timegm() manpage. + + const char * tz = cmSystemTools::GetEnv("TZ"); + + if (tz) + { + tz = strdup(tz); + } + + // The standard says that "TZ=" or "TZ=[UNRECOGNIZED_TZ]" means UTC. + // It seems that "TZ=" does NOT work, at least under Windows + // with neither MSVC nor MinGW, so let's use explicit "TZ=UTC" + + cmSystemTools::PutEnv(std::string("TZ=UTC")); + + tzset(); + + time_t result = mktime(&tm); + + cmSystemTools::PutEnv(std::string("TZ=") + + std::string(tz ? tz : "")); + + tzset(); + + return result; +#endif +} + +//---------------------------------------------------------------------------- std::string cmTimestamp::AddTimestampComponent( - char flag, struct tm& timeStruct) + char flag, struct tm& timeStruct, const time_t timeT) const { std::string formatString = "%"; formatString += flag; @@ -117,6 +153,26 @@ std::string cmTimestamp::AddTimestampComponent( case 'y': case 'Y': break; + case 's': // Seconds since UNIX epoch (midnight 1-jan-1970) + { + // Build a time_t for UNIX epoch and substract from the input "timeT": + struct tm tmUnixEpoch; + memset(&timeStruct, 0, sizeof(tmUnixEpoch)); + tmUnixEpoch.tm_mday = 1; + tmUnixEpoch.tm_year = 1970-1900; + + const time_t unixEpoch = this->CreateUtcTimeTFromTm(tmUnixEpoch); + if (unixEpoch == -1) + { + cmSystemTools::Error("Error generating UNIX epoch in " + "STRING(TIMESTAMP ...). Please, file a bug report aginst CMake"); + return std::string(); + } + + std::stringstream ss; + ss << static_cast(difftime(timeT, unixEpoch)); + return ss.str(); + } default: { return formatString; diff --git a/Source/cmTimestamp.h b/Source/cmTimestamp.h index 24c1869..7c4b216 100644 --- a/Source/cmTimestamp.h +++ b/Source/cmTimestamp.h @@ -16,7 +16,7 @@ #include /** \class cmTimestamp - * \brief Utility class to generate sting representation of a timestamp + * \brief Utility class to generate string representation of a timestamp * */ class cmTimestamp @@ -30,10 +30,13 @@ public: const std::string& formatString, bool utcFlag); private: - std::string CreateTimestampFromTimeT(time_t timeT, - std::string formatString, bool utcFlag); + time_t CreateUtcTimeTFromTm(struct tm& timeStruct) const; - std::string AddTimestampComponent(char flag, struct tm& timeStruct); + std::string CreateTimestampFromTimeT( + time_t timeT, std::string formatString, bool utcFlag) const; + + std::string AddTimestampComponent( + char flag, struct tm& timeStruct, time_t timeT) const; }; diff --git a/Tests/CMakeTests/String-TIMESTAMP-UnixTime.cmake b/Tests/CMakeTests/String-TIMESTAMP-UnixTime.cmake new file mode 100644 index 0000000..a93e7f5 --- /dev/null +++ b/Tests/CMakeTests/String-TIMESTAMP-UnixTime.cmake @@ -0,0 +1,22 @@ +string(TIMESTAMP timestamp "[%Y-%m-%d %H:%M:%S] %s" UTC) + +string(TIMESTAMP unix_time "%s") + +string(TIMESTAMP year "%Y" UTC) +string(TIMESTAMP days "%j" UTC) + +# Doing proper date calculations here to verify unix timestamps +# could be error prone. +# At the very least use some safe lower and upper bounds to +# see if we are somewhere in the right region. + +math(EXPR years_since_epoch "${year} - 1970") +math(EXPR lower_bound "((${years_since_epoch} * 365) + ${days}) * 86400") +math(EXPR upper_bound "((${years_since_epoch} * 366) + ${days}) * 86400") + + +if(unix_time GREATER lower_bound AND unix_time LESS upper_bound) + message("~${unix_time}~") +else() + message(FATAL_ERROR "${timestamp} unix time not in expected range [${lower_bound}, ${upper_bound}]") +endif() diff --git a/Tests/CMakeTests/StringTest.cmake.in b/Tests/CMakeTests/StringTest.cmake.in index 92e70c3..aba35fe 100644 --- a/Tests/CMakeTests/StringTest.cmake.in +++ b/Tests/CMakeTests/StringTest.cmake.in @@ -36,6 +36,8 @@ set(TIMESTAMP-IncompleteSpecifier-RESULT 0) set(TIMESTAMP-IncompleteSpecifier-STDERR "~foobar%~") set(TIMESTAMP-AllSpecifiers-RESULT 0) set(TIMESTAMP-AllSpecifiers-STDERR "~[0-9]+(;[0-9]+)*~") +set(TIMESTAMP-UnixTime-RESULT 0) +set(TIMESTAMP-UnixTime-STDERR "~[1-9][0-9]+~") include("@CMAKE_CURRENT_SOURCE_DIR@/CheckCMakeTest.cmake") check_cmake_test(String @@ -58,6 +60,7 @@ check_cmake_test(String TIMESTAMP-UnknownSpecifier TIMESTAMP-IncompleteSpecifier TIMESTAMP-AllSpecifiers + TIMESTAMP-UnixTime ) # Execute each test listed in StringTestScript.cmake: @@ -68,9 +71,12 @@ set(number_of_tests_expected 70) include("@CMAKE_CURRENT_SOURCE_DIR@/ExecuteScriptTests.cmake") execute_all_script_tests(${scriptname} number_of_tests_executed) +string(TIMESTAMP timestamp "[%Y-%m-%d %H:%M:%S] UTC %s" UTC) + # And verify that number_of_tests_executed is at least as many as we know # about as of this writing... # +message(STATUS "timestamp='${timestamp}'") message(STATUS "scriptname='${scriptname}'") message(STATUS "number_of_tests_executed='${number_of_tests_executed}'") message(STATUS "number_of_tests_expected='${number_of_tests_expected}'") ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake From nilsgladitz at gmail.com Wed Feb 17 10:59:55 2016 From: nilsgladitz at gmail.com (Nils Gladitz) Date: Wed, 17 Feb 2016 10:59:55 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-184-g06168be Message-ID: <20160217155955.2BD35E5995@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, next has been updated via 06168be1c3824a0850bb76e0f397aa74a7f8a763 (commit) via 3d2cdb0670cd0b50594dfb53efaaf80487959ead (commit) from a3e303bd63a4ac6c5ed6a2ef0863f677194ecef9 (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=06168be1c3824a0850bb76e0f397aa74a7f8a763 commit 06168be1c3824a0850bb76e0f397aa74a7f8a763 Merge: a3e303b 3d2cdb0 Author: Nils Gladitz AuthorDate: Wed Feb 17 10:59:54 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 17 10:59:54 2016 -0500 Merge topic 'unix-timestamps' into next 3d2cdb06 !fixup CMake: Fix copy&paste error in cmTimestamp https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d2cdb0670cd0b50594dfb53efaaf80487959ead commit 3d2cdb0670cd0b50594dfb53efaaf80487959ead Author: Nils Gladitz AuthorDate: Wed Feb 17 16:59:29 2016 +0100 Commit: Nils Gladitz CommitDate: Wed Feb 17 16:59:29 2016 +0100 !fixup CMake: Fix copy&paste error in cmTimestamp diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx index 2724e2d..2cb3a15 100644 --- a/Source/cmTimestamp.cxx +++ b/Source/cmTimestamp.cxx @@ -157,7 +157,7 @@ std::string cmTimestamp::AddTimestampComponent( { // Build a time_t for UNIX epoch and substract from the input "timeT": struct tm tmUnixEpoch; - memset(&timeStruct, 0, sizeof(tmUnixEpoch)); + memset(&tmUnixEpoch, 0, sizeof(tmUnixEpoch)); tmUnixEpoch.tm_mday = 1; tmUnixEpoch.tm_year = 1970-1900; ----------------------------------------------------------------------- Summary of changes: Source/cmTimestamp.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From nilsgladitz at gmail.com Wed Feb 17 11:03:46 2016 From: nilsgladitz at gmail.com (Nils Gladitz) Date: Wed, 17 Feb 2016 11:03:46 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-186-gba18914 Message-ID: <20160217160346.6E22EE5A17@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, next has been updated via ba189140f63bfd9166356ff608f1c281b9c0a394 (commit) via 4a99b1b57809fcf5eb4da235a858e9bee9c3abe5 (commit) from 06168be1c3824a0850bb76e0f397aa74a7f8a763 (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=ba189140f63bfd9166356ff608f1c281b9c0a394 commit ba189140f63bfd9166356ff608f1c281b9c0a394 Merge: 06168be 4a99b1b Author: Nils Gladitz AuthorDate: Wed Feb 17 11:03:45 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 17 11:03:45 2016 -0500 Merge topic 'unix-timestamps' into next 4a99b1b5 CMake: Extend TIMESTAMP sub-commands with new unix time format specifier https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4a99b1b57809fcf5eb4da235a858e9bee9c3abe5 commit 4a99b1b57809fcf5eb4da235a858e9bee9c3abe5 Author: Jose-Luis Blanco-Claraco AuthorDate: Tue Feb 16 21:48:56 2016 +0100 Commit: Nils Gladitz CommitDate: Wed Feb 17 17:00:08 2016 +0100 CMake: Extend TIMESTAMP sub-commands with new unix time format specifier The new %s format specifier is substituted by file()/string() TIMESTAMP sub-commands with the number of seconds since unix-epoch (1 January 1970 00:00:00 UTC). Co-Authored-By: Nils Gladitz diff --git a/Help/command/string.rst b/Help/command/string.rst index 0361c74..3f4050e 100644 --- a/Help/command/string.rst +++ b/Help/command/string.rst @@ -277,6 +277,7 @@ specifiers: %j The day of the current year (001-366). %m The month of the current year (01-12). %M The minute of the current hour (00-59). + %s Seconds since midnight (UTC) 1-Jan-1970 (UNIX time). %S The second of the current minute. 60 represents a leap second. (00-60) %U The week number of the current year (00-53). diff --git a/Help/release/dev/unix-timestamps.rst b/Help/release/dev/unix-timestamps.rst new file mode 100644 index 0000000..cdb0e5b --- /dev/null +++ b/Help/release/dev/unix-timestamps.rst @@ -0,0 +1,6 @@ +unix-timestamps +--------------- + +* The :command:`string(TIMESTAMP)` and :command:`file(TIMESTAMP)` + commands gained support for the ``%s`` placeholder. This is + the number of seconds since the UNIX Epoch. diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx index 6fd6ab7..2cb3a15 100644 --- a/Source/cmTimestamp.cxx +++ b/Source/cmTimestamp.cxx @@ -12,9 +12,11 @@ #include "cmTimestamp.h" #include +#include #include #include +#include //---------------------------------------------------------------------------- std::string cmTimestamp::CurrentTime( @@ -44,7 +46,7 @@ std::string cmTimestamp::FileModificationTime(const char* path, //---------------------------------------------------------------------------- std::string cmTimestamp::CreateTimestampFromTimeT(time_t timeT, - std::string formatString, bool utcFlag) + std::string formatString, bool utcFlag) const { if(formatString.empty()) { @@ -79,12 +81,12 @@ std::string cmTimestamp::CreateTimestampFromTimeT(time_t timeT, for(std::string::size_type i = 0; i < formatString.size(); ++i) { char c1 = formatString[i]; - char c2 = (i+1 < formatString.size()) ? - formatString[i+1] : static_cast(0); + char c2 = (i + 1 < formatString.size()) ? + formatString[i + 1] : static_cast(0); if(c1 == '%' && c2 != 0) { - result += AddTimestampComponent(c2, timeStruct); + result += AddTimestampComponent(c2, timeStruct, timeT); ++i; } else @@ -97,8 +99,42 @@ std::string cmTimestamp::CreateTimestampFromTimeT(time_t timeT, } //---------------------------------------------------------------------------- +time_t cmTimestamp::CreateUtcTimeTFromTm(struct tm &tm) const +{ +#if defined(_MSC_VER) && _MSC_VER >= 1400 + return _mkgmtime(&tm); +#else + // From Linux timegm() manpage. + + const char * tz = cmSystemTools::GetEnv("TZ"); + + if (tz) + { + tz = strdup(tz); + } + + // The standard says that "TZ=" or "TZ=[UNRECOGNIZED_TZ]" means UTC. + // It seems that "TZ=" does NOT work, at least under Windows + // with neither MSVC nor MinGW, so let's use explicit "TZ=UTC" + + cmSystemTools::PutEnv(std::string("TZ=UTC")); + + tzset(); + + time_t result = mktime(&tm); + + cmSystemTools::PutEnv(std::string("TZ=") + + std::string(tz ? tz : "")); + + tzset(); + + return result; +#endif +} + +//---------------------------------------------------------------------------- std::string cmTimestamp::AddTimestampComponent( - char flag, struct tm& timeStruct) + char flag, struct tm& timeStruct, const time_t timeT) const { std::string formatString = "%"; formatString += flag; @@ -117,6 +153,26 @@ std::string cmTimestamp::AddTimestampComponent( case 'y': case 'Y': break; + case 's': // Seconds since UNIX epoch (midnight 1-jan-1970) + { + // Build a time_t for UNIX epoch and substract from the input "timeT": + struct tm tmUnixEpoch; + memset(&tmUnixEpoch, 0, sizeof(tmUnixEpoch)); + tmUnixEpoch.tm_mday = 1; + tmUnixEpoch.tm_year = 1970-1900; + + const time_t unixEpoch = this->CreateUtcTimeTFromTm(tmUnixEpoch); + if (unixEpoch == -1) + { + cmSystemTools::Error("Error generating UNIX epoch in " + "STRING(TIMESTAMP ...). Please, file a bug report aginst CMake"); + return std::string(); + } + + std::stringstream ss; + ss << static_cast(difftime(timeT, unixEpoch)); + return ss.str(); + } default: { return formatString; diff --git a/Source/cmTimestamp.h b/Source/cmTimestamp.h index 24c1869..7c4b216 100644 --- a/Source/cmTimestamp.h +++ b/Source/cmTimestamp.h @@ -16,7 +16,7 @@ #include /** \class cmTimestamp - * \brief Utility class to generate sting representation of a timestamp + * \brief Utility class to generate string representation of a timestamp * */ class cmTimestamp @@ -30,10 +30,13 @@ public: const std::string& formatString, bool utcFlag); private: - std::string CreateTimestampFromTimeT(time_t timeT, - std::string formatString, bool utcFlag); + time_t CreateUtcTimeTFromTm(struct tm& timeStruct) const; - std::string AddTimestampComponent(char flag, struct tm& timeStruct); + std::string CreateTimestampFromTimeT( + time_t timeT, std::string formatString, bool utcFlag) const; + + std::string AddTimestampComponent( + char flag, struct tm& timeStruct, time_t timeT) const; }; diff --git a/Tests/CMakeTests/String-TIMESTAMP-UnixTime.cmake b/Tests/CMakeTests/String-TIMESTAMP-UnixTime.cmake new file mode 100644 index 0000000..a93e7f5 --- /dev/null +++ b/Tests/CMakeTests/String-TIMESTAMP-UnixTime.cmake @@ -0,0 +1,22 @@ +string(TIMESTAMP timestamp "[%Y-%m-%d %H:%M:%S] %s" UTC) + +string(TIMESTAMP unix_time "%s") + +string(TIMESTAMP year "%Y" UTC) +string(TIMESTAMP days "%j" UTC) + +# Doing proper date calculations here to verify unix timestamps +# could be error prone. +# At the very least use some safe lower and upper bounds to +# see if we are somewhere in the right region. + +math(EXPR years_since_epoch "${year} - 1970") +math(EXPR lower_bound "((${years_since_epoch} * 365) + ${days}) * 86400") +math(EXPR upper_bound "((${years_since_epoch} * 366) + ${days}) * 86400") + + +if(unix_time GREATER lower_bound AND unix_time LESS upper_bound) + message("~${unix_time}~") +else() + message(FATAL_ERROR "${timestamp} unix time not in expected range [${lower_bound}, ${upper_bound}]") +endif() diff --git a/Tests/CMakeTests/StringTest.cmake.in b/Tests/CMakeTests/StringTest.cmake.in index 92e70c3..aba35fe 100644 --- a/Tests/CMakeTests/StringTest.cmake.in +++ b/Tests/CMakeTests/StringTest.cmake.in @@ -36,6 +36,8 @@ set(TIMESTAMP-IncompleteSpecifier-RESULT 0) set(TIMESTAMP-IncompleteSpecifier-STDERR "~foobar%~") set(TIMESTAMP-AllSpecifiers-RESULT 0) set(TIMESTAMP-AllSpecifiers-STDERR "~[0-9]+(;[0-9]+)*~") +set(TIMESTAMP-UnixTime-RESULT 0) +set(TIMESTAMP-UnixTime-STDERR "~[1-9][0-9]+~") include("@CMAKE_CURRENT_SOURCE_DIR@/CheckCMakeTest.cmake") check_cmake_test(String @@ -58,6 +60,7 @@ check_cmake_test(String TIMESTAMP-UnknownSpecifier TIMESTAMP-IncompleteSpecifier TIMESTAMP-AllSpecifiers + TIMESTAMP-UnixTime ) # Execute each test listed in StringTestScript.cmake: @@ -68,9 +71,12 @@ set(number_of_tests_expected 70) include("@CMAKE_CURRENT_SOURCE_DIR@/ExecuteScriptTests.cmake") execute_all_script_tests(${scriptname} number_of_tests_executed) +string(TIMESTAMP timestamp "[%Y-%m-%d %H:%M:%S] UTC %s" UTC) + # And verify that number_of_tests_executed is at least as many as we know # about as of this writing... # +message(STATUS "timestamp='${timestamp}'") message(STATUS "scriptname='${scriptname}'") message(STATUS "number_of_tests_executed='${number_of_tests_executed}'") message(STATUS "number_of_tests_expected='${number_of_tests_expected}'") ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 17 14:11:37 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 17 Feb 2016 14:11:37 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-188-g5f6fe80 Message-ID: <20160217191137.0A704E513E@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, next has been updated via 5f6fe805da87fc1d3b4b66d0e9917643b626dd15 (commit) via 87f44b7525ebc9761b32b98f0c9e1276431e6ec1 (commit) from ba189140f63bfd9166356ff608f1c281b9c0a394 (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=5f6fe805da87fc1d3b4b66d0e9917643b626dd15 commit 5f6fe805da87fc1d3b4b66d0e9917643b626dd15 Merge: ba18914 87f44b7 Author: Brad King AuthorDate: Wed Feb 17 14:11:35 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 17 14:11:35 2016 -0500 Merge topic 'fix-static-private-non-target-depends' into next 87f44b75 Fix export of STATIC library PRIVATE non-target dependencies https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=87f44b7525ebc9761b32b98f0c9e1276431e6ec1 commit 87f44b7525ebc9761b32b98f0c9e1276431e6ec1 Author: Brad King AuthorDate: Wed Feb 17 13:34:15 2016 -0500 Commit: Brad King CommitDate: Wed Feb 17 14:01:11 2016 -0500 Fix export of STATIC library PRIVATE non-target dependencies In commit v3.5.0-rc1~43^2 (Fix export of STATIC library PRIVATE dependencies with CMP0022 NEW, 2016-01-15) we taught target_link_libraries to generate `$>` in INTERFACE_LINK_LIBRARIES instead of `$` so that `dep` can be recognized as a target name and updated during export. However, this approach does not work when `dep` is just a plain library name and not a target because `$` requires the name of a reachable target. Since we do not know during target_link_libraries whether the name will correspond to a reachable target or not, we cannot inject the `$` expression. Revert this change and solve the original problem instead by teaching the export logic to recognize and update target names directly in `$` expressions. Reported-by: Ben Boeckel diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx index e8a2e6a..c005995 100644 --- a/Source/cmExportFileGenerator.cxx +++ b/Source/cmExportFileGenerator.cxx @@ -772,6 +772,27 @@ cmExportFileGenerator::ResolveTargetsInGeneratorExpression( lastPos = endPos; } + pos = 0; + lastPos = pos; + while (errorString.empty() && + (pos = input.find("$", nameStartPos); + if (endPos == input.npos) + { + errorString = "$ expression incomplete"; + break; + } + std::string libName = input.substr(nameStartPos, endPos - nameStartPos); + if (cmGeneratorExpression::IsValidTargetName(libName) && + this->AddTargetNamespace(libName, target, missingTargets)) + { + input.replace(nameStartPos, endPos - nameStartPos, libName); + } + lastPos = nameStartPos + libName.size() + 1; + } + this->ReplaceInstallPrefix(input); if (!errorString.empty()) diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx index 5f3246a..435346a 100644 --- a/Source/cmTargetLinkLibrariesCommand.cxx +++ b/Source/cmTargetLinkLibrariesCommand.cxx @@ -432,11 +432,8 @@ cmTargetLinkLibrariesCommand::HandleLibrary(const std::string& lib, { std::string configLib = this->Target ->GetDebugGeneratorExpressions(lib, llt); - if (cmGeneratorExpression::IsValidTargetName(configLib)) - { - configLib = "$>"; - } - else if (cmGeneratorExpression::Find(configLib) != std::string::npos) + if (cmGeneratorExpression::IsValidTargetName(lib) + || cmGeneratorExpression::Find(lib) != std::string::npos) { configLib = "$"; } diff --git a/Tests/RunCMake/target_link_libraries/RunCMakeTest.cmake b/Tests/RunCMake/target_link_libraries/RunCMakeTest.cmake index 8307607..1466fbf 100644 --- a/Tests/RunCMake/target_link_libraries/RunCMakeTest.cmake +++ b/Tests/RunCMake/target_link_libraries/RunCMakeTest.cmake @@ -8,3 +8,5 @@ run_cmake(MixedSignature) run_cmake(Separate-PRIVATE-LINK_PRIVATE-uses) run_cmake(SubDirTarget) run_cmake(SharedDepNotTarget) +run_cmake(StaticPrivateDepNotExported) +run_cmake(StaticPrivateDepNotTarget) diff --git a/Tests/RunCMake/target_link_libraries/StaticPrivateDepNotExported-result.txt b/Tests/RunCMake/target_link_libraries/StaticPrivateDepNotExported-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/target_link_libraries/StaticPrivateDepNotExported-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/target_link_libraries/StaticPrivateDepNotExported-stderr.txt b/Tests/RunCMake/target_link_libraries/StaticPrivateDepNotExported-stderr.txt new file mode 100644 index 0000000..6bb44ab --- /dev/null +++ b/Tests/RunCMake/target_link_libraries/StaticPrivateDepNotExported-stderr.txt @@ -0,0 +1 @@ +CMake Error: install\(EXPORT "Exp" ...\) includes target "foo" which requires target "not_exported" that is not in the export set. diff --git a/Tests/RunCMake/target_link_libraries/StaticPrivateDepNotExported.cmake b/Tests/RunCMake/target_link_libraries/StaticPrivateDepNotExported.cmake new file mode 100644 index 0000000..9b97918 --- /dev/null +++ b/Tests/RunCMake/target_link_libraries/StaticPrivateDepNotExported.cmake @@ -0,0 +1,7 @@ +cmake_policy(SET CMP0022 NEW) +enable_language(C) +add_library(foo STATIC empty.c) +add_library(not_exported STATIC empty.c) +target_link_libraries(foo PRIVATE not_exported) +install(TARGETS foo EXPORT Exp DESTINATION lib) +install(EXPORT Exp DESTINATION lib/cmake/Exp) diff --git a/Tests/RunCMake/target_link_libraries/StaticPrivateDepNotTarget.cmake b/Tests/RunCMake/target_link_libraries/StaticPrivateDepNotTarget.cmake new file mode 100644 index 0000000..7122ae9 --- /dev/null +++ b/Tests/RunCMake/target_link_libraries/StaticPrivateDepNotTarget.cmake @@ -0,0 +1,6 @@ +cmake_policy(SET CMP0022 NEW) +enable_language(C) +add_library(foo STATIC empty.c) +target_link_libraries(foo PRIVATE not_a_target) +install(TARGETS foo EXPORT Exp DESTINATION lib) +install(EXPORT Exp DESTINATION lib/cmake/Exp) ----------------------------------------------------------------------- Summary of changes: Source/cmExportFileGenerator.cxx | 21 ++++++++++++++++++++ Source/cmTargetLinkLibrariesCommand.cxx | 7 ++----- .../target_link_libraries/RunCMakeTest.cmake | 2 ++ .../StaticPrivateDepNotExported-result.txt} | 0 .../StaticPrivateDepNotExported-stderr.txt | 1 + .../StaticPrivateDepNotExported.cmake | 7 +++++++ .../StaticPrivateDepNotTarget.cmake | 6 ++++++ 7 files changed, 39 insertions(+), 5 deletions(-) copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => target_link_libraries/StaticPrivateDepNotExported-result.txt} (100%) create mode 100644 Tests/RunCMake/target_link_libraries/StaticPrivateDepNotExported-stderr.txt create mode 100644 Tests/RunCMake/target_link_libraries/StaticPrivateDepNotExported.cmake create mode 100644 Tests/RunCMake/target_link_libraries/StaticPrivateDepNotTarget.cmake hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 17 15:25:58 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 17 Feb 2016 15:25:58 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-190-ge0bc653 Message-ID: <20160217202558.04E96E592F@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, next has been updated via e0bc653bebfe35761662ca2d8052c0a347c011f2 (commit) via 1911cda03efc71f97e610e0b593282c835f2d4f4 (commit) from 5f6fe805da87fc1d3b4b66d0e9917643b626dd15 (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=e0bc653bebfe35761662ca2d8052c0a347c011f2 commit e0bc653bebfe35761662ca2d8052c0a347c011f2 Merge: 5f6fe80 1911cda Author: Brad King AuthorDate: Wed Feb 17 15:25:57 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 17 15:25:57 2016 -0500 Merge topic 'FindCUDA-verbatim' into next 1911cda0 FindCUDA: Fix regression under Visual Studio generators https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1911cda03efc71f97e610e0b593282c835f2d4f4 commit 1911cda03efc71f97e610e0b593282c835f2d4f4 Author: Brad King AuthorDate: Wed Feb 17 15:14:22 2016 -0500 Commit: Brad King CommitDate: Wed Feb 17 15:20:56 2016 -0500 FindCUDA: Fix regression under Visual Studio generators Since commit v3.5.0-rc1~47^2 (FindCUDA: Support special characters in path, 2016-01-15) our add_custom_command calls use VERBATIM so that CMake will automatically quote special characters correctly. However, this breaks the special `$(VCInstallDir)` placeholder used with Visual Studio generators. Since we do not support preservation of such placeholders with VERBATIM (see issue #15001) we must fall back to not using VERBATIM when the placeholder is used. A better fix would be to stop using `$(VCInstallDir)` and use the value of `CMAKE_${CUDA_C_OR_CXX}_COMPILER` instead, but that will require additional semantic and documentation changes. For now simply fix the regression with the above approach. Reported-by: Stephen Sorley diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake index 1674e2d..47c03f3 100644 --- a/Modules/FindCUDA.cmake +++ b/Modules/FindCUDA.cmake @@ -1456,6 +1456,11 @@ macro(CUDA_WRAP_SRCS cuda_target format generated_files) set(cuda_build_comment_string "Building NVCC (${cuda_build_type}) object ${generated_file_relative_path}") endif() + set(_verbatim VERBATIM) + if(ccbin_flags MATCHES "\\$\\(VCInstallDir\\)") + set(_verbatim "") + endif() + # Build the generated file and dependency file ########################## add_custom_command( OUTPUT ${generated_file} @@ -1474,7 +1479,7 @@ macro(CUDA_WRAP_SRCS cuda_target format generated_files) -P "${custom_target_script}" WORKING_DIRECTORY "${cuda_compile_intermediate_directory}" COMMENT "${cuda_build_comment_string}" - VERBATIM + ${_verbatim} ) # Make sure the build system knows the file is generated. @@ -1586,6 +1591,11 @@ function(CUDA_LINK_SEPARABLE_COMPILATION_OBJECTS output_file cuda_target options set(do_obj_build_rule FALSE) endif() + set(_verbatim VERBATIM) + if(nvcc_flags MATCHES "\\$\\(VCInstallDir\\)") + set(_verbatim "") + endif() + if (do_obj_build_rule) add_custom_command( OUTPUT ${output_file} @@ -1593,7 +1603,7 @@ function(CUDA_LINK_SEPARABLE_COMPILATION_OBJECTS output_file cuda_target options COMMAND ${CUDA_NVCC_EXECUTABLE} ${nvcc_flags} -dlink ${object_files} -o ${output_file} ${flags} COMMENT "Building NVCC intermediate link file ${output_file_relative_path}" - VERBATIM + ${_verbatim} ) else() get_filename_component(output_file_dir "${output_file}" DIRECTORY) @@ -1603,7 +1613,7 @@ function(CUDA_LINK_SEPARABLE_COMPILATION_OBJECTS output_file cuda_target options COMMAND ${CMAKE_COMMAND} -E echo "Building NVCC intermediate link file ${output_file_relative_path}" COMMAND ${CMAKE_COMMAND} -E make_directory "${output_file_dir}" COMMAND ${CUDA_NVCC_EXECUTABLE} ${nvcc_flags} ${flags} -dlink ${object_files} -o "${output_file}" - VERBATIM + ${_verbatim} ) endif() endif() ----------------------------------------------------------------------- Summary of changes: Modules/FindCUDA.cmake | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) hooks/post-receive -- CMake From kwrobot at kitware.com Thu Feb 18 00:01:07 2016 From: kwrobot at kitware.com (Kitware Robot) Date: Thu, 18 Feb 2016 00:01:07 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc2-91-gede2a6e Message-ID: <20160218050107.516A3E5556@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 ede2a6ea6b6ff201ea1b2e2f7943b301a28b1df5 (commit) from ed1b3430fcfc906780b68fe4a073590c6d23ff08 (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=ede2a6ea6b6ff201ea1b2e2f7943b301a28b1df5 commit ede2a6ea6b6ff201ea1b2e2f7943b301a28b1df5 Author: Kitware Robot AuthorDate: Thu Feb 18 00:01:04 2016 -0500 Commit: Kitware Robot CommitDate: Thu Feb 18 00:01:04 2016 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 533cff4..4b38a66 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 5) -set(CMake_VERSION_PATCH 20160217) +set(CMake_VERSION_PATCH 20160218) #set(CMake_VERSION_RC 1) ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 18 09:42:07 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 18 Feb 2016 09:42:07 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-193-g0a36aaf Message-ID: <20160218144207.83A1DE5155@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, next has been updated via 0a36aaf2c94bd9a3df37f164dff80fd4fc17bf01 (commit) via 26fdd9c30a0a74b8642620478f03d40fee967e56 (commit) via ede2a6ea6b6ff201ea1b2e2f7943b301a28b1df5 (commit) from e0bc653bebfe35761662ca2d8052c0a347c011f2 (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=0a36aaf2c94bd9a3df37f164dff80fd4fc17bf01 commit 0a36aaf2c94bd9a3df37f164dff80fd4fc17bf01 Merge: e0bc653 26fdd9c Author: Brad King AuthorDate: Thu Feb 18 09:42:06 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Feb 18 09:42:06 2016 -0500 Merge topic 'fix-CPACK_INSTALL_CMAKE_PROJECTS-subdirectory' into next 26fdd9c3 CPack: Fix CPACK_INSTALL_CMAKE_PROJECTS SubDirectory (4th) option ede2a6ea CMake Nightly Date Stamp https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=26fdd9c30a0a74b8642620478f03d40fee967e56 commit 26fdd9c30a0a74b8642620478f03d40fee967e56 Author: Daniel Wirtz AuthorDate: Thu Feb 18 11:30:05 2016 +1300 Commit: Brad King CommitDate: Thu Feb 18 09:37:59 2016 -0500 CPack: Fix CPACK_INSTALL_CMAKE_PROJECTS SubDirectory (4th) option diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index 22d4bf0..3eca280 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -723,10 +723,9 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( cmGlobalGenerator gg(&cm); cmsys::auto_ptr mf( new cmMakefile(&gg, cm.GetCurrentSnapshot())); - std::string realInstallDirectory = tempInstallDirectory; if ( !installSubDirectory.empty() && installSubDirectory != "/" ) { - realInstallDirectory += installSubDirectory; + tempInstallDirectory += installSubDirectory; } if (componentInstall) { ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- Source/CPack/cmCPackGenerator.cxx | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 18 09:58:56 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 18 Feb 2016 09:58:56 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-195-g009b3d2 Message-ID: <20160218145856.8DA1AE56EF@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, next has been updated via 009b3d281a085f481caa886267eaf2263c4f2a48 (commit) via c918bb15682ca5891e34fd72b5ce0188b5b65854 (commit) from 0a36aaf2c94bd9a3df37f164dff80fd4fc17bf01 (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=009b3d281a085f481caa886267eaf2263c4f2a48 commit 009b3d281a085f481caa886267eaf2263c4f2a48 Merge: 0a36aaf c918bb1 Author: Brad King AuthorDate: Thu Feb 18 09:58:55 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Feb 18 09:58:55 2016 -0500 Merge topic 'reduce-entropy-consumption' into next c918bb15 cmSystemTools: Remove unused include https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c918bb15682ca5891e34fd72b5ce0188b5b65854 commit c918bb15682ca5891e34fd72b5ce0188b5b65854 Author: Brad King AuthorDate: Thu Feb 18 09:57:35 2016 -0500 Commit: Brad King CommitDate: Thu Feb 18 09:58:05 2016 -0500 cmSystemTools: Remove unused include We do not seem to need this header anymore, and including it on AIX causes `#define open open64` which breaks `std::ifstream::open` calls. diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 5ad2475..9af54bf 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -60,8 +60,7 @@ #endif #if defined(CMAKE_BUILD_WITH_CMAKE) -# include -# include "cmCryptoHash.h" +# include "cmCryptoHash.h" #endif #if defined(CMAKE_USE_ELF_PARSER) ----------------------------------------------------------------------- Summary of changes: Source/cmSystemTools.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 18 10:02:25 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 18 Feb 2016 10:02:25 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-198-gb1f7f3b Message-ID: <20160218150225.85B82E5B29@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, next has been updated via b1f7f3b50850c77a686f9439f84631f94fd9da35 (commit) via d7c6b7103b3e247224dfb5b09959f9d2c8cc1898 (commit) via 70f2708fa58da21ef19986872aee530a84cc9ad0 (commit) from 009b3d281a085f481caa886267eaf2263c4f2a48 (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=b1f7f3b50850c77a686f9439f84631f94fd9da35 commit b1f7f3b50850c77a686f9439f84631f94fd9da35 Merge: 009b3d2 d7c6b71 Author: Brad King AuthorDate: Thu Feb 18 10:02:24 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Feb 18 10:02:24 2016 -0500 Merge topic 'doc-install-component-association' into next d7c6b710 Merge branch 'backport-doc-install-component-association' into doc-install-component-association 70f2708f Help: Clarify install(TARGETS) INCLUDES DESTINATION option https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d7c6b7103b3e247224dfb5b09959f9d2c8cc1898 commit d7c6b7103b3e247224dfb5b09959f9d2c8cc1898 Merge: c978223 70f2708 Author: Brad King AuthorDate: Wed Feb 17 10:15:21 2016 -0500 Commit: Brad King CommitDate: Wed Feb 17 10:15:30 2016 -0500 Merge branch 'backport-doc-install-component-association' into doc-install-component-association https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=70f2708fa58da21ef19986872aee530a84cc9ad0 commit 70f2708fa58da21ef19986872aee530a84cc9ad0 Author: Brad King AuthorDate: Wed Feb 17 10:11:01 2016 -0500 Commit: Brad King CommitDate: Wed Feb 17 10:12:10 2016 -0500 Help: Clarify install(TARGETS) INCLUDES DESTINATION option The option does not actually participate in argument groups like the others because it does not actually install anything. Fix the order in the documentation accordingly. Reported-by: Daniel Wirtz diff --git a/Help/command/install.rst b/Help/command/install.rst index 5d2add7..45167bc 100644 --- a/Help/command/install.rst +++ b/Help/command/install.rst @@ -72,12 +72,13 @@ Installing Targets [[ARCHIVE|LIBRARY|RUNTIME|FRAMEWORK|BUNDLE| PRIVATE_HEADER|PUBLIC_HEADER|RESOURCE] [DESTINATION ] - [INCLUDES DESTINATION [ ...]] [PERMISSIONS permissions...] [CONFIGURATIONS [Debug|Release|...]] [COMPONENT ] [OPTIONAL] [NAMELINK_ONLY|NAMELINK_SKIP] - ] [...]) + ] [...] + [INCLUDES DESTINATION [ ...]] + ) The ``TARGETS`` form specifies rules for installing targets from a project. There are five kinds of target files that may be installed: @@ -97,11 +98,7 @@ change the type of target to which the subsequent properties apply. If none is given the installation properties apply to all target types. If only one is given then only targets of that type will be installed (which can be used to install just a DLL or just an import -library). The ``INCLUDES DESTINATION`` specifies a list of directories -which will be added to the :prop_tgt:`INTERFACE_INCLUDE_DIRECTORIES` -target property of the ```` when exported by the -:command:`install(EXPORT)` command. If a relative path is -specified, it is treated as relative to the ``$``. +library). The ``PRIVATE_HEADER``, ``PUBLIC_HEADER``, and ``RESOURCE`` arguments cause subsequent properties to be applied to installing a ``FRAMEWORK`` @@ -131,6 +128,14 @@ option installs nothing. See the :prop_tgt:`VERSION` and :prop_tgt:`SOVERSION` target properties for details on creating versioned shared libraries. +The ``INCLUDES DESTINATION`` specifies a list of directories +which will be added to the :prop_tgt:`INTERFACE_INCLUDE_DIRECTORIES` +target property of the ```` when exported by the +:command:`install(EXPORT)` command. If a relative path is +specified, it is treated as relative to the ``$``. +This is independent of the rest of the argument groups and does +not actually install anything. + One or more groups of properties may be specified in a single call to the ``TARGETS`` form of this command. A target may be installed more than once to different locations. Consider hypothetical targets ``myExe``, ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 18 10:07:58 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 18 Feb 2016 10:07:58 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc2-93-g135a0df Message-ID: <20160218150758.10D04E5B94@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 135a0df525851e6fd35efc74c4b86309dfc381de (commit) via 9beb2744d7685fca9cd5717308d4457dffdefcdc (commit) from ede2a6ea6b6ff201ea1b2e2f7943b301a28b1df5 (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=135a0df525851e6fd35efc74c4b86309dfc381de commit 135a0df525851e6fd35efc74c4b86309dfc381de Merge: ede2a6e 9beb274 Author: Brad King AuthorDate: Thu Feb 18 10:07:56 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Feb 18 10:07:56 2016 -0500 Merge topic 'automoc-src-per-dir' 9beb2744 Automoc: Fix support of files with the same name (#12873) ----------------------------------------------------------------------- Summary of changes: Source/cmQtAutoGenerators.cxx | 35 ++++++++++++++++++++++++++++++++--- Tests/QtAutogen/Adir/CMakeLists.txt | 2 +- Tests/QtAutogen/Adir/bar/foo.cpp | 4 ++++ Tests/QtAutogen/Adir/bar/foo.h | 10 ++++++++++ Tests/QtAutogen/Adir/foo.cpp | 4 ++++ Tests/QtAutogen/Adir/foo.h | 8 ++++++++ 6 files changed, 59 insertions(+), 4 deletions(-) create mode 100644 Tests/QtAutogen/Adir/bar/foo.cpp create mode 100644 Tests/QtAutogen/Adir/bar/foo.h create mode 100644 Tests/QtAutogen/Adir/foo.cpp create mode 100644 Tests/QtAutogen/Adir/foo.h hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 18 10:08:00 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 18 Feb 2016 10:08:00 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc2-95-g1b369aa Message-ID: <20160218150800.709C2E5B9E@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 1b369aa285c82f83ecbaf219800ae72d973cb0ab (commit) via 1911cda03efc71f97e610e0b593282c835f2d4f4 (commit) from 135a0df525851e6fd35efc74c4b86309dfc381de (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=1b369aa285c82f83ecbaf219800ae72d973cb0ab commit 1b369aa285c82f83ecbaf219800ae72d973cb0ab Merge: 135a0df 1911cda Author: Brad King AuthorDate: Thu Feb 18 10:07:58 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Feb 18 10:07:58 2016 -0500 Merge topic 'FindCUDA-verbatim' 1911cda0 FindCUDA: Fix regression under Visual Studio generators ----------------------------------------------------------------------- Summary of changes: Modules/FindCUDA.cmake | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 18 10:08:03 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 18 Feb 2016 10:08:03 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc2-97-g2321e63 Message-ID: <20160218150803.11095E5BA5@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 2321e63734d1b31eebc344e18a5b45fc76343185 (commit) via 87f44b7525ebc9761b32b98f0c9e1276431e6ec1 (commit) from 1b369aa285c82f83ecbaf219800ae72d973cb0ab (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=2321e63734d1b31eebc344e18a5b45fc76343185 commit 2321e63734d1b31eebc344e18a5b45fc76343185 Merge: 1b369aa 87f44b7 Author: Brad King AuthorDate: Thu Feb 18 10:08:01 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Feb 18 10:08:01 2016 -0500 Merge topic 'fix-static-private-non-target-depends' 87f44b75 Fix export of STATIC library PRIVATE non-target dependencies ----------------------------------------------------------------------- Summary of changes: Source/cmExportFileGenerator.cxx | 21 ++++++++++++++++++++ Source/cmTargetLinkLibrariesCommand.cxx | 7 ++----- .../target_link_libraries/RunCMakeTest.cmake | 2 ++ .../StaticPrivateDepNotExported-result.txt} | 0 .../StaticPrivateDepNotExported-stderr.txt | 1 + .../StaticPrivateDepNotExported.cmake | 7 +++++++ .../StaticPrivateDepNotTarget.cmake | 6 ++++++ 7 files changed, 39 insertions(+), 5 deletions(-) copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => target_link_libraries/StaticPrivateDepNotExported-result.txt} (100%) create mode 100644 Tests/RunCMake/target_link_libraries/StaticPrivateDepNotExported-stderr.txt create mode 100644 Tests/RunCMake/target_link_libraries/StaticPrivateDepNotExported.cmake create mode 100644 Tests/RunCMake/target_link_libraries/StaticPrivateDepNotTarget.cmake hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 18 10:08:05 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 18 Feb 2016 10:08:05 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc2-99-ge503941 Message-ID: <20160218150805.5AFA8E5BA5@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 e503941adb1f9c5d2a61e62b2b06003e959f28dd (commit) via beaa4fa5ddba4298dfc94b38e1695bac28ea5faf (commit) from 2321e63734d1b31eebc344e18a5b45fc76343185 (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=e503941adb1f9c5d2a61e62b2b06003e959f28dd commit e503941adb1f9c5d2a61e62b2b06003e959f28dd Merge: 2321e63 beaa4fa Author: Brad King AuthorDate: Thu Feb 18 10:08:03 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Feb 18 10:08:03 2016 -0500 Merge topic 'de-deprecate-CMakeForceCompiler' beaa4fa5 CMakeForceCompiler: De-deprecate until more use cases have alternatives ----------------------------------------------------------------------- Summary of changes: Help/release/3.5.rst | 3 --- Modules/CMakeForceCompiler.cmake | 16 +++++++++------- 2 files changed, 9 insertions(+), 10 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 18 10:08:07 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 18 Feb 2016 10:08:07 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc2-103-g937f7fd Message-ID: <20160218150807.C0272E5BA8@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 937f7fdd914e4b368c9ace82b30e72cd66c5b866 (commit) via d7c6b7103b3e247224dfb5b09959f9d2c8cc1898 (commit) via c978223c859ba4a09cd30876e5f1f646748785e0 (commit) via 70f2708fa58da21ef19986872aee530a84cc9ad0 (commit) from e503941adb1f9c5d2a61e62b2b06003e959f28dd (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=937f7fdd914e4b368c9ace82b30e72cd66c5b866 commit 937f7fdd914e4b368c9ace82b30e72cd66c5b866 Merge: e503941 d7c6b71 Author: Brad King AuthorDate: Thu Feb 18 10:08:06 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Feb 18 10:08:06 2016 -0500 Merge topic 'doc-install-component-association' d7c6b710 Merge branch 'backport-doc-install-component-association' into doc-install-component-association c978223c Help: Clarify install(TARGETS) INCLUDES DESTINATION option 70f2708f Help: Clarify install(TARGETS) INCLUDES DESTINATION option ----------------------------------------------------------------------- Summary of changes: Help/command/install.rst | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 18 10:08:31 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 18 Feb 2016 10:08:31 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-204-g73fc30a Message-ID: <20160218150831.BC5D2E5BB4@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, next has been updated via 73fc30a40ee97ec975b07002648983fc27c94b5c (commit) via 937f7fdd914e4b368c9ace82b30e72cd66c5b866 (commit) via e503941adb1f9c5d2a61e62b2b06003e959f28dd (commit) via 2321e63734d1b31eebc344e18a5b45fc76343185 (commit) via 1b369aa285c82f83ecbaf219800ae72d973cb0ab (commit) via 135a0df525851e6fd35efc74c4b86309dfc381de (commit) from b1f7f3b50850c77a686f9439f84631f94fd9da35 (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=73fc30a40ee97ec975b07002648983fc27c94b5c commit 73fc30a40ee97ec975b07002648983fc27c94b5c Merge: b1f7f3b 937f7fd Author: Brad King AuthorDate: Thu Feb 18 10:08:17 2016 -0500 Commit: Brad King CommitDate: Thu Feb 18 10:08:17 2016 -0500 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 18 10:30:02 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 18 Feb 2016 10:30:02 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-206-g5887e75 Message-ID: <20160218153002.B00F9E5A89@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, next has been updated via 5887e756f47e5bf0ce6c4f077b4cbaec790c22b0 (commit) via 845cd34bb887cf7ef1f31ff4fb7de32177f8ff3b (commit) from 73fc30a40ee97ec975b07002648983fc27c94b5c (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=5887e756f47e5bf0ce6c4f077b4cbaec790c22b0 commit 5887e756f47e5bf0ce6c4f077b4cbaec790c22b0 Merge: 73fc30a 845cd34 Author: Brad King AuthorDate: Thu Feb 18 10:30:02 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Feb 18 10:30:02 2016 -0500 Merge topic 'unix-timestamps' into next 845cd34b fixup! CMake: Extend TIMESTAMP sub-commands with new unix time format https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=845cd34bb887cf7ef1f31ff4fb7de32177f8ff3b commit 845cd34bb887cf7ef1f31ff4fb7de32177f8ff3b Author: Brad King AuthorDate: Thu Feb 18 10:27:09 2016 -0500 Commit: Brad King CommitDate: Thu Feb 18 10:27:09 2016 -0500 fixup! CMake: Extend TIMESTAMP sub-commands with new unix time format diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx index 2cb3a15..1c795c4 100644 --- a/Source/cmTimestamp.cxx +++ b/Source/cmTimestamp.cxx @@ -106,25 +106,23 @@ time_t cmTimestamp::CreateUtcTimeTFromTm(struct tm &tm) const #else // From Linux timegm() manpage. - const char * tz = cmSystemTools::GetEnv("TZ"); - - if (tz) + std::string tz_old = "TZ="; + if (const char* tz = cmSystemTools::GetEnv("TZ")) { - tz = strdup(tz); + tz_old += tz; } // The standard says that "TZ=" or "TZ=[UNRECOGNIZED_TZ]" means UTC. // It seems that "TZ=" does NOT work, at least under Windows // with neither MSVC nor MinGW, so let's use explicit "TZ=UTC" - cmSystemTools::PutEnv(std::string("TZ=UTC")); + cmSystemTools::PutEnv("TZ=UTC"); tzset(); time_t result = mktime(&tm); - cmSystemTools::PutEnv(std::string("TZ=") + - std::string(tz ? tz : "")); + cmSystemTools::PutEnv(tz_old); tzset(); ----------------------------------------------------------------------- Summary of changes: Source/cmTimestamp.cxx | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 18 10:31:11 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 18 Feb 2016 10:31:11 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-208-g52b66a9 Message-ID: <20160218153111.E364CE56DA@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, next has been updated via 52b66a98c130825d7e84381a84528f794b3ec9d3 (commit) via 6727270b75eec4e379acd4a39f5003a316249c73 (commit) from 5887e756f47e5bf0ce6c4f077b4cbaec790c22b0 (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=52b66a98c130825d7e84381a84528f794b3ec9d3 commit 52b66a98c130825d7e84381a84528f794b3ec9d3 Merge: 5887e75 6727270 Author: Brad King AuthorDate: Thu Feb 18 10:31:11 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Feb 18 10:31:11 2016 -0500 Merge topic 'unix-timestamps' into next 6727270b CMake: Extend TIMESTAMP sub-commands with new unix time format specifier https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6727270b75eec4e379acd4a39f5003a316249c73 commit 6727270b75eec4e379acd4a39f5003a316249c73 Author: Jose-Luis Blanco-Claraco AuthorDate: Tue Feb 16 21:48:56 2016 +0100 Commit: Brad King CommitDate: Thu Feb 18 10:30:13 2016 -0500 CMake: Extend TIMESTAMP sub-commands with new unix time format specifier The new `%s` format specifier is substituted by file()/string() `TIMESTAMP` sub-commands with the number of seconds since unix-epoch (1970-01-01 00:00:00 UTC). Co-Author: Nils Gladitz diff --git a/Help/command/string.rst b/Help/command/string.rst index 0361c74..3f4050e 100644 --- a/Help/command/string.rst +++ b/Help/command/string.rst @@ -277,6 +277,7 @@ specifiers: %j The day of the current year (001-366). %m The month of the current year (01-12). %M The minute of the current hour (00-59). + %s Seconds since midnight (UTC) 1-Jan-1970 (UNIX time). %S The second of the current minute. 60 represents a leap second. (00-60) %U The week number of the current year (00-53). diff --git a/Help/release/dev/unix-timestamps.rst b/Help/release/dev/unix-timestamps.rst new file mode 100644 index 0000000..cdb0e5b --- /dev/null +++ b/Help/release/dev/unix-timestamps.rst @@ -0,0 +1,6 @@ +unix-timestamps +--------------- + +* The :command:`string(TIMESTAMP)` and :command:`file(TIMESTAMP)` + commands gained support for the ``%s`` placeholder. This is + the number of seconds since the UNIX Epoch. diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx index 6fd6ab7..1c795c4 100644 --- a/Source/cmTimestamp.cxx +++ b/Source/cmTimestamp.cxx @@ -12,9 +12,11 @@ #include "cmTimestamp.h" #include +#include #include #include +#include //---------------------------------------------------------------------------- std::string cmTimestamp::CurrentTime( @@ -44,7 +46,7 @@ std::string cmTimestamp::FileModificationTime(const char* path, //---------------------------------------------------------------------------- std::string cmTimestamp::CreateTimestampFromTimeT(time_t timeT, - std::string formatString, bool utcFlag) + std::string formatString, bool utcFlag) const { if(formatString.empty()) { @@ -79,12 +81,12 @@ std::string cmTimestamp::CreateTimestampFromTimeT(time_t timeT, for(std::string::size_type i = 0; i < formatString.size(); ++i) { char c1 = formatString[i]; - char c2 = (i+1 < formatString.size()) ? - formatString[i+1] : static_cast(0); + char c2 = (i + 1 < formatString.size()) ? + formatString[i + 1] : static_cast(0); if(c1 == '%' && c2 != 0) { - result += AddTimestampComponent(c2, timeStruct); + result += AddTimestampComponent(c2, timeStruct, timeT); ++i; } else @@ -97,8 +99,40 @@ std::string cmTimestamp::CreateTimestampFromTimeT(time_t timeT, } //---------------------------------------------------------------------------- +time_t cmTimestamp::CreateUtcTimeTFromTm(struct tm &tm) const +{ +#if defined(_MSC_VER) && _MSC_VER >= 1400 + return _mkgmtime(&tm); +#else + // From Linux timegm() manpage. + + std::string tz_old = "TZ="; + if (const char* tz = cmSystemTools::GetEnv("TZ")) + { + tz_old += tz; + } + + // The standard says that "TZ=" or "TZ=[UNRECOGNIZED_TZ]" means UTC. + // It seems that "TZ=" does NOT work, at least under Windows + // with neither MSVC nor MinGW, so let's use explicit "TZ=UTC" + + cmSystemTools::PutEnv("TZ=UTC"); + + tzset(); + + time_t result = mktime(&tm); + + cmSystemTools::PutEnv(tz_old); + + tzset(); + + return result; +#endif +} + +//---------------------------------------------------------------------------- std::string cmTimestamp::AddTimestampComponent( - char flag, struct tm& timeStruct) + char flag, struct tm& timeStruct, const time_t timeT) const { std::string formatString = "%"; formatString += flag; @@ -117,6 +151,26 @@ std::string cmTimestamp::AddTimestampComponent( case 'y': case 'Y': break; + case 's': // Seconds since UNIX epoch (midnight 1-jan-1970) + { + // Build a time_t for UNIX epoch and substract from the input "timeT": + struct tm tmUnixEpoch; + memset(&tmUnixEpoch, 0, sizeof(tmUnixEpoch)); + tmUnixEpoch.tm_mday = 1; + tmUnixEpoch.tm_year = 1970-1900; + + const time_t unixEpoch = this->CreateUtcTimeTFromTm(tmUnixEpoch); + if (unixEpoch == -1) + { + cmSystemTools::Error("Error generating UNIX epoch in " + "STRING(TIMESTAMP ...). Please, file a bug report aginst CMake"); + return std::string(); + } + + std::stringstream ss; + ss << static_cast(difftime(timeT, unixEpoch)); + return ss.str(); + } default: { return formatString; diff --git a/Source/cmTimestamp.h b/Source/cmTimestamp.h index 24c1869..7c4b216 100644 --- a/Source/cmTimestamp.h +++ b/Source/cmTimestamp.h @@ -16,7 +16,7 @@ #include /** \class cmTimestamp - * \brief Utility class to generate sting representation of a timestamp + * \brief Utility class to generate string representation of a timestamp * */ class cmTimestamp @@ -30,10 +30,13 @@ public: const std::string& formatString, bool utcFlag); private: - std::string CreateTimestampFromTimeT(time_t timeT, - std::string formatString, bool utcFlag); + time_t CreateUtcTimeTFromTm(struct tm& timeStruct) const; - std::string AddTimestampComponent(char flag, struct tm& timeStruct); + std::string CreateTimestampFromTimeT( + time_t timeT, std::string formatString, bool utcFlag) const; + + std::string AddTimestampComponent( + char flag, struct tm& timeStruct, time_t timeT) const; }; diff --git a/Tests/CMakeTests/String-TIMESTAMP-UnixTime.cmake b/Tests/CMakeTests/String-TIMESTAMP-UnixTime.cmake new file mode 100644 index 0000000..a93e7f5 --- /dev/null +++ b/Tests/CMakeTests/String-TIMESTAMP-UnixTime.cmake @@ -0,0 +1,22 @@ +string(TIMESTAMP timestamp "[%Y-%m-%d %H:%M:%S] %s" UTC) + +string(TIMESTAMP unix_time "%s") + +string(TIMESTAMP year "%Y" UTC) +string(TIMESTAMP days "%j" UTC) + +# Doing proper date calculations here to verify unix timestamps +# could be error prone. +# At the very least use some safe lower and upper bounds to +# see if we are somewhere in the right region. + +math(EXPR years_since_epoch "${year} - 1970") +math(EXPR lower_bound "((${years_since_epoch} * 365) + ${days}) * 86400") +math(EXPR upper_bound "((${years_since_epoch} * 366) + ${days}) * 86400") + + +if(unix_time GREATER lower_bound AND unix_time LESS upper_bound) + message("~${unix_time}~") +else() + message(FATAL_ERROR "${timestamp} unix time not in expected range [${lower_bound}, ${upper_bound}]") +endif() diff --git a/Tests/CMakeTests/StringTest.cmake.in b/Tests/CMakeTests/StringTest.cmake.in index 92e70c3..aba35fe 100644 --- a/Tests/CMakeTests/StringTest.cmake.in +++ b/Tests/CMakeTests/StringTest.cmake.in @@ -36,6 +36,8 @@ set(TIMESTAMP-IncompleteSpecifier-RESULT 0) set(TIMESTAMP-IncompleteSpecifier-STDERR "~foobar%~") set(TIMESTAMP-AllSpecifiers-RESULT 0) set(TIMESTAMP-AllSpecifiers-STDERR "~[0-9]+(;[0-9]+)*~") +set(TIMESTAMP-UnixTime-RESULT 0) +set(TIMESTAMP-UnixTime-STDERR "~[1-9][0-9]+~") include("@CMAKE_CURRENT_SOURCE_DIR@/CheckCMakeTest.cmake") check_cmake_test(String @@ -58,6 +60,7 @@ check_cmake_test(String TIMESTAMP-UnknownSpecifier TIMESTAMP-IncompleteSpecifier TIMESTAMP-AllSpecifiers + TIMESTAMP-UnixTime ) # Execute each test listed in StringTestScript.cmake: @@ -68,9 +71,12 @@ set(number_of_tests_expected 70) include("@CMAKE_CURRENT_SOURCE_DIR@/ExecuteScriptTests.cmake") execute_all_script_tests(${scriptname} number_of_tests_executed) +string(TIMESTAMP timestamp "[%Y-%m-%d %H:%M:%S] UTC %s" UTC) + # And verify that number_of_tests_executed is at least as many as we know # about as of this writing... # +message(STATUS "timestamp='${timestamp}'") message(STATUS "scriptname='${scriptname}'") message(STATUS "number_of_tests_executed='${number_of_tests_executed}'") message(STATUS "number_of_tests_expected='${number_of_tests_expected}'") ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 18 10:49:52 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 18 Feb 2016 10:49:52 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc2-108-g1c6f917 Message-ID: <20160218154952.88D49E5880@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 1c6f917722cca8b66275ad9a496c93edcb1a8d0d (commit) via 3dd420bd9029488a73bc10bde75d6499ac75267d (commit) via ef10f5259a26adb13baf002649328b9c6bb5bfd7 (commit) via a13a6ee108d628a608c02fcca878f430a7024166 (commit) via 9dff5d9a9861809dae8b18f9d345d39f3ae6a770 (commit) from 937f7fdd914e4b368c9ace82b30e72cd66c5b866 (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: hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 18 10:49:52 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 18 Feb 2016 10:49:52 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-214-g1672d03 Message-ID: <20160218154952.A3E73E5882@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, next has been updated via 1672d03388dce6a78ea8dc2d0b8d317cf049a2d0 (commit) via 1c6f917722cca8b66275ad9a496c93edcb1a8d0d (commit) via 3dd420bd9029488a73bc10bde75d6499ac75267d (commit) via ef10f5259a26adb13baf002649328b9c6bb5bfd7 (commit) via a13a6ee108d628a608c02fcca878f430a7024166 (commit) via 9dff5d9a9861809dae8b18f9d345d39f3ae6a770 (commit) from 52b66a98c130825d7e84381a84528f794b3ec9d3 (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=1672d03388dce6a78ea8dc2d0b8d317cf049a2d0 commit 1672d03388dce6a78ea8dc2d0b8d317cf049a2d0 Merge: 52b66a9 1c6f917 Author: Brad King AuthorDate: Thu Feb 18 10:49:34 2016 -0500 Commit: Brad King CommitDate: Thu Feb 18 10:49:34 2016 -0500 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 18 10:49:53 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 18 Feb 2016 10:49:53 -0500 (EST) Subject: [Cmake-commits] CMake branch, release, updated. v3.5.0-rc2-14-g3dd420b Message-ID: <20160218154953.0D9BEE587C@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 3dd420bd9029488a73bc10bde75d6499ac75267d (commit) via 1911cda03efc71f97e610e0b593282c835f2d4f4 (commit) via ef10f5259a26adb13baf002649328b9c6bb5bfd7 (commit) via 87f44b7525ebc9761b32b98f0c9e1276431e6ec1 (commit) via a13a6ee108d628a608c02fcca878f430a7024166 (commit) via 70f2708fa58da21ef19986872aee530a84cc9ad0 (commit) via 9dff5d9a9861809dae8b18f9d345d39f3ae6a770 (commit) via beaa4fa5ddba4298dfc94b38e1695bac28ea5faf (commit) from 229a5bc9034549c8d9693878b1031b5f886eb1b7 (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: Help/command/install.rst | 19 +++++++++++------- Help/release/3.5.rst | 3 --- Modules/CMakeForceCompiler.cmake | 16 ++++++++------- Modules/FindCUDA.cmake | 16 ++++++++++++--- Source/cmExportFileGenerator.cxx | 21 ++++++++++++++++++++ Source/cmTargetLinkLibrariesCommand.cxx | 7 ++----- .../target_link_libraries/RunCMakeTest.cmake | 2 ++ .../StaticPrivateDepNotExported-result.txt} | 0 .../StaticPrivateDepNotExported-stderr.txt | 1 + .../StaticPrivateDepNotExported.cmake | 7 +++++++ .../StaticPrivateDepNotTarget.cmake | 6 ++++++ 11 files changed, 73 insertions(+), 25 deletions(-) copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => target_link_libraries/StaticPrivateDepNotExported-result.txt} (100%) create mode 100644 Tests/RunCMake/target_link_libraries/StaticPrivateDepNotExported-stderr.txt create mode 100644 Tests/RunCMake/target_link_libraries/StaticPrivateDepNotExported.cmake create mode 100644 Tests/RunCMake/target_link_libraries/StaticPrivateDepNotTarget.cmake hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 18 10:50:25 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 18 Feb 2016 10:50:25 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-217-g0570c29 Message-ID: <20160218155025.4BF29E58AB@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, next has been updated via 0570c2910c5eab95df39b95f991ebb7b15651e60 (commit) via 053d3eef9bca7e0b14a80853f46884203fe589fc (commit) via d203761520f5dd21a9cc4de5c4ca0d0e4e188e34 (commit) from 1672d03388dce6a78ea8dc2d0b8d317cf049a2d0 (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=0570c2910c5eab95df39b95f991ebb7b15651e60 commit 0570c2910c5eab95df39b95f991ebb7b15651e60 Merge: 1672d03 053d3ee Author: Brad King AuthorDate: Thu Feb 18 10:50:24 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Feb 18 10:50:24 2016 -0500 Merge topic 'test-release' into next 053d3eef Merge branch 'release' into test-release d2037615 CMake 3.5.0-rc3 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=053d3eef9bca7e0b14a80853f46884203fe589fc commit 053d3eef9bca7e0b14a80853f46884203fe589fc Merge: 1c6f917 d203761 Author: Brad King AuthorDate: Thu Feb 18 10:50:13 2016 -0500 Commit: Brad King CommitDate: Thu Feb 18 10:50:13 2016 -0500 Merge branch 'release' into test-release https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d203761520f5dd21a9cc4de5c4ca0d0e4e188e34 commit d203761520f5dd21a9cc4de5c4ca0d0e4e188e34 Author: Brad King AuthorDate: Thu Feb 18 10:41:26 2016 -0500 Commit: Brad King CommitDate: Thu Feb 18 10:41:26 2016 -0500 CMake 3.5.0-rc3 diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 58eb1fc..0c19881 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -2,4 +2,4 @@ set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 5) set(CMake_VERSION_PATCH 0) -set(CMake_VERSION_RC 2) +set(CMake_VERSION_RC 3) ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 18 13:46:05 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 18 Feb 2016 13:46:05 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc2-110-g9f40f65 Message-ID: <20160218184605.3B9DAE5016@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 9f40f656660a791804e94a2a2a98ee89d7f9c70b (commit) via d203761520f5dd21a9cc4de5c4ca0d0e4e188e34 (commit) from 1c6f917722cca8b66275ad9a496c93edcb1a8d0d (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: hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 18 13:46:05 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 18 Feb 2016 13:46:05 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-219-g12c3852 Message-ID: <20160218184605.53CD6E5473@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, next has been updated via 12c3852f2b18f582ffd713d93998253cdd5dc8de (commit) via 9f40f656660a791804e94a2a2a98ee89d7f9c70b (commit) from 0570c2910c5eab95df39b95f991ebb7b15651e60 (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=12c3852f2b18f582ffd713d93998253cdd5dc8de commit 12c3852f2b18f582ffd713d93998253cdd5dc8de Merge: 0570c29 9f40f65 Author: Brad King AuthorDate: Thu Feb 18 13:41:52 2016 -0500 Commit: Brad King CommitDate: Thu Feb 18 13:41:52 2016 -0500 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 18 13:46:05 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 18 Feb 2016 13:46:05 -0500 (EST) Subject: [Cmake-commits] CMake branch, release, updated. v3.5.0-rc2-15-gd203761 Message-ID: <20160218184605.6C2F5E548D@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 d203761520f5dd21a9cc4de5c4ca0d0e4e188e34 (commit) from 3dd420bd9029488a73bc10bde75d6499ac75267d (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 robert.maynard at kitware.com Thu Feb 18 16:00:12 2016 From: robert.maynard at kitware.com (Robert Maynard) Date: Thu, 18 Feb 2016 16:00:12 -0500 (EST) Subject: [Cmake-commits] CMake annotated tag, v3.5.0-rc3, created. v3.5.0-rc3 Message-ID: <20160218210013.C2B4AE5B00@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.5.0-rc3 has been created at b8153f126b5ff4f140008bd1050d8ed66b330545 (tag) tagging d203761520f5dd21a9cc4de5c4ca0d0e4e188e34 (commit) replaces v3.5.0-rc2 tagged by Brad King on Thu Feb 18 13:40:45 2016 -0500 - Log ----------------------------------------------------------------- CMake 3.5.0-rc3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJWxhAtAAoJEC0s7xA0khaE8sQQAJkrr5mbX71yvHGIuv6fWOL2 66dl1YTYOEyWxj83v4H45iJhyeNbje4w/r6WDBpfkpCzqNIVnVGjzNPE1IrbK/lL xkrvbnpH8jnIRcTZmq/G6RVisTB7/neOLNpieDHFnaDuKD9mM0MwO1IqmJCbXkTD tFP9hO6DWwyshi295IxOTfjpDPZbAXexSe4Qt4oB39Ak8rMo9vyeEoS+8a+swPJc vX4UE4+NkporSdWZWlkcuGOK9F5U83HKnFfGtk9DUaMuLP7IoHYnJY9R6LSVt1Gg YXEKhJw4KRcRb9yjpJcTnLccaS3Hs3Dr6mWTZe3DBNsinlRgK9lEl5X3arlsem+8 yzdxdl3XgzFMC3nGqHR8HvpmNr5ap+rfU4UTVERLtawB+zfOgjrjcld1XoxICOeq RPlLP8kuM291XMayGKODCO5OpTcWnOkyAwPMM8I0V6AKwEoz/bIWXz6bSb0gIbNM r9y1KsHuBVxBsz4Eobhh529F9pMt9jKhGpslYSTxIFrhTpOEo8oFvcKXROMM/4lX r3E9zbv6HEfh03werJRdJJxpTjAcJcMHAT4+Xrpmj6D/8HL4UDQYAanEmFMWB1FP bOxfGR9c/mMyTN0Q82k8JNSkx9wl6wt1hl/RHIhKYGCevUouK1n30Y/unTJD5RwT eZvYg7KtWtpDOMc+kIc4 =xT6p -----END PGP SIGNATURE----- Brad King (14): Help: Add release note about Xcode escaping fix (#15969) Merge branch 'doc-xcode-escaping-fix' into release cmake-gui: Fix cmState initialization when changing generators (#15959) Merge branch 'cmake-gui-reset-generator' into release Merge branch 'fix-cmake_parse_arguments-expansion' into release CMakeForceCompiler: De-deprecate until more use cases have alternatives Merge branch 'de-deprecate-CMakeForceCompiler' into release Help: Clarify install(TARGETS) INCLUDES DESTINATION option Merge branch 'backport-doc-install-component-association' into release Fix export of STATIC library PRIVATE non-target dependencies Merge branch 'fix-static-private-non-target-depends' into release FindCUDA: Fix regression under Visual Studio generators Merge branch 'FindCUDA-verbatim' into release CMake 3.5.0-rc3 Dimitar Yordanov (1): cmake_parse_arguments: Restore ;-list argument flattening ----------------------------------------------------------------------- hooks/post-receive -- CMake From domen.vrankar at gmail.com Thu Feb 18 19:29:24 2016 From: domen.vrankar at gmail.com (Domen Vrankar) Date: Thu, 18 Feb 2016 19:29:24 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-206-g35e1746 Message-ID: <20160219002924.AA731E5AED@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, next has been updated via 35e17466e259b1692860454746029cad86a705de (commit) via b8263a2f8d6df42b2a37c2efc2f7a3ac2b1d658a (commit) from 12c3852f2b18f582ffd713d93998253cdd5dc8de (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=35e17466e259b1692860454746029cad86a705de commit 35e17466e259b1692860454746029cad86a705de Merge: 12c3852 b8263a2 Author: Domen Vrankar AuthorDate: Thu Feb 18 19:29:22 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Feb 18 19:29:22 2016 -0500 Merge topic 'cpack-deb-autodep-ORIGIN-RPATH' into next b8263a2f CPack/Deb Create DEBIAN directory for dpkg-shlibdeps https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b8263a2f8d6df42b2a37c2efc2f7a3ac2b1d658a commit b8263a2f8d6df42b2a37c2efc2f7a3ac2b1d658a Author: Florian Apolloner and John Knottenbelt AuthorDate: Fri Feb 19 01:27:36 2016 +0100 Commit: Domen Vrankar CommitDate: Fri Feb 19 01:27:36 2016 +0100 CPack/Deb Create DEBIAN directory for dpkg-shlibdeps If CMAKE_INSTALL_RPATH is set and contains $ORIGIN then dpkg-shlibdeps searches for the DEBIAN directory in order to resolve $ORIGIN in the rpath to a directory. We need to create the DEBIAN directory for this to work. diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake index 2aaef61..b41d926 100644 --- a/Modules/CPackDeb.cmake +++ b/Modules/CPackDeb.cmake @@ -504,6 +504,9 @@ function(cpack_deb_prepare_package_vars) file(MAKE_DIRECTORY ${CPACK_TEMPORARY_DIRECTORY}/debian) file(WRITE ${CPACK_TEMPORARY_DIRECTORY}/debian/control "") + # Create a DEBIAN directory so that dpkg-shlibdeps can find the package dir when resolving $ORIGIN. + file(MAKE_DIRECTORY "${CPACK_TEMPORARY_DIRECTORY}/DEBIAN") + # Add --ignore-missing-info if the tool supports it execute_process(COMMAND env LC_ALL=C ${SHLIBDEPS_EXECUTABLE} --help OUTPUT_VARIABLE _TMP_HELP @@ -544,6 +547,9 @@ function(cpack_deb_prepare_package_vars) # Remove blank control file # Might not be safe if package actual contain file or directory named debian file(REMOVE_RECURSE "${CPACK_TEMPORARY_DIRECTORY}/debian") + + # remove temporary directory that was created only for dpkg-shlibdeps execution + file(REMOVE_RECURSE "${CPACK_TEMPORARY_DIRECTORY}/DEBIAN") else() if(CPACK_DEBIAN_PACKAGE_DEBUG) message(AUTHOR_WARNING "CPackDeb Debug: Using only user-provided depends because package does not contain executable files that link to shared libraries.") ----------------------------------------------------------------------- Summary of changes: Modules/CPackDeb.cmake | 6 ++++++ 1 file changed, 6 insertions(+) hooks/post-receive -- CMake From domen.vrankar at gmail.com Thu Feb 18 19:43:30 2016 From: domen.vrankar at gmail.com (Domen Vrankar) Date: Thu, 18 Feb 2016 19:43:30 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-208-g98ac047 Message-ID: <20160219004330.D590DE526C@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, next has been updated via 98ac0479f2d634c6feb224e2094198587efce9b2 (commit) via e8daee5bd0b68936b89a26e565b010f3387dc158 (commit) from 35e17466e259b1692860454746029cad86a705de (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=98ac0479f2d634c6feb224e2094198587efce9b2 commit 98ac0479f2d634c6feb224e2094198587efce9b2 Merge: 35e1746 e8daee5 Author: Domen Vrankar AuthorDate: Thu Feb 18 19:43:28 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Feb 18 19:43:28 2016 -0500 Merge topic 'cpack-deb-autodep-ORIGIN-RPATH' into next e8daee5b CPack/Deb $ORIGIN handling in rpath https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e8daee5bd0b68936b89a26e565b010f3387dc158 commit e8daee5bd0b68936b89a26e565b010f3387dc158 Author: Domen Vrankar AuthorDate: Fri Feb 19 01:42:19 2016 +0100 Commit: Domen Vrankar CommitDate: Fri Feb 19 01:42:19 2016 +0100 CPack/Deb $ORIGIN handling in rpath Release not for fix of bug 12431 diff --git a/Help/release/dev/cpack-deb-autodep-ORIGIN-RPATH.rst b/Help/release/dev/cpack-deb-autodep-ORIGIN-RPATH.rst new file mode 100644 index 0000000..b0d6196 --- /dev/null +++ b/Help/release/dev/cpack-deb-autodep-ORIGIN-RPATH.rst @@ -0,0 +1,6 @@ +cpack-deb-autodep-ORIGIN-RPATH +-------------------------------- + +* The "CPackDeb" module learned how to handle ``$ORIGIN`` + in ``CMAKE_INSTALL_RPATH`` when :variable:`CPACK_DEBIAN_PACKAGE_SHLIBDEPS` + is used for dependency auto detection. ----------------------------------------------------------------------- Summary of changes: Help/release/dev/cpack-deb-autodep-ORIGIN-RPATH.rst | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 Help/release/dev/cpack-deb-autodep-ORIGIN-RPATH.rst hooks/post-receive -- CMake From kwrobot at kitware.com Fri Feb 19 00:01:09 2016 From: kwrobot at kitware.com (Kitware Robot) Date: Fri, 19 Feb 2016 00:01:09 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-96-g29c266e Message-ID: <20160219050111.83DF8E4F58@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 29c266eb56e4e17894574f8a838a372f809d671e (commit) from 9f40f656660a791804e94a2a2a98ee89d7f9c70b (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=29c266eb56e4e17894574f8a838a372f809d671e commit 29c266eb56e4e17894574f8a838a372f809d671e Author: Kitware Robot AuthorDate: Fri Feb 19 00:01:05 2016 -0500 Commit: Kitware Robot CommitDate: Fri Feb 19 00:01:05 2016 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 4b38a66..962c9ea 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 5) -set(CMake_VERSION_PATCH 20160218) +set(CMake_VERSION_PATCH 20160219) #set(CMake_VERSION_RC 1) ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Fri Feb 19 08:59:42 2016 From: brad.king at kitware.com (Brad King) Date: Fri, 19 Feb 2016 08:59:42 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-210-gc688ba6 Message-ID: <20160219135942.1BE66E5AAC@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, next has been updated via c688ba680d7b4a6c29093fa7c076c953a54904a9 (commit) via 091b649e198bade6fba7518b6c970bfa23b7365f (commit) from 98ac0479f2d634c6feb224e2094198587efce9b2 (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=c688ba680d7b4a6c29093fa7c076c953a54904a9 commit c688ba680d7b4a6c29093fa7c076c953a54904a9 Merge: 98ac047 091b649 Author: Brad King AuthorDate: Fri Feb 19 08:59:41 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 19 08:59:41 2016 -0500 Merge topic 'revert-automoc-src-per-dir' into next 091b649e Revert "Automoc: Fix support of files with the same name (#12873)" https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=091b649e198bade6fba7518b6c970bfa23b7365f commit 091b649e198bade6fba7518b6c970bfa23b7365f Author: Brad King AuthorDate: Fri Feb 19 08:57:20 2016 -0500 Commit: Brad King CommitDate: Fri Feb 19 08:59:17 2016 -0500 Revert "Automoc: Fix support of files with the same name (#12873)" This reverts commit 9beb2744d7685fca9cd5717308d4457dffdefcdc. Our AUTOMOC documentation states that it should be possible to `#include "moc_foo.cpp"` in `foo.cpp`, and this will not work if the file is placed in a different directory. Another solution will need to be found to the original problem. Reported-by: Stephen Kelly diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index 226ab43..b16eccd 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -1104,39 +1104,10 @@ void cmQtAutoGenerators::ParseHeaders(const std::set& absHeaders, std::cout << "AUTOGEN: Checking " << headerName << std::endl; } - std::string headerDirectory; - if (cmsys::SystemTools::IsSubDirectory(headerName, - this->ProjectSourceDir)) - { - headerDirectory = this->ProjectSourceDir; - } - else if (cmsys::SystemTools::IsSubDirectory(headerName, - this->ProjectBinaryDir)) - { - headerDirectory = this->ProjectBinaryDir; - } - else - { - cmsys::SystemTools::SplitPathRootComponent(headerName, - &headerDirectory); - } - - std::string baseHeaderName = - cmsys::SystemTools::GetFilenameWithoutLastExtension(headerName); - - headerDirectory = cmsys::SystemTools::RelativePath( - headerDirectory, cmsys::SystemTools::GetParentDirectory(headerName)); - - if (!headerDirectory.empty()) - { - headerDirectory += "/"; - } - - std::string mocName = headerDirectory + baseHeaderName; - - cmSystemTools::ReplaceString(mocName, "/", "_"); + const std::string basename = cmsys::SystemTools:: + GetFilenameWithoutLastExtension(headerName); - const std::string currentMoc = "moc_" + mocName + ".cpp"; + const std::string currentMoc = "moc_" + basename + ".cpp"; std::string macroName; if (requiresMocing(contents, macroName)) { diff --git a/Tests/QtAutogen/Adir/CMakeLists.txt b/Tests/QtAutogen/Adir/CMakeLists.txt index 0c7848d..a1c36ff 100644 --- a/Tests/QtAutogen/Adir/CMakeLists.txt +++ b/Tests/QtAutogen/Adir/CMakeLists.txt @@ -3,6 +3,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) set(CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON) -add_library(libA SHARED libA.cpp foo.cpp bar/foo.cpp) +add_library(libA SHARED libA.cpp) target_link_libraries(libA LINK_PUBLIC ${QT_QTCORE_TARGET}) generate_export_header(libA) diff --git a/Tests/QtAutogen/Adir/bar/foo.cpp b/Tests/QtAutogen/Adir/bar/foo.cpp deleted file mode 100644 index 3f5e0a9..0000000 --- a/Tests/QtAutogen/Adir/bar/foo.cpp +++ /dev/null @@ -1,4 +0,0 @@ -#include "foo.h" - -bar::foo::foo() {} -bar::foo::~foo() {} diff --git a/Tests/QtAutogen/Adir/bar/foo.h b/Tests/QtAutogen/Adir/bar/foo.h deleted file mode 100644 index daf2367..0000000 --- a/Tests/QtAutogen/Adir/bar/foo.h +++ /dev/null @@ -1,10 +0,0 @@ -#include - -namespace bar { - class foo: public QObject { - Q_OBJECT - public: - foo(); - ~foo(); - }; -} diff --git a/Tests/QtAutogen/Adir/foo.cpp b/Tests/QtAutogen/Adir/foo.cpp deleted file mode 100644 index 86e4d8e..0000000 --- a/Tests/QtAutogen/Adir/foo.cpp +++ /dev/null @@ -1,4 +0,0 @@ -#include "foo.h" - -foo::foo() {} -foo::~foo() {} diff --git a/Tests/QtAutogen/Adir/foo.h b/Tests/QtAutogen/Adir/foo.h deleted file mode 100644 index a51960c..0000000 --- a/Tests/QtAutogen/Adir/foo.h +++ /dev/null @@ -1,8 +0,0 @@ -#include - -class foo: public QObject { - Q_OBJECT -public: - foo(); - ~foo(); -}; ----------------------------------------------------------------------- Summary of changes: Source/cmQtAutoGenerators.cxx | 35 +++-------------------------------- Tests/QtAutogen/Adir/CMakeLists.txt | 2 +- Tests/QtAutogen/Adir/bar/foo.cpp | 4 ---- Tests/QtAutogen/Adir/bar/foo.h | 10 ---------- Tests/QtAutogen/Adir/foo.cpp | 4 ---- Tests/QtAutogen/Adir/foo.h | 8 -------- 6 files changed, 4 insertions(+), 59 deletions(-) delete mode 100644 Tests/QtAutogen/Adir/bar/foo.cpp delete mode 100644 Tests/QtAutogen/Adir/bar/foo.h delete mode 100644 Tests/QtAutogen/Adir/foo.cpp delete mode 100644 Tests/QtAutogen/Adir/foo.h hooks/post-receive -- CMake From brad.king at kitware.com Fri Feb 19 09:21:48 2016 From: brad.king at kitware.com (Brad King) Date: Fri, 19 Feb 2016 09:21:48 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-213-g988fc13 Message-ID: <20160219142148.6869FE571C@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, next has been updated via 988fc13c0e286c6ea26c7ab0d485733b8e663bbe (commit) via c05678ad2873bc0ee9070c9eab181242c3e115a0 (commit) via 29c266eb56e4e17894574f8a838a372f809d671e (commit) from c688ba680d7b4a6c29093fa7c076c953a54904a9 (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=988fc13c0e286c6ea26c7ab0d485733b8e663bbe commit 988fc13c0e286c6ea26c7ab0d485733b8e663bbe Merge: c688ba6 c05678a Author: Brad King AuthorDate: Fri Feb 19 09:21:47 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 19 09:21:47 2016 -0500 Merge topic 'test-FindPackageModeMakefileTest-optionally' into next c05678ad Tests: Add option to disable FindPackageModeMakefileTest 29c266eb CMake Nightly Date Stamp https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c05678ad2873bc0ee9070c9eab181242c3e115a0 commit c05678ad2873bc0ee9070c9eab181242c3e115a0 Author: Brad King AuthorDate: Fri Feb 19 09:10:44 2016 -0500 Commit: Brad King CommitDate: Fri Feb 19 09:10:44 2016 -0500 Tests: Add option to disable FindPackageModeMakefileTest This test does not work in all environments, so add an option to disable it. diff --git a/Tests/FindPackageModeMakefileTest/CMakeLists.txt b/Tests/FindPackageModeMakefileTest/CMakeLists.txt index 8e21c32..56fcc5d 100644 --- a/Tests/FindPackageModeMakefileTest/CMakeLists.txt +++ b/Tests/FindPackageModeMakefileTest/CMakeLists.txt @@ -1,6 +1,7 @@ -if(UNIX AND "${CMAKE_GENERATOR}" MATCHES "Makefile") +if(UNIX AND "${CMAKE_GENERATOR}" MATCHES "Makefile" AND + NOT CMake_TEST_NO_FindPackageModeMakefileTest) # Test whether the make is GNU make, and only add the test in this case, # since the configured makefile in this test uses $(shell ...), which ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- Tests/FindPackageModeMakefileTest/CMakeLists.txt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Fri Feb 19 09:30:59 2016 From: brad.king at kitware.com (Brad King) Date: Fri, 19 Feb 2016 09:30:59 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-215-gb377afb Message-ID: <20160219143059.EB5E4E5A17@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, next has been updated via b377afb9e39fd27b25d271847798971463cdd0e4 (commit) via d8cba5368bd58c6113abd8617fe264579e97b48a (commit) from 988fc13c0e286c6ea26c7ab0d485733b8e663bbe (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=b377afb9e39fd27b25d271847798971463cdd0e4 commit b377afb9e39fd27b25d271847798971463cdd0e4 Merge: 988fc13 d8cba53 Author: Brad King AuthorDate: Fri Feb 19 09:30:59 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 19 09:30:59 2016 -0500 Merge topic 'test-XCTest-sdkroot' into next d8cba536 Tests: Fix XCTest when ENV{SDKROOT} is set https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d8cba5368bd58c6113abd8617fe264579e97b48a commit d8cba5368bd58c6113abd8617fe264579e97b48a Author: Brad King AuthorDate: Fri Feb 19 09:28:27 2016 -0500 Commit: Brad King CommitDate: Fri Feb 19 09:28:27 2016 -0500 Tests: Fix XCTest when ENV{SDKROOT} is set We use the host OS X version as the deployment target for this test. This breaks if the SDKROOT environment variable specifies an incompatible SDK version. Explicitly specify `macosx` as the SDK so that CMake will automatically select a version matching the deployment target. diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 7bb0721..b43275a 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1644,7 +1644,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release if(CMake_TEST_XCODE_VERSION AND NOT CMake_TEST_XCODE_VERSION VERSION_LESS 5 AND OSX_VERSION MATCHES "^([0-9]+\\.[0-9]+)") - set(XCTest_BUILD_OPTIONS -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_MATCH_1}) + set(XCTest_BUILD_OPTIONS -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_MATCH_1} -DCMAKE_OSX_SYSROOT=macosx) ADD_TEST_MACRO(XCTest ${CMAKE_CTEST_COMMAND} -C $ -V) endif() ----------------------------------------------------------------------- Summary of changes: Tests/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Fri Feb 19 09:45:22 2016 From: brad.king at kitware.com (Brad King) Date: Fri, 19 Feb 2016 09:45:22 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-218-ga70c292 Message-ID: <20160219144522.1D89CE50F5@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, next has been updated via a70c2929815916a7c9d3600733ef37a7be3e0aad (commit) via f23f18ab686faa0ce91486143469bb58753b0843 (commit) via b13a74b35b17ecb44ec6ff552ecb1cbdac204361 (commit) from b377afb9e39fd27b25d271847798971463cdd0e4 (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=a70c2929815916a7c9d3600733ef37a7be3e0aad commit a70c2929815916a7c9d3600733ef37a7be3e0aad Merge: b377afb f23f18a Author: Brad King AuthorDate: Fri Feb 19 09:45:21 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 19 09:45:21 2016 -0500 Merge topic 'reduce-entropy-consumption' into next f23f18ab cmSystemTools: Avoid excess entropy consumption by RandomSeed (#15976) b13a74b3 cmSystemTools: Remove unused include https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f23f18ab686faa0ce91486143469bb58753b0843 commit f23f18ab686faa0ce91486143469bb58753b0843 Author: Cristian Rodr?guez AuthorDate: Wed Feb 17 09:02:04 2016 -0500 Commit: Brad King CommitDate: Fri Feb 19 09:44:59 2016 -0500 cmSystemTools: Avoid excess entropy consumption by RandomSeed (#15976) Read `/dev/urandom` without buffering to avoid taking more than we need. diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index c9670fa..9af54bf 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -2183,8 +2183,10 @@ unsigned int cmSystemTools::RandomSeed() } seed; // Try using a real random source. - cmsys::ifstream fin("/dev/urandom"); - if(fin && fin.read(seed.bytes, sizeof(seed)) && + cmsys::ifstream fin; + fin.rdbuf()->pubsetbuf(0, 0); // Unbuffered read. + fin.open("/dev/urandom"); + if(fin.good() && fin.read(seed.bytes, sizeof(seed)) && fin.gcount() == sizeof(seed)) { return seed.integer; https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b13a74b35b17ecb44ec6ff552ecb1cbdac204361 commit b13a74b35b17ecb44ec6ff552ecb1cbdac204361 Author: Brad King AuthorDate: Thu Feb 18 09:57:35 2016 -0500 Commit: Brad King CommitDate: Fri Feb 19 09:44:59 2016 -0500 cmSystemTools: Remove unused include We do not seem to need this header anymore, and including it on AIX causes `#define open open64` which breaks `std::ifstream::open` calls. diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 3ba7287..c9670fa 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -60,8 +60,7 @@ #endif #if defined(CMAKE_BUILD_WITH_CMAKE) -# include -# include "cmCryptoHash.h" +# include "cmCryptoHash.h" #endif #if defined(CMAKE_USE_ELF_PARSER) ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake From brad.king at kitware.com Fri Feb 19 09:47:38 2016 From: brad.king at kitware.com (Brad King) Date: Fri, 19 Feb 2016 09:47:38 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-98-g3e3a12a Message-ID: <20160219144738.3C990E53EA@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 3e3a12a4ab5989a34fece99db9002db3822f5924 (commit) via 26fdd9c30a0a74b8642620478f03d40fee967e56 (commit) from 29c266eb56e4e17894574f8a838a372f809d671e (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=3e3a12a4ab5989a34fece99db9002db3822f5924 commit 3e3a12a4ab5989a34fece99db9002db3822f5924 Merge: 29c266e 26fdd9c Author: Brad King AuthorDate: Fri Feb 19 09:47:36 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 19 09:47:36 2016 -0500 Merge topic 'fix-CPACK_INSTALL_CMAKE_PROJECTS-subdirectory' 26fdd9c3 CPack: Fix CPACK_INSTALL_CMAKE_PROJECTS SubDirectory (4th) option ----------------------------------------------------------------------- Summary of changes: Source/CPack/cmCPackGenerator.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Fri Feb 19 09:47:40 2016 From: brad.king at kitware.com (Brad King) Date: Fri, 19 Feb 2016 09:47:40 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-100-gc387325 Message-ID: <20160219144740.ECD7AE53F6@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 c387325d4adb69e411f0832e6e3949ba2a4a7f79 (commit) via 6727270b75eec4e379acd4a39f5003a316249c73 (commit) from 3e3a12a4ab5989a34fece99db9002db3822f5924 (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=c387325d4adb69e411f0832e6e3949ba2a4a7f79 commit c387325d4adb69e411f0832e6e3949ba2a4a7f79 Merge: 3e3a12a 6727270 Author: Brad King AuthorDate: Fri Feb 19 09:47:39 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 19 09:47:39 2016 -0500 Merge topic 'unix-timestamps' 6727270b CMake: Extend TIMESTAMP sub-commands with new unix time format specifier ----------------------------------------------------------------------- Summary of changes: Help/command/string.rst | 1 + Help/release/dev/unix-timestamps.rst | 6 ++ Source/cmTimestamp.cxx | 64 ++++++++++++++++++++-- Source/cmTimestamp.h | 11 ++-- Tests/CMakeTests/String-TIMESTAMP-UnixTime.cmake | 22 ++++++++ Tests/CMakeTests/StringTest.cmake.in | 6 ++ 6 files changed, 101 insertions(+), 9 deletions(-) create mode 100644 Help/release/dev/unix-timestamps.rst create mode 100644 Tests/CMakeTests/String-TIMESTAMP-UnixTime.cmake hooks/post-receive -- CMake From brad.king at kitware.com Fri Feb 19 09:47:43 2016 From: brad.king at kitware.com (Brad King) Date: Fri, 19 Feb 2016 09:47:43 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-103-g39a80a1 Message-ID: <20160219144743.42B39E5400@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 39a80a1febde53de8747d2062cf23cf4dad4584a (commit) via f23f18ab686faa0ce91486143469bb58753b0843 (commit) via b13a74b35b17ecb44ec6ff552ecb1cbdac204361 (commit) from c387325d4adb69e411f0832e6e3949ba2a4a7f79 (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=39a80a1febde53de8747d2062cf23cf4dad4584a commit 39a80a1febde53de8747d2062cf23cf4dad4584a Merge: c387325 f23f18a Author: Brad King AuthorDate: Fri Feb 19 09:47:41 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 19 09:47:41 2016 -0500 Merge topic 'reduce-entropy-consumption' f23f18ab cmSystemTools: Avoid excess entropy consumption by RandomSeed (#15976) b13a74b3 cmSystemTools: Remove unused include ----------------------------------------------------------------------- Summary of changes: Source/cmSystemTools.cxx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Fri Feb 19 09:47:45 2016 From: brad.king at kitware.com (Brad King) Date: Fri, 19 Feb 2016 09:47:45 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-106-g509b1f0 Message-ID: <20160219144745.B1E2FE5408@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 509b1f08ea3ee1d8063efc81fee851ee075b3c97 (commit) via e8daee5bd0b68936b89a26e565b010f3387dc158 (commit) via b8263a2f8d6df42b2a37c2efc2f7a3ac2b1d658a (commit) from 39a80a1febde53de8747d2062cf23cf4dad4584a (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=509b1f08ea3ee1d8063efc81fee851ee075b3c97 commit 509b1f08ea3ee1d8063efc81fee851ee075b3c97 Merge: 39a80a1 e8daee5 Author: Brad King AuthorDate: Fri Feb 19 09:47:44 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 19 09:47:44 2016 -0500 Merge topic 'cpack-deb-autodep-ORIGIN-RPATH' e8daee5b CPack/Deb $ORIGIN handling in rpath b8263a2f CPack/Deb Create DEBIAN directory for dpkg-shlibdeps ----------------------------------------------------------------------- Summary of changes: Help/release/dev/cpack-deb-autodep-ORIGIN-RPATH.rst | 6 ++++++ Modules/CPackDeb.cmake | 6 ++++++ 2 files changed, 12 insertions(+) create mode 100644 Help/release/dev/cpack-deb-autodep-ORIGIN-RPATH.rst hooks/post-receive -- CMake From brad.king at kitware.com Fri Feb 19 09:48:05 2016 From: brad.king at kitware.com (Brad King) Date: Fri, 19 Feb 2016 09:48:05 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-223-g87362a2 Message-ID: <20160219144805.C702CE543A@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, next has been updated via 87362a272cae09482d4c93ca08506eaca1db251f (commit) via 509b1f08ea3ee1d8063efc81fee851ee075b3c97 (commit) via 39a80a1febde53de8747d2062cf23cf4dad4584a (commit) via c387325d4adb69e411f0832e6e3949ba2a4a7f79 (commit) via 3e3a12a4ab5989a34fece99db9002db3822f5924 (commit) from a70c2929815916a7c9d3600733ef37a7be3e0aad (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=87362a272cae09482d4c93ca08506eaca1db251f commit 87362a272cae09482d4c93ca08506eaca1db251f Merge: a70c292 509b1f0 Author: Brad King AuthorDate: Fri Feb 19 09:47:58 2016 -0500 Commit: Brad King CommitDate: Fri Feb 19 09:47:58 2016 -0500 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake From brad.king at kitware.com Fri Feb 19 10:23:17 2016 From: brad.king at kitware.com (Brad King) Date: Fri, 19 Feb 2016 10:23:17 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-225-g058bcf3 Message-ID: <20160219152319.F15F7E594C@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, next has been updated via 058bcf328e39cde948329e1ff46d3d77272516aa (commit) via 31edd002d03c4b26f1c087544282833a726f6c2c (commit) from 87362a272cae09482d4c93ca08506eaca1db251f (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=058bcf328e39cde948329e1ff46d3d77272516aa commit 058bcf328e39cde948329e1ff46d3d77272516aa Merge: 87362a2 31edd00 Author: Brad King AuthorDate: Fri Feb 19 10:23:17 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 19 10:23:17 2016 -0500 Merge topic 'update-osx-release' into next 31edd002 Utilities/Release: Switch to OS X 10.7 and Qt 5.5 for Mac binary https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=31edd002d03c4b26f1c087544282833a726f6c2c commit 31edd002d03c4b26f1c087544282833a726f6c2c Author: Brad King AuthorDate: Thu Feb 18 15:32:38 2016 -0500 Commit: Brad King CommitDate: Fri Feb 19 09:59:39 2016 -0500 Utilities/Release: Switch to OS X 10.7 and Qt 5.5 for Mac binary Use a new build machine to produce the OS X binary targeting OS X 10.7 and using Qt 5.5. diff --git a/Utilities/Release/dashmacmini5_release.cmake b/Utilities/Release/bigmac_release.cmake similarity index 55% rename from Utilities/Release/dashmacmini5_release.cmake rename to Utilities/Release/bigmac_release.cmake index b147013..568a98c 100644 --- a/Utilities/Release/dashmacmini5_release.cmake +++ b/Utilities/Release/bigmac_release.cmake @@ -1,27 +1,32 @@ set(PROCESSORS 4) set(CMAKE_RELEASE_DIRECTORY /Users/kitware/CMakeReleaseDirectory) -# set(USER_OVERRIDE "set(CMAKE_CXX_LINK_EXECUTABLE \\\"gcc -o -shared-libgcc -lstdc++-static\\\")") set(BOOTSTRAP_ARGS "--prefix=/ --docdir=doc/cmake") -set(HOST dashmacmini5) +set(HOST bigmac) set(MAKE_PROGRAM "make") set(MAKE "${MAKE_PROGRAM} -j5") set(CPACK_BINARY_GENERATORS "DragNDrop TGZ TZ") set(CPACK_SOURCE_GENERATORS "TGZ TZ") set(CPACK_DMG_FORMAT "UDBZ") #build using bzip2 for smaller package size +set(CC clang) +set(CXX clang++) +set(CFLAGS "") +set(CXXFLAGS "-stdlib=libc++") set(INITIAL_CACHE " -CMAKE_USE_OPENSSL:BOOL=OFF -OPENSSL_CRYPTO_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1g-install/lib/libcrypto.a -OPENSSL_INCLUDE_DIR:PATH=/Users/kitware/openssl-1.0.1g-install/include -OPENSSL_SSL_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1g-install/lib/libssl.a CMAKE_BUILD_TYPE:STRING=Release CMAKE_OSX_ARCHITECTURES:STRING=x86_64 -CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.6 +CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7 CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE CPACK_SYSTEM_NAME:STRING=Darwin-x86_64 BUILD_QtDialog:BOOL=TRUE CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:BOOL=TRUE CMake_INSTALL_DEPENDENCIES:BOOL=ON -QT_QMAKE_EXECUTABLE:FILEPATH=/Users/kitware/Support/qt-4.8.6/install/bin/qmake +CMAKE_SKIP_RPATH:BOOL=TRUE +CMake_NO_C_STANDARD:BOOL=TRUE +CMake_NO_CXX_STANDARD:BOOL=TRUE +CMake_TEST_NO_FindPackageModeMakefileTest:BOOL=TRUE ") +set(ENV [[ +export CMAKE_PREFIX_PATH='/Users/kitware/dashboards/support/Qt-5.5.1' +]]) get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH) include(${path}/release_cmake.cmake) diff --git a/Utilities/Release/create-cmake-release.cmake b/Utilities/Release/create-cmake-release.cmake index d41c4ec..403367b 100644 --- a/Utilities/Release/create-cmake-release.cmake +++ b/Utilities/Release/create-cmake-release.cmake @@ -7,7 +7,7 @@ file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/logs) set(RELEASE_SCRIPTS_BATCH_1 dash3win7_release.cmake # Windows - dashmacmini5_release.cmake # OS X x86_64 + bigmac_release.cmake # OS X x86_64 magrathea_release.cmake # Linux linux64_release.cmake # Linux x86_64 ) ----------------------------------------------------------------------- Summary of changes: ...macmini5_release.cmake => bigmac_release.cmake} | 21 ++++++++++++-------- Utilities/Release/create-cmake-release.cmake | 2 +- 2 files changed, 14 insertions(+), 9 deletions(-) rename Utilities/Release/{dashmacmini5_release.cmake => bigmac_release.cmake} (55%) hooks/post-receive -- CMake From brad.king at kitware.com Fri Feb 19 13:05:50 2016 From: brad.king at kitware.com (Brad King) Date: Fri, 19 Feb 2016 13:05:50 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-227-gdeb9258 Message-ID: <20160219180550.4B8FDE5AA4@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, next has been updated via deb9258d2c999a94aa7dee0b61a0c126eb3481f9 (commit) via b347503028a639103f27fcd2752b133993bb30ec (commit) from 058bcf328e39cde948329e1ff46d3d77272516aa (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=deb9258d2c999a94aa7dee0b61a0c126eb3481f9 commit deb9258d2c999a94aa7dee0b61a0c126eb3481f9 Merge: 058bcf3 b347503 Author: Brad King AuthorDate: Fri Feb 19 13:05:49 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 19 13:05:49 2016 -0500 Merge topic 'doc-cmake-E-details' into next b3475030 Help: Clarify `cmake -E` command behavior with respect to file existence https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b347503028a639103f27fcd2752b133993bb30ec commit b347503028a639103f27fcd2752b133993bb30ec Author: Bartosz Kosiorek AuthorDate: Fri Feb 19 17:48:20 2016 +0100 Commit: Brad King CommitDate: Fri Feb 19 13:03:09 2016 -0500 Help: Clarify `cmake -E` command behavior with respect to file existence diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst index 91af3e3..92f5230 100644 --- a/Help/manual/cmake.1.rst +++ b/Help/manual/cmake.1.rst @@ -199,16 +199,19 @@ Available commands are: ``make_directory ...`` Create ```` directories. If necessary, create parent - directories too. + directories too. If a directory already exists it will be + silently ignored. ``md5sum ...`` Compute md5sum of files. ``remove [-f] ...`` - Remove the file(s), use ``-f`` to force it. + Remove the file(s), use ``-f`` to force it. If a file does + not exist it will be silently ignored. ``remove_directory `` - Remove a directory and its contents. + Remove a directory and its contents. If a directory does + not exist it will be silently ignored. ``rename `` Rename a file or directory (on one volume). @@ -241,7 +244,8 @@ Available commands are: Touch a file. ``touch_nocreate `` - Touch a file if it exists but do not create it. + Touch a file if it exists but do not create it. If a file does + not exist it will be silently ignored. UNIX-specific Command-Line Tools -------------------------------- ----------------------------------------------------------------------- Summary of changes: Help/manual/cmake.1.rst | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Fri Feb 19 14:09:49 2016 From: brad.king at kitware.com (Brad King) Date: Fri, 19 Feb 2016 14:09:49 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-229-g18893ff Message-ID: <20160219190949.0D477E3C25@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, next has been updated via 18893ffcb3b2fe00c5d72fdbe6ae5b0c1ca86dd3 (commit) via 7f1bd9fe6910f7633d98dec018cc01331a46b87e (commit) from deb9258d2c999a94aa7dee0b61a0c126eb3481f9 (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=18893ffcb3b2fe00c5d72fdbe6ae5b0c1ca86dd3 commit 18893ffcb3b2fe00c5d72fdbe6ae5b0c1ca86dd3 Merge: deb9258 7f1bd9f Author: Brad King AuthorDate: Fri Feb 19 14:09:47 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 19 14:09:47 2016 -0500 Merge topic 'try_compile-target-type' into next 7f1bd9fe try_compile: Add option to control type of target https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f1bd9fe6910f7633d98dec018cc01331a46b87e commit 7f1bd9fe6910f7633d98dec018cc01331a46b87e Author: Brad King AuthorDate: Fri Feb 19 13:23:48 2016 -0500 Commit: Brad King CommitDate: Fri Feb 19 14:07:38 2016 -0500 try_compile: Add option to control type of target Create a `CMAKE_TRY_COMPILE_TARGET_TYPE` option to specify use of `add_library(... STATIC ...)` for the generated test project. This will be useful for cross-compiling toolchains that cannot link a binary without custom flags or scripts. diff --git a/Help/command/try_compile.rst b/Help/command/try_compile.rst index 28dae80..78b1bc7 100644 --- a/Help/command/try_compile.rst +++ b/Help/command/try_compile.rst @@ -112,3 +112,6 @@ The current setting of :policy:`CMP0065` is set in the generated project. Set the :variable:`CMAKE_TRY_COMPILE_CONFIGURATION` variable to choose a build configuration. + +Set the :variable:`CMAKE_TRY_COMPILE_TARGET_TYPE` variable to specify +the type of target used for the source file signature. diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index 15eaece..444a706 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -292,6 +292,7 @@ Variables that Control the Build /variable/CMAKE_STATIC_LINKER_FLAGS_CONFIG /variable/CMAKE_STATIC_LINKER_FLAGS /variable/CMAKE_TRY_COMPILE_CONFIGURATION + /variable/CMAKE_TRY_COMPILE_TARGET_TYPE /variable/CMAKE_USE_RELATIVE_PATHS /variable/CMAKE_VISIBILITY_INLINES_HIDDEN /variable/CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD diff --git a/Help/release/dev/try_compile-target-type.rst b/Help/release/dev/try_compile-target-type.rst new file mode 100644 index 0000000..cc41bf3 --- /dev/null +++ b/Help/release/dev/try_compile-target-type.rst @@ -0,0 +1,8 @@ +try_compile-target-type +----------------------- + +* The :command:`try_compile` command learned to check a new + :variable:`CMAKE_TRY_COMPILE_TARGET_TYPE` variable to optionally + build a static library instead of an executable. This is useful + for cross-compiling toolchains that cannot link binaries without + custom flags or scripts. diff --git a/Help/variable/CMAKE_TRY_COMPILE_TARGET_TYPE.rst b/Help/variable/CMAKE_TRY_COMPILE_TARGET_TYPE.rst new file mode 100644 index 0000000..5fa8dfc --- /dev/null +++ b/Help/variable/CMAKE_TRY_COMPILE_TARGET_TYPE.rst @@ -0,0 +1,15 @@ +CMAKE_TRY_COMPILE_TARGET_TYPE +----------------------------- + +Type of target generated for :command:`try_compile` calls using the +source file signature. Valid values are: + +``EXECUTABLE`` + Use :command:`add_executable` to name the source file in the + generated project. This is the default if no value is given. + +``STATIC_LIBRARY`` + Use :command:`add_library` with the ``STATIC`` option to name the + source file in the generated project. This avoids running the + linker and is intended for use with cross-compiling toolchains + that cannot link without custom flags or linker scripts. diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx index 4a1f770..b639c15 100644 --- a/Source/cmCoreTryCompile.cxx +++ b/Source/cmCoreTryCompile.cxx @@ -19,13 +19,42 @@ #include -int cmCoreTryCompile::TryCompileCode(std::vector const& argv) +int cmCoreTryCompile::TryCompileCode(std::vector const& argv, + bool isTryRun) { this->BinaryDirectory = argv[1].c_str(); this->OutputFile = ""; // which signature were we called with ? this->SrcFileSignature = true; + cmState::TargetType targetType = cmState::EXECUTABLE; + const char* tt = + this->Makefile->GetDefinition("CMAKE_TRY_COMPILE_TARGET_TYPE"); + if (!isTryRun && tt && *tt) + { + if (strcmp(tt, cmState::GetTargetTypeName(cmState::EXECUTABLE)) == 0) + { + targetType = cmState::EXECUTABLE; + } + else if (strcmp(tt, + cmState::GetTargetTypeName(cmState::STATIC_LIBRARY)) == 0) + { + targetType = cmState::STATIC_LIBRARY; + } + else + { + this->Makefile->IssueMessage( + cmake::FATAL_ERROR, + std::string("Invalid value '") + tt + "' for " + "CMAKE_TRY_COMPILE_TARGET_TYPE. Only " + "'" + cmState::GetTargetTypeName(cmState::EXECUTABLE) + "' and " + "'" + cmState::GetTargetTypeName(cmState::STATIC_LIBRARY) + "' " + "are allowed." + ); + return -1; + } + } + const char* sourceDirectory = argv[2].c_str(); const char* projectName = 0; std::string targetName; @@ -486,11 +515,22 @@ int cmCoreTryCompile::TryCompileCode(std::vector const& argv) fprintf(fout, "set(CMAKE_ENABLE_EXPORTS %s)\n", ee); } - /* Put the executable at a known location (for COPY_FILE). */ - fprintf(fout, "set(CMAKE_RUNTIME_OUTPUT_DIRECTORY \"%s\")\n", - this->BinaryDirectory.c_str()); - /* Create the actual executable. */ - fprintf(fout, "add_executable(%s", targetName.c_str()); + if (targetType == cmState::EXECUTABLE) + { + /* Put the executable at a known location (for COPY_FILE). */ + fprintf(fout, "set(CMAKE_RUNTIME_OUTPUT_DIRECTORY \"%s\")\n", + this->BinaryDirectory.c_str()); + /* Create the actual executable. */ + fprintf(fout, "add_executable(%s", targetName.c_str()); + } + else // if (targetType == cmState::STATIC_LIBRARY) + { + /* Put the static library at a known location (for COPY_FILE). */ + fprintf(fout, "set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY \"%s\")\n", + this->BinaryDirectory.c_str()); + /* Create the actual static library. */ + fprintf(fout, "add_library(%s STATIC", targetName.c_str()); + } for(std::vector::iterator si = sources.begin(); si != sources.end(); ++si) { @@ -549,7 +589,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector const& argv) if (this->SrcFileSignature) { std::string copyFileErrorMessage; - this->FindOutputFile(targetName); + this->FindOutputFile(targetName, targetType); if ((res==0) && !copyFile.empty()) { @@ -651,13 +691,26 @@ void cmCoreTryCompile::CleanupFiles(const char* binDir) } } -void cmCoreTryCompile::FindOutputFile(const std::string& targetName) +void cmCoreTryCompile::FindOutputFile(const std::string& targetName, + cmState::TargetType targetType) { this->FindErrorMessage = ""; this->OutputFile = ""; std::string tmpOutputFile = "/"; - tmpOutputFile += targetName; - tmpOutputFile +=this->Makefile->GetSafeDefinition("CMAKE_EXECUTABLE_SUFFIX"); + if (targetType == cmState::EXECUTABLE) + { + tmpOutputFile += targetName; + tmpOutputFile += + this->Makefile->GetSafeDefinition("CMAKE_EXECUTABLE_SUFFIX"); + } + else // if (targetType == cmState::STATIC_LIBRARY) + { + tmpOutputFile += + this->Makefile->GetSafeDefinition("CMAKE_STATIC_LIBRARY_PREFIX"); + tmpOutputFile += targetName; + tmpOutputFile += + this->Makefile->GetSafeDefinition("CMAKE_STATIC_LIBRARY_SUFFIX"); + } // a list of directories where to search for the compilation result // at first directly in the binary dir diff --git a/Source/cmCoreTryCompile.h b/Source/cmCoreTryCompile.h index 3272462..c2beea8 100644 --- a/Source/cmCoreTryCompile.h +++ b/Source/cmCoreTryCompile.h @@ -30,7 +30,7 @@ public: * commands, such as TryRun can access the same logic without * duplication. */ - int TryCompileCode(std::vector const& argv); + int TryCompileCode(std::vector const& argv, bool isTryRun); /** * This deletes all the files created by TryCompileCode. @@ -44,8 +44,8 @@ public: TryCompileCode. The result is stored in OutputFile. If nothing is found, the error message is stored in FindErrorMessage. */ - void FindOutputFile(const std::string& targetName); - + void FindOutputFile(const std::string& targetName, + cmState::TargetType targetType); cmTypeMacro(cmCoreTryCompile, cmCommand); diff --git a/Source/cmTryCompileCommand.cxx b/Source/cmTryCompileCommand.cxx index 12ce015..87fbbdf 100644 --- a/Source/cmTryCompileCommand.cxx +++ b/Source/cmTryCompileCommand.cxx @@ -28,7 +28,7 @@ bool cmTryCompileCommand return false; } - this->TryCompileCode(argv); + this->TryCompileCode(argv, false); // if They specified clean then we clean up what we can if (this->SrcFileSignature) diff --git a/Source/cmTryRunCommand.cxx b/Source/cmTryRunCommand.cxx index b9ffe5e..d4a36c9 100644 --- a/Source/cmTryRunCommand.cxx +++ b/Source/cmTryRunCommand.cxx @@ -135,7 +135,7 @@ bool cmTryRunCommand this->CompileResultVariable = argv[1]; // do the try compile - int res = this->TryCompileCode(tryCompile); + int res = this->TryCompileCode(tryCompile, true); // now try running the command if it compiled if (!res) diff --git a/Tests/RunCMake/try_compile/RunCMakeTest.cmake b/Tests/RunCMake/try_compile/RunCMakeTest.cmake index 6cdbafa..43ce998 100644 --- a/Tests/RunCMake/try_compile/RunCMakeTest.cmake +++ b/Tests/RunCMake/try_compile/RunCMakeTest.cmake @@ -16,6 +16,10 @@ run_cmake(BadSources2) run_cmake(NonSourceCopyFile) run_cmake(NonSourceCompileDefinitions) +run_cmake(TargetTypeExe) +run_cmake(TargetTypeInvalid) +run_cmake(TargetTypeStatic) + run_cmake(CMP0056) if(RunCMake_GENERATOR MATCHES "Make|Ninja") diff --git a/Tests/RunCMake/try_compile/TargetTypeExe.cmake b/Tests/RunCMake/try_compile/TargetTypeExe.cmake new file mode 100644 index 0000000..9b6e727 --- /dev/null +++ b/Tests/RunCMake/try_compile/TargetTypeExe.cmake @@ -0,0 +1,14 @@ +enable_language(C) +set(CMAKE_TRY_COMPILE_TARGET_TYPE EXECUTABLE) +try_compile(result ${CMAKE_CURRENT_BINARY_DIR} + SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src.c + OUTPUT_VARIABLE out + COPY_FILE ${CMAKE_CURRENT_BINARY_DIR}/copy + COPY_FILE_ERROR copy_err + ) +if(NOT result) + message(FATAL_ERROR "try_compile failed:\n${out}") +endif() +if(copy_err) + message(FATAL_ERROR "try_compile COPY_FILE failed:\n${copy_err}") +endif() diff --git a/Tests/RunCMake/try_compile/TargetTypeInvalid-result.txt b/Tests/RunCMake/try_compile/TargetTypeInvalid-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/try_compile/TargetTypeInvalid-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/try_compile/TargetTypeInvalid-stderr.txt b/Tests/RunCMake/try_compile/TargetTypeInvalid-stderr.txt new file mode 100644 index 0000000..08b281a --- /dev/null +++ b/Tests/RunCMake/try_compile/TargetTypeInvalid-stderr.txt @@ -0,0 +1,5 @@ +^CMake Error at TargetTypeInvalid.cmake:2 \(try_compile\): + Invalid value 'INVALID' for CMAKE_TRY_COMPILE_TARGET_TYPE. Only + 'EXECUTABLE' and 'STATIC_LIBRARY' are allowed. +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/try_compile/TargetTypeInvalid.cmake b/Tests/RunCMake/try_compile/TargetTypeInvalid.cmake new file mode 100644 index 0000000..0bbc4ac --- /dev/null +++ b/Tests/RunCMake/try_compile/TargetTypeInvalid.cmake @@ -0,0 +1,2 @@ +set(CMAKE_TRY_COMPILE_TARGET_TYPE INVALID) +try_compile(result ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src.c) diff --git a/Tests/RunCMake/try_compile/TargetTypeStatic.cmake b/Tests/RunCMake/try_compile/TargetTypeStatic.cmake new file mode 100644 index 0000000..006b8b8 --- /dev/null +++ b/Tests/RunCMake/try_compile/TargetTypeStatic.cmake @@ -0,0 +1,14 @@ +enable_language(C) +set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) +try_compile(result ${CMAKE_CURRENT_BINARY_DIR} + SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/other.c + OUTPUT_VARIABLE out + COPY_FILE ${CMAKE_CURRENT_BINARY_DIR}/copy + COPY_FILE_ERROR copy_err + ) +if(NOT result) + message(FATAL_ERROR "try_compile failed:\n${out}") +endif() +if(copy_err) + message(FATAL_ERROR "try_compile COPY_FILE failed:\n${copy_err}") +endif() diff --git a/Tests/RunCMake/try_compile/other.c b/Tests/RunCMake/try_compile/other.c new file mode 100644 index 0000000..6c24f10 --- /dev/null +++ b/Tests/RunCMake/try_compile/other.c @@ -0,0 +1 @@ +int other(void) { return 0; } ----------------------------------------------------------------------- Summary of changes: Help/command/try_compile.rst | 3 + Help/manual/cmake-variables.7.rst | 1 + Help/release/dev/try_compile-target-type.rst | 8 +++ Help/variable/CMAKE_TRY_COMPILE_TARGET_TYPE.rst | 15 ++++ Source/cmCoreTryCompile.cxx | 73 +++++++++++++++++--- Source/cmCoreTryCompile.h | 6 +- Source/cmTryCompileCommand.cxx | 2 +- Source/cmTryRunCommand.cxx | 2 +- Tests/RunCMake/try_compile/RunCMakeTest.cmake | 4 ++ Tests/RunCMake/try_compile/TargetTypeExe.cmake | 14 ++++ .../TargetTypeInvalid-result.txt} | 0 .../try_compile/TargetTypeInvalid-stderr.txt | 5 ++ Tests/RunCMake/try_compile/TargetTypeInvalid.cmake | 2 + Tests/RunCMake/try_compile/TargetTypeStatic.cmake | 14 ++++ Tests/RunCMake/try_compile/other.c | 1 + 15 files changed, 135 insertions(+), 15 deletions(-) create mode 100644 Help/release/dev/try_compile-target-type.rst create mode 100644 Help/variable/CMAKE_TRY_COMPILE_TARGET_TYPE.rst create mode 100644 Tests/RunCMake/try_compile/TargetTypeExe.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => try_compile/TargetTypeInvalid-result.txt} (100%) create mode 100644 Tests/RunCMake/try_compile/TargetTypeInvalid-stderr.txt create mode 100644 Tests/RunCMake/try_compile/TargetTypeInvalid.cmake create mode 100644 Tests/RunCMake/try_compile/TargetTypeStatic.cmake create mode 100644 Tests/RunCMake/try_compile/other.c hooks/post-receive -- CMake From brad.king at kitware.com Fri Feb 19 15:47:11 2016 From: brad.king at kitware.com (Brad King) Date: Fri, 19 Feb 2016 15:47:11 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-231-g3ac6a12 Message-ID: <20160219204711.7F0CDE5799@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, next has been updated via 3ac6a120f45ebe47cdc9388ffe9b19f4ac341e7b (commit) via 093331a513f35f1e713fac93d54d271f6f7bab8a (commit) from 18893ffcb3b2fe00c5d72fdbe6ae5b0c1ca86dd3 (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=3ac6a120f45ebe47cdc9388ffe9b19f4ac341e7b commit 3ac6a120f45ebe47cdc9388ffe9b19f4ac341e7b Merge: 18893ff 093331a Author: Brad King AuthorDate: Fri Feb 19 15:47:10 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 19 15:47:10 2016 -0500 Merge topic 'update-osx-release' into next 093331a5 fixup! Utilities/Release: Switch to OS X 10.7 and Qt 5.5 for Mac binary https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=093331a513f35f1e713fac93d54d271f6f7bab8a commit 093331a513f35f1e713fac93d54d271f6f7bab8a Author: Brad King AuthorDate: Fri Feb 19 15:45:39 2016 -0500 Commit: Brad King CommitDate: Fri Feb 19 15:45:39 2016 -0500 fixup! Utilities/Release: Switch to OS X 10.7 and Qt 5.5 for Mac binary diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 7bb0721..0639804 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -687,7 +687,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release ADD_NIGHTLY_BUILD_TEST(CMakeNightlyWindows dash3win7_release.cmake) ADD_NIGHTLY_BUILD_TEST(CMakeNightlyOSX - dashmacmini5_release.cmake) + bigmac_release.cmake) ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux32 magrathea_release.cmake) ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux64 ----------------------------------------------------------------------- Summary of changes: Tests/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Fri Feb 19 15:47:42 2016 From: brad.king at kitware.com (Brad King) Date: Fri, 19 Feb 2016 15:47:42 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-233-g9f72e3d Message-ID: <20160219204742.5EC5CE57DD@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, next has been updated via 9f72e3d53e32af6fe5a7ad76cc8f82f8c13c39cc (commit) via b682debd65f07fb219a6a9c6b5fa5f42b468a845 (commit) from 3ac6a120f45ebe47cdc9388ffe9b19f4ac341e7b (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=9f72e3d53e32af6fe5a7ad76cc8f82f8c13c39cc commit 9f72e3d53e32af6fe5a7ad76cc8f82f8c13c39cc Merge: 3ac6a12 b682deb Author: Brad King AuthorDate: Fri Feb 19 15:47:41 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 19 15:47:41 2016 -0500 Merge topic 'update-osx-release' into next b682debd Utilities/Release: Switch to OS X 10.7 and Qt 5.5 for Mac binary https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b682debd65f07fb219a6a9c6b5fa5f42b468a845 commit b682debd65f07fb219a6a9c6b5fa5f42b468a845 Author: Brad King AuthorDate: Thu Feb 18 15:32:38 2016 -0500 Commit: Brad King CommitDate: Fri Feb 19 15:47:18 2016 -0500 Utilities/Release: Switch to OS X 10.7 and Qt 5.5 for Mac binary Use a new build machine to produce the OS X binary targeting OS X 10.7 and using Qt 5.5. diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 7bb0721..0639804 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -687,7 +687,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release ADD_NIGHTLY_BUILD_TEST(CMakeNightlyWindows dash3win7_release.cmake) ADD_NIGHTLY_BUILD_TEST(CMakeNightlyOSX - dashmacmini5_release.cmake) + bigmac_release.cmake) ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux32 magrathea_release.cmake) ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux64 diff --git a/Utilities/Release/dashmacmini5_release.cmake b/Utilities/Release/bigmac_release.cmake similarity index 55% rename from Utilities/Release/dashmacmini5_release.cmake rename to Utilities/Release/bigmac_release.cmake index b147013..568a98c 100644 --- a/Utilities/Release/dashmacmini5_release.cmake +++ b/Utilities/Release/bigmac_release.cmake @@ -1,27 +1,32 @@ set(PROCESSORS 4) set(CMAKE_RELEASE_DIRECTORY /Users/kitware/CMakeReleaseDirectory) -# set(USER_OVERRIDE "set(CMAKE_CXX_LINK_EXECUTABLE \\\"gcc -o -shared-libgcc -lstdc++-static\\\")") set(BOOTSTRAP_ARGS "--prefix=/ --docdir=doc/cmake") -set(HOST dashmacmini5) +set(HOST bigmac) set(MAKE_PROGRAM "make") set(MAKE "${MAKE_PROGRAM} -j5") set(CPACK_BINARY_GENERATORS "DragNDrop TGZ TZ") set(CPACK_SOURCE_GENERATORS "TGZ TZ") set(CPACK_DMG_FORMAT "UDBZ") #build using bzip2 for smaller package size +set(CC clang) +set(CXX clang++) +set(CFLAGS "") +set(CXXFLAGS "-stdlib=libc++") set(INITIAL_CACHE " -CMAKE_USE_OPENSSL:BOOL=OFF -OPENSSL_CRYPTO_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1g-install/lib/libcrypto.a -OPENSSL_INCLUDE_DIR:PATH=/Users/kitware/openssl-1.0.1g-install/include -OPENSSL_SSL_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1g-install/lib/libssl.a CMAKE_BUILD_TYPE:STRING=Release CMAKE_OSX_ARCHITECTURES:STRING=x86_64 -CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.6 +CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7 CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE CPACK_SYSTEM_NAME:STRING=Darwin-x86_64 BUILD_QtDialog:BOOL=TRUE CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL:BOOL=TRUE CMake_INSTALL_DEPENDENCIES:BOOL=ON -QT_QMAKE_EXECUTABLE:FILEPATH=/Users/kitware/Support/qt-4.8.6/install/bin/qmake +CMAKE_SKIP_RPATH:BOOL=TRUE +CMake_NO_C_STANDARD:BOOL=TRUE +CMake_NO_CXX_STANDARD:BOOL=TRUE +CMake_TEST_NO_FindPackageModeMakefileTest:BOOL=TRUE ") +set(ENV [[ +export CMAKE_PREFIX_PATH='/Users/kitware/dashboards/support/Qt-5.5.1' +]]) get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH) include(${path}/release_cmake.cmake) diff --git a/Utilities/Release/create-cmake-release.cmake b/Utilities/Release/create-cmake-release.cmake index d41c4ec..403367b 100644 --- a/Utilities/Release/create-cmake-release.cmake +++ b/Utilities/Release/create-cmake-release.cmake @@ -7,7 +7,7 @@ file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/logs) set(RELEASE_SCRIPTS_BATCH_1 dash3win7_release.cmake # Windows - dashmacmini5_release.cmake # OS X x86_64 + bigmac_release.cmake # OS X x86_64 magrathea_release.cmake # Linux linux64_release.cmake # Linux x86_64 ) ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake From kwrobot at kitware.com Sat Feb 20 00:01:07 2016 From: kwrobot at kitware.com (Kitware Robot) Date: Sat, 20 Feb 2016 00:01:07 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-107-g6872a4f Message-ID: <20160220050107.29DA1E5556@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 6872a4fde02de182cdec6786d4630387dd22fddf (commit) from 509b1f08ea3ee1d8063efc81fee851ee075b3c97 (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=6872a4fde02de182cdec6786d4630387dd22fddf commit 6872a4fde02de182cdec6786d4630387dd22fddf Author: Kitware Robot AuthorDate: Sat Feb 20 00:01:05 2016 -0500 Commit: Kitware Robot CommitDate: Sat Feb 20 00:01:05 2016 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 962c9ea..f2cb644 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 5) -set(CMake_VERSION_PATCH 20160219) +set(CMake_VERSION_PATCH 20160220) #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 Feb 21 00:01:06 2016 From: kwrobot at kitware.com (Kitware Robot) Date: Sun, 21 Feb 2016 00:01:06 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-108-g7e32bd9 Message-ID: <20160221050106.A8D86E5C60@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 7e32bd945a9f32144ac63fdcd085197658229f9c (commit) from 6872a4fde02de182cdec6786d4630387dd22fddf (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=7e32bd945a9f32144ac63fdcd085197658229f9c commit 7e32bd945a9f32144ac63fdcd085197658229f9c Author: Kitware Robot AuthorDate: Sun Feb 21 00:01:03 2016 -0500 Commit: Kitware Robot CommitDate: Sun Feb 21 00:01:03 2016 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index f2cb644..4628127 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 5) -set(CMake_VERSION_PATCH 20160220) +set(CMake_VERSION_PATCH 20160221) #set(CMake_VERSION_RC 1) ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From gjasny at googlemail.com Sun Feb 21 10:47:46 2016 From: gjasny at googlemail.com (Gregor Jasny) Date: Sun, 21 Feb 2016 10:47:46 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-237-g634c780 Message-ID: <20160221154746.9D28CE576B@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, next has been updated via 634c78061295a4633b7cdd651cbf6eed98642c84 (commit) via c3c9374cd4128b309ca84d4c1629d7c43bbc94ee (commit) via 7e32bd945a9f32144ac63fdcd085197658229f9c (commit) via 6872a4fde02de182cdec6786d4630387dd22fddf (commit) from 9f72e3d53e32af6fe5a7ad76cc8f82f8c13c39cc (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=634c78061295a4633b7cdd651cbf6eed98642c84 commit 634c78061295a4633b7cdd651cbf6eed98642c84 Merge: 9f72e3d c3c9374 Author: Gregor Jasny AuthorDate: Sun Feb 21 10:47:45 2016 -0500 Commit: CMake Topic Stage CommitDate: Sun Feb 21 10:47:45 2016 -0500 Merge topic 'xcode-remove-reftype' into next c3c9374c Write refType only for Xcode 1.5 7e32bd94 CMake Nightly Date Stamp 6872a4fd CMake Nightly Date Stamp https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c3c9374cd4128b309ca84d4c1629d7c43bbc94ee commit c3c9374cd4128b309ca84d4c1629d7c43bbc94ee Author: Gregor Jasny AuthorDate: Mon Feb 8 19:39:05 2016 +0100 Commit: Gregor Jasny CommitDate: Sun Feb 21 16:44:30 2016 +0100 Write refType only for Xcode 1.5 diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 526e32f..ef18729 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -2805,7 +2805,10 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmGeneratorTarget* gtgt, fullName = gtgt->GetFullName(defConfig.c_str()); } fileRef->AddAttribute("path", this->CreateString(fullName.c_str())); - fileRef->AddAttribute("refType", this->CreateString("0")); + if(this->XcodeVersion == 15) + { + fileRef->AddAttribute("refType", this->CreateString("0")); + } fileRef->AddAttribute("sourceTree", this->CreateString("BUILT_PRODUCTS_DIR")); fileRef->SetComment(gtgt->GetName().c_str()); ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- Source/cmGlobalXCodeGenerator.cxx | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) hooks/post-receive -- CMake From gjasny at googlemail.com Sun Feb 21 12:54:52 2016 From: gjasny at googlemail.com (Gregor Jasny) Date: Sun, 21 Feb 2016 12:54:52 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-239-gcf1a414 Message-ID: <20160221175452.C1133E5C37@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, next has been updated via cf1a414cfb2917588a6eff20cc8cdda4c98264d9 (commit) via c50fefc0ff7680922390879cbdb4fbb9b9c88a7d (commit) from 634c78061295a4633b7cdd651cbf6eed98642c84 (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=cf1a414cfb2917588a6eff20cc8cdda4c98264d9 commit cf1a414cfb2917588a6eff20cc8cdda4c98264d9 Merge: 634c780 c50fefc Author: Gregor Jasny AuthorDate: Sun Feb 21 12:54:52 2016 -0500 Commit: CMake Topic Stage CommitDate: Sun Feb 21 12:54:52 2016 -0500 Merge topic 'xcode-refactor-xcodeobject' into next c50fefc0 Refactor XCode block writes to allow any number of nesting. https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c50fefc0ff7680922390879cbdb4fbb9b9c88a7d commit c50fefc0ff7680922390879cbdb4fbb9b9c88a7d Author: Robert Goulet AuthorDate: Fri Feb 19 14:00:19 2016 -0500 Commit: Gregor Jasny CommitDate: Sun Feb 21 17:13:26 2016 +0100 Refactor XCode block writes to allow any number of nesting. diff --git a/Source/cmXCodeObject.cxx b/Source/cmXCodeObject.cxx index 5bc34c1..911e154 100644 --- a/Source/cmXCodeObject.cxx +++ b/Source/cmXCodeObject.cxx @@ -111,102 +111,102 @@ void cmXCodeObject::Print(std::ostream& out) for(i = this->ObjectAttributes.begin(); i != this->ObjectAttributes.end(); ++i) { - cmXCodeObject* object = i->second; - if(i->first != "isa") - { - cmXCodeObject::Indent(3*indentFactor, out); - } - else - { + if(i->first == "isa") continue; - } - if(object->TypeValue == OBJECT_LIST) - { - out << i->first << " = (" << separator; - for(unsigned int k = 0; k < i->second->List.size(); k++) - { - cmXCodeObject::Indent(4*indentFactor, out); - out << i->second->List[k]->Id; - i->second->List[k]->PrintComment(out); - out << "," << separator; - } - cmXCodeObject::Indent(3*indentFactor, out); - out << ");" << separator; - } - else if(object->TypeValue == ATTRIBUTE_GROUP) + + PrintAttribute(out, 3, separator, indentFactor, i->first, i->second, this); + } + cmXCodeObject::Indent(2*indentFactor, out); + out << "};\n"; +} + +void cmXCodeObject::PrintAttribute(std::ostream& out, const int level, + const std::string separator, + const int factor, const std::string& name, + const cmXCodeObject* object, + const cmXCodeObject* parent) +{ + cmXCodeObject::Indent(level * factor, out); + switch(object->TypeValue) + { + case OBJECT_LIST: { - std::map::iterator j; - out << i->first << " = {"; - if(separator == "\n") + out << name << " = ("; + if(parent->TypeValue != ATTRIBUTE_GROUP) { out << separator; } - for(j = object->ObjectAttributes.begin(); j != - object->ObjectAttributes.end(); ++j) + for(unsigned int i = 0; i < object->List.size(); ++i) { - cmXCodeObject::Indent(4 *indentFactor, out); - - if(j->second->TypeValue == STRING) - { - cmXCodeObject::PrintString(out,j->first); - out << " = "; - j->second->PrintString(out); - out << ";"; - } - else if(j->second->TypeValue == OBJECT_LIST) + if(object->List[i]->TypeValue == STRING) { - cmXCodeObject::PrintString(out,j->first); - out << " = ("; - for(unsigned int k = 0; k < j->second->List.size(); k++) + object->List[i]->PrintString(out); + if(i+1 < object->List.size()) { - if(j->second->List[k]->TypeValue == STRING) - { - j->second->List[k]->PrintString(out); - out << ", "; - } - else - { - out << "List_" << k << "_TypeValue_IS_NOT_STRING, "; - } + out << ","; } - out << ");"; } else { - cmXCodeObject::PrintString(out,j->first); - out << " = error_unexpected_TypeValue_" << - j->second->TypeValue << ";"; + cmXCodeObject::Indent((level + 1) * factor, out); + out << object->List[i]->Id; + object->List[i]->PrintComment(out); + out << "," << separator; } + } + if(parent->TypeValue != ATTRIBUTE_GROUP) + { + cmXCodeObject::Indent(level * factor, out); + } + out << ");" << separator; + } + break; + case ATTRIBUTE_GROUP: + { + out << name << " = {"; + if(separator == "\n") + { out << separator; } - cmXCodeObject::Indent(3 *indentFactor, out); + std::map::const_iterator i; + for(i = object->ObjectAttributes.begin(); + i != object->ObjectAttributes.end(); ++i) + { + PrintAttribute(out, (level + 1) * factor, separator, factor, + i->first, i->second, object); + } + cmXCodeObject::Indent(level * factor, out); out << "};" << separator; } - else if(object->TypeValue == OBJECT_REF) + break; + + case OBJECT_REF: { - cmXCodeObject::PrintString(out,i->first); + cmXCodeObject::PrintString(out, name); out << " = " << object->Object->Id; - if(object->Object->HasComment() && i->first != "remoteGlobalIDString") + if(object->Object->HasComment() && name != "remoteGlobalIDString") { object->Object->PrintComment(out); } out << ";" << separator; } - else if(object->TypeValue == STRING) + break; + + case STRING: { - cmXCodeObject::PrintString(out,i->first); + cmXCodeObject::PrintString(out, name); out << " = "; object->PrintString(out); out << ";" << separator; } - else + break; + + default: { - out << "what is this?? " << i->first << "\n"; + break; } } - cmXCodeObject::Indent(2*indentFactor, out); - out << "};\n"; } //---------------------------------------------------------------------------- diff --git a/Source/cmXCodeObject.h b/Source/cmXCodeObject.h index bd0f43f..2d876da 100644 --- a/Source/cmXCodeObject.h +++ b/Source/cmXCodeObject.h @@ -75,6 +75,10 @@ public: } static void Indent(int level, std::ostream& out); void Print(std::ostream& out); + void PrintAttribute(std::ostream& out, const int level, + const std::string separator, const int factor, + const std::string& name, const cmXCodeObject* object, + const cmXCodeObject* parent); virtual void PrintComment(std::ostream&) {} static void PrintList(std::vector const&, ----------------------------------------------------------------------- Summary of changes: Source/cmXCodeObject.cxx | 126 +++++++++++++++++++++++----------------------- Source/cmXCodeObject.h | 4 ++ 2 files changed, 67 insertions(+), 63 deletions(-) hooks/post-receive -- CMake From kwrobot at kitware.com Mon Feb 22 00:01:06 2016 From: kwrobot at kitware.com (Kitware Robot) Date: Mon, 22 Feb 2016 00:01:06 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-109-gdf246f7 Message-ID: <20160222050106.8D61AE5934@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 df246f7c7f655f9ea6df0c64e131d2eb0cafd789 (commit) from 7e32bd945a9f32144ac63fdcd085197658229f9c (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=df246f7c7f655f9ea6df0c64e131d2eb0cafd789 commit df246f7c7f655f9ea6df0c64e131d2eb0cafd789 Author: Kitware Robot AuthorDate: Mon Feb 22 00:01:03 2016 -0500 Commit: Kitware Robot CommitDate: Mon Feb 22 00:01:03 2016 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 4628127..bd244ca 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 5) -set(CMake_VERSION_PATCH 20160221) +set(CMake_VERSION_PATCH 20160222) #set(CMake_VERSION_RC 1) ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From eike at sf-mail.de Mon Feb 22 02:08:25 2016 From: eike at sf-mail.de (Rolf Eike Beer) Date: Mon, 22 Feb 2016 02:08:25 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-241-g96e6af9 Message-ID: <20160222070826.6FD6BE5633@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, next has been updated via 96e6af9b42fe723992a877272d03e0a7b14f37cc (commit) via 046b2b4d4a42d4e5ebe0a7abc8651163065ed505 (commit) from cf1a414cfb2917588a6eff20cc8cdda4c98264d9 (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=96e6af9b42fe723992a877272d03e0a7b14f37cc commit 96e6af9b42fe723992a877272d03e0a7b14f37cc Merge: cf1a414 046b2b4 Author: Rolf Eike Beer AuthorDate: Mon Feb 22 02:08:22 2016 -0500 Commit: CMake Topic Stage CommitDate: Mon Feb 22 02:08:22 2016 -0500 Merge topic 'gnu-c-34' into next 046b2b4d Compiler Features: gcc can handle C99 since at least 3.4 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=046b2b4d4a42d4e5ebe0a7abc8651163065ed505 commit 046b2b4d4a42d4e5ebe0a7abc8651163065ed505 Author: Rolf Eike Beer AuthorDate: Sat Feb 20 13:59:34 2016 +0100 Commit: Rolf Eike Beer CommitDate: Sat Feb 20 13:59:34 2016 +0100 Compiler Features: gcc can handle C99 since at least 3.4 diff --git a/Help/release/dev/gnu-c-34.rst b/Help/release/dev/gnu-c-34.rst new file mode 100644 index 0000000..2fab592 --- /dev/null +++ b/Help/release/dev/gnu-c-34.rst @@ -0,0 +1,6 @@ +gnu-c-34 +-------------- + +* The :manual:`Compile Features ` functionality + is now aware that the GNU compilers can handle C99 since at least version + 3.4. diff --git a/Modules/Compiler/GNU-C-FeatureTests.cmake b/Modules/Compiler/GNU-C-FeatureTests.cmake index b3fe33f..0ab5265 100644 --- a/Modules/Compiler/GNU-C-FeatureTests.cmake +++ b/Modules/Compiler/GNU-C-FeatureTests.cmake @@ -1,5 +1,5 @@ -set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 404") +set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 304") # GNU 4.7 correctly sets __STDC_VERSION__ to 201112L, but GNU 4.6 sets it # to 201000L. As the former is strictly greater than the latter, test only @@ -8,10 +8,10 @@ set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 404") # to the distinction between __cplusplus and __GXX_EXPERIMENTAL_CXX0X__ tests. set(GNU46_C11 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 406 && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201000L") set(_cmake_feature_test_c_static_assert "${GNU46_C11}") -# Since 4.4 at least: -set(GNU44_C99 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 404 && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L") -set(_cmake_feature_test_c_restrict "${GNU44_C99}") -set(_cmake_feature_test_c_variadic_macros "${GNU44_C99}") +# Since 3.4 at least: +set(GNU34_C99 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 304 && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L") +set(_cmake_feature_test_c_restrict "${GNU34_C99}") +set(_cmake_feature_test_c_variadic_macros "${GNU34_C99}") set(GNU_C90 "${_cmake_oldestSupported}") set(_cmake_feature_test_c_function_prototypes "${GNU_C90}") diff --git a/Modules/Compiler/GNU-C.cmake b/Modules/Compiler/GNU-C.cmake index 2c478da..f76e07f 100644 --- a/Modules/Compiler/GNU-C.cmake +++ b/Modules/Compiler/GNU-C.cmake @@ -4,12 +4,12 @@ __compiler_gnu(C) if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.5) set(CMAKE_C90_STANDARD_COMPILE_OPTION "-std=c90") set(CMAKE_C90_EXTENSION_COMPILE_OPTION "-std=gnu90") -elseif (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4) +elseif (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4) set(CMAKE_C90_STANDARD_COMPILE_OPTION "-std=c89") set(CMAKE_C90_EXTENSION_COMPILE_OPTION "-std=gnu89") endif() -if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4) +if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4) set(CMAKE_C99_STANDARD_COMPILE_OPTION "-std=c99") set(CMAKE_C99_EXTENSION_COMPILE_OPTION "-std=gnu99") endif() @@ -22,7 +22,7 @@ elseif (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.6) set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-std=gnu1x") endif() -if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4) +if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4) if (NOT CMAKE_C_COMPILER_FORCED) if (NOT CMAKE_C_STANDARD_COMPUTED_DEFAULT) message(FATAL_ERROR "CMAKE_C_STANDARD_COMPUTED_DEFAULT should be set for ${CMAKE_C_COMPILER_ID} (${CMAKE_C_COMPILER}) version ${CMAKE_C_COMPILER_VERSION}") @@ -48,7 +48,7 @@ macro(cmake_record_c_compile_features) if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.6) _get_gcc_features(${CMAKE_C11_STANDARD_COMPILE_OPTION} CMAKE_C11_COMPILE_FEATURES) endif() - if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4) + if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4) if (_result EQUAL 0) _get_gcc_features(${CMAKE_C99_STANDARD_COMPILE_OPTION} CMAKE_C99_COMPILE_FEATURES) endif() ----------------------------------------------------------------------- Summary of changes: Help/release/dev/gnu-c-34.rst | 6 ++++++ Modules/Compiler/GNU-C-FeatureTests.cmake | 10 +++++----- Modules/Compiler/GNU-C.cmake | 8 ++++---- 3 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 Help/release/dev/gnu-c-34.rst hooks/post-receive -- CMake From brad.king at kitware.com Mon Feb 22 09:04:25 2016 From: brad.king at kitware.com (Brad King) Date: Mon, 22 Feb 2016 09:04:25 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-246-g564c9c7 Message-ID: <20160222140425.6CE0CE5B58@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, next has been updated via 564c9c7b888fdfb156ed5b71de6172a032720c81 (commit) via d010ba9fa71035f44e6df2fdf86bf38ab8559df5 (commit) via a132064b4821ee21c45717b459351ac4ffe4d372 (commit) via df246f7c7f655f9ea6df0c64e131d2eb0cafd789 (commit) from 96e6af9b42fe723992a877272d03e0a7b14f37cc (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=564c9c7b888fdfb156ed5b71de6172a032720c81 commit 564c9c7b888fdfb156ed5b71de6172a032720c81 Merge: 96e6af9 d010ba9 Author: Brad King AuthorDate: Mon Feb 22 09:04:24 2016 -0500 Commit: CMake Topic Stage CommitDate: Mon Feb 22 09:04:24 2016 -0500 Merge topic 'update-kwsys' into next d010ba9f Merge branch 'upstream-KWSys' into update-kwsys a132064b KWSys 2016-02-22 (4847aedd) df246f7c CMake Nightly Date Stamp https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d010ba9fa71035f44e6df2fdf86bf38ab8559df5 commit d010ba9fa71035f44e6df2fdf86bf38ab8559df5 Merge: df246f7 a132064 Author: Brad King AuthorDate: Mon Feb 22 09:03:40 2016 -0500 Commit: Brad King CommitDate: Mon Feb 22 09:03:40 2016 -0500 Merge branch 'upstream-KWSys' into update-kwsys * upstream-KWSys: KWSys 2016-02-22 (4847aedd) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a132064b4821ee21c45717b459351ac4ffe4d372 commit a132064b4821ee21c45717b459351ac4ffe4d372 Author: KWSys Upstream AuthorDate: Mon Feb 22 08:56:45 2016 -0500 Commit: Brad King CommitDate: Mon Feb 22 09:02:03 2016 -0500 KWSys 2016-02-22 (4847aedd) Code extracted from: http://public.kitware.com/KWSys.git at commit 4847aedde22b0026accbb71e5480ed353a330e02 (master). Upstream Shortlog ----------------- Ben Boeckel (1): de83c4d4 SystemTools: support deleting junction points Chuck Atkins (1): 3e1b7395 SystemInformation: Ignore buffers and cache when reporting host memory use Costy Petrisor (1): 9fe15333 Update hidden includes to support CMake header dependency scanning Zack Galbreath (1): 4847aedd Process: Allow timeout to be changed after child starts diff --git a/CommandLineArguments.cxx b/CommandLineArguments.cxx index 3636836..f713294 100644 --- a/CommandLineArguments.cxx +++ b/CommandLineArguments.cxx @@ -20,6 +20,7 @@ #if 0 # include "CommandLineArguments.hxx.in" # include "Configure.hxx.in" +# include "String.hxx.in" #endif #include diff --git a/ProcessUNIX.c b/ProcessUNIX.c index 07c644b..7402955 100644 --- a/ProcessUNIX.c +++ b/ProcessUNIX.c @@ -505,6 +505,8 @@ void kwsysProcess_SetTimeout(kwsysProcess* cp, double timeout) { cp->Timeout = 0; } + // Force recomputation of TimeoutTime. + cp->TimeoutTime.tv_sec = -1; } /*--------------------------------------------------------------------------*/ diff --git a/ProcessWin32.c b/ProcessWin32.c index 1f8749f..a18ea27 100644 --- a/ProcessWin32.c +++ b/ProcessWin32.c @@ -17,7 +17,7 @@ duplicate the above list of headers. */ #if 0 # include "Process.h.in" -# include "Encoding_c.h.in" +# include "Encoding.h.in" #endif /* @@ -698,6 +698,8 @@ void kwsysProcess_SetTimeout(kwsysProcess* cp, double timeout) { cp->Timeout = 0; } + // Force recomputation of TimeoutTime. + cp->TimeoutTime.QuadPart = -1; } /*--------------------------------------------------------------------------*/ diff --git a/SystemInformation.cxx b/SystemInformation.cxx index cddcc8d..127a048 100644 --- a/SystemInformation.cxx +++ b/SystemInformation.cxx @@ -43,7 +43,6 @@ #if 0 # include "SystemInformation.hxx.in" # include "Process.h.in" -# include "Configure.hxx.in" #endif #include @@ -3570,33 +3569,44 @@ SystemInformationImplementation::GetHostMemoryUsed() return (statex.ullTotalPhys - statex.ullAvailPhys)/1024; # endif #elif defined(__linux) - const char *names[3]={"MemTotal:","MemFree:",NULL}; - SystemInformation::LongLong values[2]={SystemInformation::LongLong(0)}; - int ierr=GetFieldsFromFile("/proc/meminfo",names,values); + // First try to use MemAvailable, but it only works on newer kernels + const char *names2[3]={"MemTotal:","MemAvailable:",NULL}; + SystemInformation::LongLong values2[2]={SystemInformation::LongLong(0)}; + int ierr=GetFieldsFromFile("/proc/meminfo",names2,values2); if (ierr) { - return ierr; - } - SystemInformation::LongLong &memTotal=values[0]; - SystemInformation::LongLong &memFree=values[1]; - return memTotal - memFree; + const char *names4[5]={"MemTotal:","MemFree:","Buffers:","Cached:",NULL}; + SystemInformation::LongLong values4[4]={SystemInformation::LongLong(0)}; + ierr=GetFieldsFromFile("/proc/meminfo",names4,values4); + if(ierr) + { + return ierr; + } + SystemInformation::LongLong &memTotal=values4[0]; + SystemInformation::LongLong &memFree=values4[1]; + SystemInformation::LongLong &memBuffers=values4[2]; + SystemInformation::LongLong &memCached=values4[3]; + return memTotal - memFree - memBuffers - memCached; + } + SystemInformation::LongLong &memTotal=values2[0]; + SystemInformation::LongLong &memAvail=values2[1]; + return memTotal - memAvail; #elif defined(__APPLE__) SystemInformation::LongLong psz=getpagesize(); if (psz<1) { return -1; } - const char *names[4]={"Pages active:","Pages inactive:","Pages wired down:",NULL}; - SystemInformation::LongLong values[3]={SystemInformation::LongLong(0)}; + const char *names[3]={"Pages wired down:","Pages active:",NULL}; + SystemInformation::LongLong values[2]={SystemInformation::LongLong(0)}; int ierr=GetFieldsFromCommand("vm_stat", names, values); if (ierr) { return -1; } - SystemInformation::LongLong &vmActive=values[0]; - SystemInformation::LongLong &vmInactive=values[1]; - SystemInformation::LongLong &vmWired=values[2]; - return ((vmActive+vmInactive+vmWired)*psz)/1024; + SystemInformation::LongLong &vmWired=values[0]; + SystemInformation::LongLong &vmActive=values[1]; + return ((vmActive+vmWired)*psz)/1024; #else return 0; #endif diff --git a/SystemTools.cxx b/SystemTools.cxx index e3428f8..544a638 100644 --- a/SystemTools.cxx +++ b/SystemTools.cxx @@ -35,10 +35,12 @@ #include #include #include +#include // Work-around CMake dependency scanning limitation. This must // duplicate the above list of headers. #if 0 +# include "RegularExpression.hxx.in" # include "SystemTools.hxx.in" # include "Directory.hxx.in" # include "FStream.hxx.in" @@ -87,6 +89,7 @@ // Windows API. #if defined(_WIN32) # include +# include # ifndef INVALID_FILE_ATTRIBUTES # define INVALID_FILE_ATTRIBUTES ((DWORD)-1) # endif @@ -2754,6 +2757,106 @@ std::string SystemTools::GetLastSystemError() return strerror(e); } +#ifdef _WIN32 + +static bool IsJunction(const std::wstring& source) +{ +#ifdef FSCTL_GET_REPARSE_POINT + const DWORD JUNCTION_ATTRS = FILE_ATTRIBUTE_DIRECTORY | + FILE_ATTRIBUTE_REPARSE_POINT; + DWORD attrs = GetFileAttributesW(source.c_str()); + if (attrs == INVALID_FILE_ATTRIBUTES) + { + return false; + } + if ((attrs & JUNCTION_ATTRS) != JUNCTION_ATTRS) + { + return false; + } + + // Adjust privileges so that we can succefully open junction points. + HANDLE token; + TOKEN_PRIVILEGES privs; + OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &token); + LookupPrivilegeValue(NULL, SE_BACKUP_NAME, &privs.Privileges[0].Luid); + privs.PrivilegeCount = 1; + privs.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; + AdjustTokenPrivileges(token, FALSE, &privs, sizeof(TOKEN_PRIVILEGES), NULL, NULL); + CloseHandle(token); + + HANDLE dir = CreateFileW(source.c_str(), GENERIC_READ, + 0, NULL, OPEN_EXISTING, + FILE_FLAG_OPEN_REPARSE_POINT | FILE_FLAG_BACKUP_SEMANTICS, NULL); + if (dir == INVALID_HANDLE_VALUE) + { + return false; + } + + // Query whether this is a reparse point or not. + BYTE buffer[MAXIMUM_REPARSE_DATA_BUFFER_SIZE]; + REPARSE_GUID_DATA_BUFFER *reparse_buffer = + (REPARSE_GUID_DATA_BUFFER*) buffer; + DWORD sentinel; + + BOOL success = DeviceIoControl( + dir, FSCTL_GET_REPARSE_POINT, + NULL, 0, + reparse_buffer, MAXIMUM_REPARSE_DATA_BUFFER_SIZE, + &sentinel, NULL); + + CloseHandle(dir); + + return (success && (reparse_buffer->ReparseTag == IO_REPARSE_TAG_MOUNT_POINT)); +#else + return false; +#endif +} + +static bool DeleteJunction(const std::wstring& source) +{ +#ifdef FSCTL_DELETE_REPARSE_POINT + // Adjust privileges so that we can succefully open junction points as + // read/write. + HANDLE token; + TOKEN_PRIVILEGES privs; + OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &token); + LookupPrivilegeValue(NULL, SE_RESTORE_NAME, &privs.Privileges[0].Luid); + privs.PrivilegeCount = 1; + privs.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; + AdjustTokenPrivileges(token, FALSE, &privs, sizeof(TOKEN_PRIVILEGES), NULL, NULL); + CloseHandle(token); + + HANDLE dir = CreateFileW(source.c_str(), GENERIC_READ | GENERIC_WRITE, + 0, NULL, OPEN_EXISTING, + FILE_FLAG_OPEN_REPARSE_POINT | FILE_FLAG_BACKUP_SEMANTICS, NULL); + if (dir == INVALID_HANDLE_VALUE) + { + return false; + } + + // Set up the structure so that we can delete the junction. + std::vector buffer(REPARSE_GUID_DATA_BUFFER_HEADER_SIZE, 0); + REPARSE_GUID_DATA_BUFFER *reparse_buffer = + (REPARSE_GUID_DATA_BUFFER*) &buffer[0]; + DWORD sentinel; + + reparse_buffer->ReparseTag = IO_REPARSE_TAG_MOUNT_POINT; + + BOOL success = DeviceIoControl( + dir, FSCTL_DELETE_REPARSE_POINT, + reparse_buffer, REPARSE_GUID_DATA_BUFFER_HEADER_SIZE, + NULL, 0, + &sentinel, NULL); + + CloseHandle(dir); + + return !!success; +#else + return false; +#endif +} +#endif + bool SystemTools::RemoveFile(const std::string& source) { #ifdef _WIN32 @@ -2781,6 +2884,10 @@ bool SystemTools::RemoveFile(const std::string& source) SetLastError(err); return false; } + if (IsJunction(ws) && !DeleteJunction(ws)) + { + return false; + } if (DeleteFileW(ws.c_str()) || GetLastError() == ERROR_FILE_NOT_FOUND || GetLastError() == ERROR_PATH_NOT_FOUND) diff --git a/testHashSTL.cxx b/testHashSTL.cxx index ab1f83e..ae66ceb 100644 --- a/testHashSTL.cxx +++ b/testHashSTL.cxx @@ -18,7 +18,6 @@ #if 0 # include "hash_map.hxx.in" # include "hash_set.hxx.in" -# include "hashtable.hxx.in" #endif #include diff --git a/testIOS.cxx b/testIOS.cxx index 396a09d..5ff7955 100644 --- a/testIOS.cxx +++ b/testIOS.cxx @@ -18,6 +18,12 @@ #include #include /* strlen */ +// Work-around CMake dependency scanning limitation. This must +// duplicate the above list of headers. +#if 0 +# include "Configure.hxx.in" +#endif + int testIOS(int, char*[]) { std::ostringstream ostr; ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- Source/kwsys/CommandLineArguments.cxx | 1 + Source/kwsys/ProcessUNIX.c | 2 + Source/kwsys/ProcessWin32.c | 4 +- Source/kwsys/SystemInformation.cxx | 40 +++++++----- Source/kwsys/SystemTools.cxx | 107 +++++++++++++++++++++++++++++++++ Source/kwsys/testHashSTL.cxx | 1 - Source/kwsys/testIOS.cxx | 6 ++ 8 files changed, 145 insertions(+), 18 deletions(-) hooks/post-receive -- CMake From kwrobot at kitware.com Tue Feb 23 00:01:07 2016 From: kwrobot at kitware.com (Kitware Robot) Date: Tue, 23 Feb 2016 00:01:07 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-110-gf389e6d Message-ID: <20160223050107.D73A2E5C34@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 f389e6d6e2f6e55327b36c944f960bce80230f9e (commit) from df246f7c7f655f9ea6df0c64e131d2eb0cafd789 (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=f389e6d6e2f6e55327b36c944f960bce80230f9e commit f389e6d6e2f6e55327b36c944f960bce80230f9e Author: Kitware Robot AuthorDate: Tue Feb 23 00:01:05 2016 -0500 Commit: Kitware Robot CommitDate: Tue Feb 23 00:01:05 2016 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index bd244ca..ba308b9 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 5) -set(CMake_VERSION_PATCH 20160222) +set(CMake_VERSION_PATCH 20160223) #set(CMake_VERSION_RC 1) ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From neundorf at kde.org Tue Feb 23 16:45:29 2016 From: neundorf at kde.org (Alexander Neundorf) Date: Tue, 23 Feb 2016 16:45:29 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-248-g4cbf56e Message-ID: <20160223214529.49816E59A6@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, next has been updated via 4cbf56e98c7c3ad3365350bd7ef9314263bb8862 (commit) via 84ccd4f7461ac2c2ee471a4d77f3e184c676c276 (commit) from 564c9c7b888fdfb156ed5b71de6172a032720c81 (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=4cbf56e98c7c3ad3365350bd7ef9314263bb8862 commit 4cbf56e98c7c3ad3365350bd7ef9314263bb8862 Merge: 564c9c7 84ccd4f Author: Alexander Neundorf AuthorDate: Tue Feb 23 16:45:28 2016 -0500 Commit: CMake Topic Stage CommitDate: Tue Feb 23 16:45:28 2016 -0500 Merge topic 'CodeBlocksParallelFlag' into next 84ccd4f7 CodeBlocks: generate parallel project files (make -j) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=84ccd4f7461ac2c2ee471a4d77f3e184c676c276 commit 84ccd4f7461ac2c2ee471a4d77f3e184c676c276 Author: Alex Neundorf AuthorDate: Tue Feb 23 22:37:44 2016 +0100 Commit: Alex Neundorf CommitDate: Tue Feb 23 22:37:44 2016 +0100 CodeBlocks: generate parallel project files (make -j) This is done the same way as for Eclipse: cmake tries to determine the number of CPUs, and then adds the respective -jN to the make invocations in the project file. Alex diff --git a/Modules/CMakeFindCodeBlocks.cmake b/Modules/CMakeFindCodeBlocks.cmake index f8d8d59..bf85ea0 100644 --- a/Modules/CMakeFindCodeBlocks.cmake +++ b/Modules/CMakeFindCodeBlocks.cmake @@ -23,3 +23,18 @@ endif() # Determine builtin macros and include dirs: include(${CMAKE_CURRENT_LIST_DIR}/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake) + +# Try to find out how many CPUs we have and set the -j argument for make accordingly +set(_CMAKE_CODEBLOCKS_INITIAL_MAKE_ARGS "") + +include(ProcessorCount) +processorcount(_CMAKE_CODEBLOCKS_PROCESSOR_COUNT) + +# Only set -j if we are under UNIX and if the make-tool used actually has "make" in the name +# (we may also get here in the future e.g. for ninja) +if("${_CMAKE_CODEBLOCKS_PROCESSOR_COUNT}" GREATER 1 AND CMAKE_HOST_UNIX AND "${CMAKE_MAKE_PROGRAM}" MATCHES make) + set(_CMAKE_CODEBLOCKS_INITIAL_MAKE_ARGS "-j${_CMAKE_CODEBLOCKS_PROCESSOR_COUNT}") +endif() + +# This variable is used by the CodeBlocks generator and appended to the make invocation commands. +set(CMAKE_CODEBLOCKS_MAKE_ARGUMENTS "${_CMAKE_CODEBLOCKS_INITIAL_MAKE_ARGS}" CACHE STRING "Additional command line arguments when CodeBlocks invokes make. Enter e.g. -j to get parallel builds") diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx index 9348ef2..19f99ba 100644 --- a/Source/cmExtraCodeBlocksGenerator.cxx +++ b/Source/cmExtraCodeBlocksGenerator.cxx @@ -300,6 +300,8 @@ void cmExtraCodeBlocksGenerator // figure out the compiler std::string compiler = this->GetCBCompilerId(mf); std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM"); + const std::string makeArgs = mf->GetSafeDefinition( + "CMAKE_CODEBLOCKS_MAKE_ARGUMENTS"); fout<<"\n" "\n" @@ -311,7 +313,8 @@ void cmExtraCodeBlocksGenerator " "<\n"; - this->AppendTarget(fout, "all", 0, make.c_str(), lgs[0], compiler.c_str()); + this->AppendTarget(fout, "all", 0, make.c_str(), lgs[0], compiler.c_str(), + makeArgs); // add all executable and library targets and some of the GLOBAL // and UTILITY targets @@ -333,7 +336,8 @@ void cmExtraCodeBlocksGenerator (*lg)->GetBinaryDirectory())==0) { this->AppendTarget(fout, targetName, 0, - make.c_str(), *lg, compiler.c_str()); + make.c_str(), *lg, compiler.c_str(), + makeArgs); } } break; @@ -350,7 +354,7 @@ void cmExtraCodeBlocksGenerator } this->AppendTarget(fout, targetName, 0, - make.c_str(), *lg, compiler.c_str()); + make.c_str(), *lg, compiler.c_str(),makeArgs); break; case cmState::EXECUTABLE: case cmState::STATIC_LIBRARY: @@ -360,11 +364,11 @@ void cmExtraCodeBlocksGenerator { cmGeneratorTarget* gt = *ti; this->AppendTarget(fout, targetName, gt, - make.c_str(), *lg, compiler.c_str()); + make.c_str(), *lg, compiler.c_str(), makeArgs); std::string fastTarget = targetName; fastTarget += "/fast"; this->AppendTarget(fout, fastTarget, gt, - make.c_str(), *lg, compiler.c_str()); + make.c_str(), *lg, compiler.c_str(), makeArgs); } break; default: @@ -555,7 +559,8 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout, cmGeneratorTarget* target, const char* make, const cmLocalGenerator* lg, - const char* compiler) + const char* compiler, + const std::string& makeFlags) { cmMakefile const* makefile = lg->GetMakefile(); std::string makefileName = lg->GetCurrentBinaryDirectory(); @@ -663,16 +668,18 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout, fout<<" \n" " BuildMakeCommand(make, makefileName.c_str(), targetName) + << this->BuildMakeCommand(make, makefileName.c_str(), targetName, + makeFlags) << "\" />\n" " BuildMakeCommand(make, makefileName.c_str(),""$file"") + << this->BuildMakeCommand(make, makefileName.c_str(),""$file"", + makeFlags) << "\" />\n" " BuildMakeCommand(make, makefileName.c_str(), "clean") + << this->BuildMakeCommand(make, makefileName.c_str(), "clean", makeFlags) << "\" />\n" " BuildMakeCommand(make, makefileName.c_str(), "clean") + << this->BuildMakeCommand(make, makefileName.c_str(), "clean", makeFlags) << "\" />\n" " \n" " \n"; @@ -753,9 +760,15 @@ int cmExtraCodeBlocksGenerator::GetCBTargetType(cmGeneratorTarget* target) // make std::string cmExtraCodeBlocksGenerator::BuildMakeCommand( const std::string& make, const char* makefile, - const std::string& target) + const std::string& target, const std::string& makeFlags) { std::string command = make; + if (makeFlags.size() > 0) + { + command += " "; + command += makeFlags; + } + std::string generator = this->GlobalGenerator->GetName(); if (generator == "NMake Makefiles") { diff --git a/Source/cmExtraCodeBlocksGenerator.h b/Source/cmExtraCodeBlocksGenerator.h index 0c3846d..4abfa7e 100644 --- a/Source/cmExtraCodeBlocksGenerator.h +++ b/Source/cmExtraCodeBlocksGenerator.h @@ -54,13 +54,16 @@ private: std::string GetCBCompilerId(const cmMakefile* mf); int GetCBTargetType(cmGeneratorTarget* target); std::string BuildMakeCommand(const std::string& make, const char* makefile, - const std::string& target); + const std::string& target, + const std::string& makeFlags); void AppendTarget(cmGeneratedFileStream& fout, const std::string& targetName, cmGeneratorTarget* target, const char* make, const cmLocalGenerator* lg, - const char* compiler); + const char* compiler, + const std::string& makeFlags + ); }; ----------------------------------------------------------------------- Summary of changes: Modules/CMakeFindCodeBlocks.cmake | 15 ++++++++++++++ Source/cmExtraCodeBlocksGenerator.cxx | 35 ++++++++++++++++++++++----------- Source/cmExtraCodeBlocksGenerator.h | 7 +++++-- 3 files changed, 44 insertions(+), 13 deletions(-) hooks/post-receive -- CMake From kwrobot at kitware.com Wed Feb 24 00:01:07 2016 From: kwrobot at kitware.com (Kitware Robot) Date: Wed, 24 Feb 2016 00:01:07 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-111-g3dd42fe Message-ID: <20160224050107.93981E5D17@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 3dd42fe4eb600339222c42ed440b37a3d76128d6 (commit) from f389e6d6e2f6e55327b36c944f960bce80230f9e (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=3dd42fe4eb600339222c42ed440b37a3d76128d6 commit 3dd42fe4eb600339222c42ed440b37a3d76128d6 Author: Kitware Robot AuthorDate: Wed Feb 24 00:01:05 2016 -0500 Commit: Kitware Robot CommitDate: Wed Feb 24 00:01:05 2016 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index ba308b9..b983213 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 5) -set(CMake_VERSION_PATCH 20160223) +set(CMake_VERSION_PATCH 20160224) #set(CMake_VERSION_RC 1) ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 24 09:36:34 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 24 Feb 2016 09:36:34 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-250-g5e2bead Message-ID: <20160224143634.440D5E603D@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, next has been updated via 5e2bead5a6cbffca6a3f50d1b52928f03981fb0a (commit) via 572797f9843a76a101e2092c6ba31b5453bd23c6 (commit) from 4cbf56e98c7c3ad3365350bd7ef9314263bb8862 (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=5e2bead5a6cbffca6a3f50d1b52928f03981fb0a commit 5e2bead5a6cbffca6a3f50d1b52928f03981fb0a Merge: 4cbf56e 572797f Author: Brad King AuthorDate: Wed Feb 24 09:36:33 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 24 09:36:33 2016 -0500 Merge topic 'xcode-remove-reftype' into next 572797f9 Xcode: Write refType only for Xcode 1.5 https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=572797f9843a76a101e2092c6ba31b5453bd23c6 commit 572797f9843a76a101e2092c6ba31b5453bd23c6 Author: Gregor Jasny AuthorDate: Mon Feb 8 19:39:05 2016 +0100 Commit: Brad King CommitDate: Wed Feb 24 09:35:54 2016 -0500 Xcode: Write refType only for Xcode 1.5 This field is not expected by newer versions. diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 526e32f..ef18729 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -2805,7 +2805,10 @@ cmGlobalXCodeGenerator::CreateXCodeTarget(cmGeneratorTarget* gtgt, fullName = gtgt->GetFullName(defConfig.c_str()); } fileRef->AddAttribute("path", this->CreateString(fullName.c_str())); - fileRef->AddAttribute("refType", this->CreateString("0")); + if(this->XcodeVersion == 15) + { + fileRef->AddAttribute("refType", this->CreateString("0")); + } fileRef->AddAttribute("sourceTree", this->CreateString("BUILT_PRODUCTS_DIR")); fileRef->SetComment(gtgt->GetName().c_str()); ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 24 09:37:40 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 24 Feb 2016 09:37:40 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-252-g0dbba1b Message-ID: <20160224143740.0C989E6051@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, next has been updated via 0dbba1b76c169f6acfde771843959aa423142e81 (commit) via b860a92582e64e7051ce03fe5b694450d554bb3f (commit) from 5e2bead5a6cbffca6a3f50d1b52928f03981fb0a (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=0dbba1b76c169f6acfde771843959aa423142e81 commit 0dbba1b76c169f6acfde771843959aa423142e81 Merge: 5e2bead b860a92 Author: Brad King AuthorDate: Wed Feb 24 09:37:39 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 24 09:37:39 2016 -0500 Merge topic 'xcode-refactor-xcodeobject' into next b860a925 Xcode: Refactor block writes to allow any level of nesting https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b860a92582e64e7051ce03fe5b694450d554bb3f commit b860a92582e64e7051ce03fe5b694450d554bb3f Author: Robert Goulet AuthorDate: Fri Feb 19 14:00:19 2016 -0500 Commit: Brad King CommitDate: Wed Feb 24 09:36:54 2016 -0500 Xcode: Refactor block writes to allow any level of nesting Reviewed-by: Gregor Jasny diff --git a/Source/cmXCodeObject.cxx b/Source/cmXCodeObject.cxx index 5bc34c1..911e154 100644 --- a/Source/cmXCodeObject.cxx +++ b/Source/cmXCodeObject.cxx @@ -111,102 +111,102 @@ void cmXCodeObject::Print(std::ostream& out) for(i = this->ObjectAttributes.begin(); i != this->ObjectAttributes.end(); ++i) { - cmXCodeObject* object = i->second; - if(i->first != "isa") - { - cmXCodeObject::Indent(3*indentFactor, out); - } - else - { + if(i->first == "isa") continue; - } - if(object->TypeValue == OBJECT_LIST) - { - out << i->first << " = (" << separator; - for(unsigned int k = 0; k < i->second->List.size(); k++) - { - cmXCodeObject::Indent(4*indentFactor, out); - out << i->second->List[k]->Id; - i->second->List[k]->PrintComment(out); - out << "," << separator; - } - cmXCodeObject::Indent(3*indentFactor, out); - out << ");" << separator; - } - else if(object->TypeValue == ATTRIBUTE_GROUP) + + PrintAttribute(out, 3, separator, indentFactor, i->first, i->second, this); + } + cmXCodeObject::Indent(2*indentFactor, out); + out << "};\n"; +} + +void cmXCodeObject::PrintAttribute(std::ostream& out, const int level, + const std::string separator, + const int factor, const std::string& name, + const cmXCodeObject* object, + const cmXCodeObject* parent) +{ + cmXCodeObject::Indent(level * factor, out); + switch(object->TypeValue) + { + case OBJECT_LIST: { - std::map::iterator j; - out << i->first << " = {"; - if(separator == "\n") + out << name << " = ("; + if(parent->TypeValue != ATTRIBUTE_GROUP) { out << separator; } - for(j = object->ObjectAttributes.begin(); j != - object->ObjectAttributes.end(); ++j) + for(unsigned int i = 0; i < object->List.size(); ++i) { - cmXCodeObject::Indent(4 *indentFactor, out); - - if(j->second->TypeValue == STRING) - { - cmXCodeObject::PrintString(out,j->first); - out << " = "; - j->second->PrintString(out); - out << ";"; - } - else if(j->second->TypeValue == OBJECT_LIST) + if(object->List[i]->TypeValue == STRING) { - cmXCodeObject::PrintString(out,j->first); - out << " = ("; - for(unsigned int k = 0; k < j->second->List.size(); k++) + object->List[i]->PrintString(out); + if(i+1 < object->List.size()) { - if(j->second->List[k]->TypeValue == STRING) - { - j->second->List[k]->PrintString(out); - out << ", "; - } - else - { - out << "List_" << k << "_TypeValue_IS_NOT_STRING, "; - } + out << ","; } - out << ");"; } else { - cmXCodeObject::PrintString(out,j->first); - out << " = error_unexpected_TypeValue_" << - j->second->TypeValue << ";"; + cmXCodeObject::Indent((level + 1) * factor, out); + out << object->List[i]->Id; + object->List[i]->PrintComment(out); + out << "," << separator; } + } + if(parent->TypeValue != ATTRIBUTE_GROUP) + { + cmXCodeObject::Indent(level * factor, out); + } + out << ");" << separator; + } + break; + case ATTRIBUTE_GROUP: + { + out << name << " = {"; + if(separator == "\n") + { out << separator; } - cmXCodeObject::Indent(3 *indentFactor, out); + std::map::const_iterator i; + for(i = object->ObjectAttributes.begin(); + i != object->ObjectAttributes.end(); ++i) + { + PrintAttribute(out, (level + 1) * factor, separator, factor, + i->first, i->second, object); + } + cmXCodeObject::Indent(level * factor, out); out << "};" << separator; } - else if(object->TypeValue == OBJECT_REF) + break; + + case OBJECT_REF: { - cmXCodeObject::PrintString(out,i->first); + cmXCodeObject::PrintString(out, name); out << " = " << object->Object->Id; - if(object->Object->HasComment() && i->first != "remoteGlobalIDString") + if(object->Object->HasComment() && name != "remoteGlobalIDString") { object->Object->PrintComment(out); } out << ";" << separator; } - else if(object->TypeValue == STRING) + break; + + case STRING: { - cmXCodeObject::PrintString(out,i->first); + cmXCodeObject::PrintString(out, name); out << " = "; object->PrintString(out); out << ";" << separator; } - else + break; + + default: { - out << "what is this?? " << i->first << "\n"; + break; } } - cmXCodeObject::Indent(2*indentFactor, out); - out << "};\n"; } //---------------------------------------------------------------------------- diff --git a/Source/cmXCodeObject.h b/Source/cmXCodeObject.h index bd0f43f..2d876da 100644 --- a/Source/cmXCodeObject.h +++ b/Source/cmXCodeObject.h @@ -75,6 +75,10 @@ public: } static void Indent(int level, std::ostream& out); void Print(std::ostream& out); + void PrintAttribute(std::ostream& out, const int level, + const std::string separator, const int factor, + const std::string& name, const cmXCodeObject* object, + const cmXCodeObject* parent); virtual void PrintComment(std::ostream&) {} static void PrintList(std::vector const&, ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 24 09:39:10 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 24 Feb 2016 09:39:10 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-113-gbe98577 Message-ID: <20160224143910.20F5DBB579@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 be98577f13299456804f619f46dc5a0560bcb176 (commit) via 091b649e198bade6fba7518b6c970bfa23b7365f (commit) from 3dd42fe4eb600339222c42ed440b37a3d76128d6 (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=be98577f13299456804f619f46dc5a0560bcb176 commit be98577f13299456804f619f46dc5a0560bcb176 Merge: 3dd42fe 091b649 Author: Brad King AuthorDate: Wed Feb 24 09:39:08 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 24 09:39:08 2016 -0500 Merge topic 'revert-automoc-src-per-dir' 091b649e Revert "Automoc: Fix support of files with the same name (#12873)" ----------------------------------------------------------------------- Summary of changes: Source/cmQtAutoGenerators.cxx | 35 +++-------------------------------- Tests/QtAutogen/Adir/CMakeLists.txt | 2 +- Tests/QtAutogen/Adir/bar/foo.cpp | 4 ---- Tests/QtAutogen/Adir/bar/foo.h | 10 ---------- Tests/QtAutogen/Adir/foo.cpp | 4 ---- Tests/QtAutogen/Adir/foo.h | 8 -------- 6 files changed, 4 insertions(+), 59 deletions(-) delete mode 100644 Tests/QtAutogen/Adir/bar/foo.cpp delete mode 100644 Tests/QtAutogen/Adir/bar/foo.h delete mode 100644 Tests/QtAutogen/Adir/foo.cpp delete mode 100644 Tests/QtAutogen/Adir/foo.h hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 24 09:39:12 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 24 Feb 2016 09:39:12 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-115-g6f00fc5 Message-ID: <20160224143912.85B91BBEA3@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 6f00fc58ed7f7cb3775bf77192ecde154884aa30 (commit) via c05678ad2873bc0ee9070c9eab181242c3e115a0 (commit) from be98577f13299456804f619f46dc5a0560bcb176 (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=6f00fc58ed7f7cb3775bf77192ecde154884aa30 commit 6f00fc58ed7f7cb3775bf77192ecde154884aa30 Merge: be98577 c05678a Author: Brad King AuthorDate: Wed Feb 24 09:39:10 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 24 09:39:10 2016 -0500 Merge topic 'test-FindPackageModeMakefileTest-optionally' c05678ad Tests: Add option to disable FindPackageModeMakefileTest ----------------------------------------------------------------------- Summary of changes: Tests/FindPackageModeMakefileTest/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 24 09:39:14 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 24 Feb 2016 09:39:14 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-117-g8f8418c Message-ID: <20160224143914.EB710BE899@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 8f8418c68b92a05f0d030e36dd714dabc218b6b8 (commit) via d8cba5368bd58c6113abd8617fe264579e97b48a (commit) from 6f00fc58ed7f7cb3775bf77192ecde154884aa30 (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=8f8418c68b92a05f0d030e36dd714dabc218b6b8 commit 8f8418c68b92a05f0d030e36dd714dabc218b6b8 Merge: 6f00fc5 d8cba53 Author: Brad King AuthorDate: Wed Feb 24 09:39:13 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 24 09:39:13 2016 -0500 Merge topic 'test-XCTest-sdkroot' d8cba536 Tests: Fix XCTest when ENV{SDKROOT} is set ----------------------------------------------------------------------- Summary of changes: Tests/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 24 09:39:17 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 24 Feb 2016 09:39:17 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-119-g3cff48b Message-ID: <20160224143917.67B67DF70B@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 3cff48b1bbb37c9a48cae49ddea6effdb11bde73 (commit) via b347503028a639103f27fcd2752b133993bb30ec (commit) from 8f8418c68b92a05f0d030e36dd714dabc218b6b8 (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=3cff48b1bbb37c9a48cae49ddea6effdb11bde73 commit 3cff48b1bbb37c9a48cae49ddea6effdb11bde73 Merge: 8f8418c b347503 Author: Brad King AuthorDate: Wed Feb 24 09:39:15 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 24 09:39:15 2016 -0500 Merge topic 'doc-cmake-E-details' b3475030 Help: Clarify `cmake -E` command behavior with respect to file existence ----------------------------------------------------------------------- Summary of changes: Help/manual/cmake.1.rst | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 24 09:39:19 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 24 Feb 2016 09:39:19 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-123-g0f48312 Message-ID: <20160224143919.D3D75DFCDE@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 0f48312386d77b6e95bd23ced8d7ff2a51928738 (commit) via d010ba9fa71035f44e6df2fdf86bf38ab8559df5 (commit) via a132064b4821ee21c45717b459351ac4ffe4d372 (commit) from 3cff48b1bbb37c9a48cae49ddea6effdb11bde73 (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=0f48312386d77b6e95bd23ced8d7ff2a51928738 commit 0f48312386d77b6e95bd23ced8d7ff2a51928738 Merge: 3cff48b d010ba9 Author: Brad King AuthorDate: Wed Feb 24 09:39:18 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 24 09:39:18 2016 -0500 Merge topic 'update-kwsys' d010ba9f Merge branch 'upstream-KWSys' into update-kwsys a132064b KWSys 2016-02-22 (4847aedd) ----------------------------------------------------------------------- Summary of changes: Source/kwsys/CommandLineArguments.cxx | 1 + Source/kwsys/ProcessUNIX.c | 2 + Source/kwsys/ProcessWin32.c | 4 +- Source/kwsys/SystemInformation.cxx | 40 +++++++----- Source/kwsys/SystemTools.cxx | 107 +++++++++++++++++++++++++++++++++ Source/kwsys/testHashSTL.cxx | 1 - Source/kwsys/testIOS.cxx | 6 ++ 7 files changed, 144 insertions(+), 17 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 24 09:39:22 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 24 Feb 2016 09:39:22 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-125-g2186cff Message-ID: <20160224143922.38AC0E0723@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 2186cff370c4ce775a670c9294b77a325e331fd8 (commit) via 572797f9843a76a101e2092c6ba31b5453bd23c6 (commit) from 0f48312386d77b6e95bd23ced8d7ff2a51928738 (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=2186cff370c4ce775a670c9294b77a325e331fd8 commit 2186cff370c4ce775a670c9294b77a325e331fd8 Merge: 0f48312 572797f Author: Brad King AuthorDate: Wed Feb 24 09:39:20 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 24 09:39:20 2016 -0500 Merge topic 'xcode-remove-reftype' 572797f9 Xcode: Write refType only for Xcode 1.5 ----------------------------------------------------------------------- Summary of changes: Source/cmGlobalXCodeGenerator.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 24 09:39:24 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 24 Feb 2016 09:39:24 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-127-g99895f8 Message-ID: <20160224143924.8BC41E0723@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 99895f85b3d9ee9c3a016a93c6603b6e89e7c121 (commit) via b860a92582e64e7051ce03fe5b694450d554bb3f (commit) from 2186cff370c4ce775a670c9294b77a325e331fd8 (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=99895f85b3d9ee9c3a016a93c6603b6e89e7c121 commit 99895f85b3d9ee9c3a016a93c6603b6e89e7c121 Merge: 2186cff b860a92 Author: Brad King AuthorDate: Wed Feb 24 09:39:22 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 24 09:39:22 2016 -0500 Merge topic 'xcode-refactor-xcodeobject' b860a925 Xcode: Refactor block writes to allow any level of nesting ----------------------------------------------------------------------- Summary of changes: Source/cmXCodeObject.cxx | 126 +++++++++++++++++++++++----------------------- Source/cmXCodeObject.h | 4 ++ 2 files changed, 67 insertions(+), 63 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 24 09:39:27 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 24 Feb 2016 09:39:27 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-129-g2039bf4 Message-ID: <20160224143927.2778EDF6F6@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 2039bf40e47c795ab1e57821b44b8a15c5c80775 (commit) via 84ccd4f7461ac2c2ee471a4d77f3e184c676c276 (commit) from 99895f85b3d9ee9c3a016a93c6603b6e89e7c121 (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=2039bf40e47c795ab1e57821b44b8a15c5c80775 commit 2039bf40e47c795ab1e57821b44b8a15c5c80775 Merge: 99895f8 84ccd4f Author: Brad King AuthorDate: Wed Feb 24 09:39:25 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 24 09:39:25 2016 -0500 Merge topic 'CodeBlocksParallelFlag' 84ccd4f7 CodeBlocks: generate parallel project files (make -j) ----------------------------------------------------------------------- Summary of changes: Modules/CMakeFindCodeBlocks.cmake | 15 ++++++++++++++ Source/cmExtraCodeBlocksGenerator.cxx | 35 ++++++++++++++++++++++----------- Source/cmExtraCodeBlocksGenerator.h | 7 +++++-- 3 files changed, 44 insertions(+), 13 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 24 09:40:08 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 24 Feb 2016 09:40:08 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-263-g2fbe0d2 Message-ID: <20160224144008.E1BFFE4F57@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, next has been updated via 2fbe0d260b717ff45f3149d8a555bbbb6d2afa06 (commit) via 2039bf40e47c795ab1e57821b44b8a15c5c80775 (commit) via 99895f85b3d9ee9c3a016a93c6603b6e89e7c121 (commit) via 2186cff370c4ce775a670c9294b77a325e331fd8 (commit) via 0f48312386d77b6e95bd23ced8d7ff2a51928738 (commit) via 3cff48b1bbb37c9a48cae49ddea6effdb11bde73 (commit) via 8f8418c68b92a05f0d030e36dd714dabc218b6b8 (commit) via 6f00fc58ed7f7cb3775bf77192ecde154884aa30 (commit) via be98577f13299456804f619f46dc5a0560bcb176 (commit) via 3dd42fe4eb600339222c42ed440b37a3d76128d6 (commit) via f389e6d6e2f6e55327b36c944f960bce80230f9e (commit) from 0dbba1b76c169f6acfde771843959aa423142e81 (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=2fbe0d260b717ff45f3149d8a555bbbb6d2afa06 commit 2fbe0d260b717ff45f3149d8a555bbbb6d2afa06 Merge: 0dbba1b 2039bf4 Author: Brad King AuthorDate: Wed Feb 24 09:39:33 2016 -0500 Commit: Brad King CommitDate: Wed Feb 24 09:39:33 2016 -0500 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 24 10:06:08 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 24 Feb 2016 10:06:08 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-265-ge6dc46b Message-ID: <20160224150609.575D1E5ED1@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, next has been updated via e6dc46b176601525b616a060ecf7e3f840555f3c (commit) via 33507e2aa71cf0677361e0d01344f8186fcde5ad (commit) from 2fbe0d260b717ff45f3149d8a555bbbb6d2afa06 (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=e6dc46b176601525b616a060ecf7e3f840555f3c commit e6dc46b176601525b616a060ecf7e3f840555f3c Merge: 2fbe0d2 33507e2 Author: Brad King AuthorDate: Wed Feb 24 10:06:07 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 24 10:06:07 2016 -0500 Merge topic 'doc-typos' into next 33507e2a Help: Fix typos in cmake-packages.7 manual https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=33507e2aa71cf0677361e0d01344f8186fcde5ad commit 33507e2aa71cf0677361e0d01344f8186fcde5ad Author: Ashley Whetter AuthorDate: Sun Feb 21 15:17:07 2016 +0000 Commit: Brad King CommitDate: Wed Feb 24 10:05:24 2016 -0500 Help: Fix typos in cmake-packages.7 manual diff --git a/Help/manual/cmake-packages.7.rst b/Help/manual/cmake-packages.7.rst index b9073a5..aebc5d9 100644 --- a/Help/manual/cmake-packages.7.rst +++ b/Help/manual/cmake-packages.7.rst @@ -89,7 +89,7 @@ a package is to set the ``CMAKE_PREFIX_PATH`` cache variable. Config-file packages are provided by upstream vendors as part of development packages, that is, they belong with the header files and any other files -provided to assist downsteams in using the package. +provided to assist downstreams in using the package. A set of variables which provide package status information are also set automatically when using a config-file package. The ``_FOUND`` @@ -352,7 +352,7 @@ version-specific variables ``_VERSION``, ``_VERSION_MAJOR``, used to export the targets in the ``ClimbingStatsTargets`` export-set, defined previously by the :command:`install(TARGETS)` command. This command generates the ``ClimbingStatsTargets.cmake`` file to contain :prop_tgt:`IMPORTED` -targets, suitable for use by downsteams and arranges to install it to +targets, suitable for use by downstreams and arranges to install it to ``lib/cmake/ClimbingStats``. The generated ``ClimbingStatsConfigVersion.cmake`` and a ``cmake/ClimbingStatsConfig.cmake`` are installed to the same location, completing the package. @@ -383,7 +383,7 @@ In this case, when using :command:`install(TARGETS)` the ``INCLUDES DESTINATION` was specified. This causes the ``IMPORTED`` targets to have their :prop_tgt:`INTERFACE_INCLUDE_DIRECTORIES` populated with the ``include`` directory in the :variable:`CMAKE_INSTALL_PREFIX`. When the ``IMPORTED`` -target is used by downsteam, it automatically consumes the entries from +target is used by downstream, it automatically consumes the entries from that property. Creating a Package Configuration File @@ -412,7 +412,7 @@ This can also be extended to cover dependencies: target_link_libraries(ClimbingStats PUBLIC Stats::Types) As the ``Stats::Types`` target is a ``PUBLIC`` dependency of ``ClimbingStats``, -downsteams must also find the ``Stats`` package and link to the ``Stats::Types`` +downstreams must also find the ``Stats`` package and link to the ``Stats::Types`` library. The ``Stats`` package should be found in the ``ClimbingStatsConfig.cmake`` file to ensure this. The ``find_dependency`` macro from the :module:`CMakeFindDependencyMacro` helps with this by propagating @@ -464,7 +464,7 @@ Creating a Package Configuration File for the Build Tree The :command:`export(EXPORT)` command creates an :prop_tgt:`IMPORTED` targets definition file which is specific to the build-tree, and is not relocatable. -This can similiarly be used with a suitable package configuration file and +This can similarly be used with a suitable package configuration file and package version file to define a package for the build tree which may be used without installation. Consumers of the build tree can simply ensure that the :variable:`CMAKE_PREFIX_PATH` contains the build directory, or set the ----------------------------------------------------------------------- Summary of changes: Help/manual/cmake-packages.7.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 24 10:13:35 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 24 Feb 2016 10:13:35 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-267-g546f866 Message-ID: <20160224151335.ACBE9E58AF@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, next has been updated via 546f8660a617ccf9438ca3274fedbb8d38889f29 (commit) via 430251245e1d6bff24db128491d8c5b3e1bb8357 (commit) from e6dc46b176601525b616a060ecf7e3f840555f3c (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=546f8660a617ccf9438ca3274fedbb8d38889f29 commit 546f8660a617ccf9438ca3274fedbb8d38889f29 Merge: e6dc46b 4302512 Author: Brad King AuthorDate: Wed Feb 24 10:13:34 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 24 10:13:34 2016 -0500 Merge topic 'test-cmake_parse_arguments' into next 43025124 cmake_parse_arguments: Additional regression tests https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=430251245e1d6bff24db128491d8c5b3e1bb8357 commit 430251245e1d6bff24db128491d8c5b3e1bb8357 Author: Dimitar Yordanov AuthorDate: Sun Feb 21 19:38:16 2016 +0100 Commit: Brad King CommitDate: Wed Feb 24 10:07:30 2016 -0500 cmake_parse_arguments: Additional regression tests Add regression tests for the arguments handling in cmake_parse_arguments. The tests were run also against cmake 3.4.1 maint branch to verify that there are no regressions. Signed-off-by: Dimitar Yordanov Signed-off-by: Matthias Maennich diff --git a/Tests/RunCMake/cmake_parse_arguments/CornerCases.cmake b/Tests/RunCMake/cmake_parse_arguments/CornerCases.cmake index 72c82ab..028bfaf 100644 --- a/Tests/RunCMake/cmake_parse_arguments/CornerCases.cmake +++ b/Tests/RunCMake/cmake_parse_arguments/CornerCases.cmake @@ -29,6 +29,26 @@ macro(foo) endmacro() foo(FOO foo) +TEST(_FOO1_FOO foo) +TEST(_FOO2_FOO foo) +# Make sure a list is split +foo(FOO "foo;bar") TEST(_FOO1_FOO foo) +TEST(_FOO1_UNPARSED_ARGUMENTS "bar") TEST(_FOO2_FOO foo) +TEST(_FOO2_UNPARSED_ARGUMENTS "bar") + +# Do not split if argn is quoted +foo(FOO "foo\\;bar") +TEST(_FOO1_FOO foo) +TEST(_FOO1_UNPARSED_ARGUMENTS "bar") +TEST(_FOO2_FOO foo;bar) +TEST(_FOO2_UNPARSED_ARGUMENTS "UNDEFINED") + +# Do not split if argn is quoted +foo(FOO "foo\\\\;bar") +TEST(_FOO1_FOO foo) +TEST(_FOO1_UNPARSED_ARGUMENTS "bar") +TEST(_FOO2_FOO foo;bar) +TEST(_FOO2_UNPARSED_ARGUMENTS "UNDEFINED") diff --git a/Tests/RunCMake/cmake_parse_arguments/Initialization.cmake b/Tests/RunCMake/cmake_parse_arguments/Initialization.cmake index 462f923..b4199ea 100644 --- a/Tests/RunCMake/cmake_parse_arguments/Initialization.cmake +++ b/Tests/RunCMake/cmake_parse_arguments/Initialization.cmake @@ -25,6 +25,9 @@ TEST(pref_OPT1 TRUE) cmake_parse_arguments(pref "OPT1;OPT2" "" "" OPT1 OPT2) TEST(pref_OPT1 TRUE) TEST(pref_OPT2 TRUE) +cmake_parse_arguments(pref "OPT1;OPT2" "" "" "OPT1;OPT2") +TEST(pref_OPT1 TRUE) +TEST(pref_OPT2 TRUE) cmake_parse_arguments(pref "OPT1;OPT2" "" "") TEST(pref_OPT1 FALSE) TEST(pref_OPT2 FALSE) @@ -44,6 +47,9 @@ TEST(pref_SINGLE1 foo) cmake_parse_arguments(pref "" "SINGLE1;SINGLE2" "" SINGLE1 foo SINGLE2 bar) TEST(pref_SINGLE1 foo) TEST(pref_SINGLE2 bar) +cmake_parse_arguments(pref "" "SINGLE1;SINGLE2" "" "SINGLE1;foo;SINGLE2;bar") +TEST(pref_SINGLE1 foo) +TEST(pref_SINGLE2 bar) cmake_parse_arguments(pref "" "SINGLE1;SINGLE2" "") TEST(pref_SINGLE1 UNDEFINED) TEST(pref_SINGLE2 UNDEFINED) @@ -63,6 +69,9 @@ TEST(pref_MULTI1 foo) cmake_parse_arguments(pref "" "" "MULTI1;MULTI2" MULTI1 foo bar MULTI2 bar foo) TEST(pref_MULTI1 foo bar) TEST(pref_MULTI2 bar foo) +cmake_parse_arguments(pref "" "" "MULTI1;MULTI2" "MULTI1;foo;bar;MULTI2;bar;foo") +TEST(pref_MULTI1 foo bar) +TEST(pref_MULTI2 bar foo) cmake_parse_arguments(pref "" "" "MULTI1;MULTI2") TEST(pref_MULTI1 UNDEFINED) TEST(pref_MULTI2 UNDEFINED) ----------------------------------------------------------------------- Summary of changes: .../cmake_parse_arguments/CornerCases.cmake | 20 ++++++++++++++++++++ .../cmake_parse_arguments/Initialization.cmake | 9 +++++++++ 2 files changed, 29 insertions(+) hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 24 11:10:38 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 24 Feb 2016 11:10:38 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-131-g12f0655 Message-ID: <20160224161038.D11A8E50F7@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 12f065521c3d9bd5b619c2ad01c81e485dfb8253 (commit) via 33507e2aa71cf0677361e0d01344f8186fcde5ad (commit) from 2039bf40e47c795ab1e57821b44b8a15c5c80775 (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=12f065521c3d9bd5b619c2ad01c81e485dfb8253 commit 12f065521c3d9bd5b619c2ad01c81e485dfb8253 Merge: 2039bf4 33507e2 Author: Brad King AuthorDate: Wed Feb 24 11:10:36 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 24 11:10:36 2016 -0500 Merge topic 'doc-typos' 33507e2a Help: Fix typos in cmake-packages.7 manual ----------------------------------------------------------------------- Summary of changes: Help/manual/cmake-packages.7.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 24 11:10:53 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 24 Feb 2016 11:10:53 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-269-g8e2ad6a Message-ID: <20160224161053.9A1A6E524F@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, next has been updated via 8e2ad6a506bbcd81c5ab15808a7813663f175a1e (commit) via 12f065521c3d9bd5b619c2ad01c81e485dfb8253 (commit) from 546f8660a617ccf9438ca3274fedbb8d38889f29 (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=8e2ad6a506bbcd81c5ab15808a7813663f175a1e commit 8e2ad6a506bbcd81c5ab15808a7813663f175a1e Merge: 546f866 12f0655 Author: Brad King AuthorDate: Wed Feb 24 11:10:44 2016 -0500 Commit: Brad King CommitDate: Wed Feb 24 11:10:44 2016 -0500 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 24 11:12:02 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 24 Feb 2016 11:12:02 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-134-g926cf99 Message-ID: <20160224161204.572FAE56A2@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 926cf998b5baceae2f334e1259d4fbd08d96cb2b (commit) via 6e6f4d8f80eb34cfeedb8024af70acb9901597d3 (commit) via c8d5db90b6dda9527009cb75263f00be82dc7943 (commit) from 12f065521c3d9bd5b619c2ad01c81e485dfb8253 (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: hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 24 11:12:04 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 24 Feb 2016 11:12:04 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-273-gda89b7e Message-ID: <20160224161204.6F04BE56D4@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, next has been updated via da89b7e4b7cbf0c1d8c894e6873216517336b2d3 (commit) via 926cf998b5baceae2f334e1259d4fbd08d96cb2b (commit) via 6e6f4d8f80eb34cfeedb8024af70acb9901597d3 (commit) via c8d5db90b6dda9527009cb75263f00be82dc7943 (commit) from 8e2ad6a506bbcd81c5ab15808a7813663f175a1e (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=da89b7e4b7cbf0c1d8c894e6873216517336b2d3 commit da89b7e4b7cbf0c1d8c894e6873216517336b2d3 Merge: 8e2ad6a 926cf99 Author: Brad King AuthorDate: Wed Feb 24 11:11:52 2016 -0500 Commit: Brad King CommitDate: Wed Feb 24 11:11:52 2016 -0500 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 24 11:12:04 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 24 Feb 2016 11:12:04 -0500 (EST) Subject: [Cmake-commits] CMake branch, release, updated. v3.5.0-rc3-4-g6e6f4d8 Message-ID: <20160224161204.84840E56D8@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 6e6f4d8f80eb34cfeedb8024af70acb9901597d3 (commit) via 33507e2aa71cf0677361e0d01344f8186fcde5ad (commit) via c8d5db90b6dda9527009cb75263f00be82dc7943 (commit) via b347503028a639103f27fcd2752b133993bb30ec (commit) from d203761520f5dd21a9cc4de5c4ca0d0e4e188e34 (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: Help/manual/cmake-packages.7.rst | 10 +++++----- Help/manual/cmake.1.rst | 12 ++++++++---- 2 files changed, 13 insertions(+), 9 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Wed Feb 24 12:33:50 2016 From: brad.king at kitware.com (Brad King) Date: Wed, 24 Feb 2016 12:33:50 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-275-g9061ec0 Message-ID: <20160224173350.9785CE604A@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, next has been updated via 9061ec0b86f7dd4fca052c9000b2ceaa14735ac3 (commit) via dc422d271e4504ebab2176e841480861a17d13e1 (commit) from da89b7e4b7cbf0c1d8c894e6873216517336b2d3 (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=9061ec0b86f7dd4fca052c9000b2ceaa14735ac3 commit 9061ec0b86f7dd4fca052c9000b2ceaa14735ac3 Merge: da89b7e dc422d2 Author: Brad King AuthorDate: Wed Feb 24 12:33:49 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 24 12:33:49 2016 -0500 Merge topic 'vs14-debug-enum-older-toolsets' into next dc422d27 VS: Fix VS 2015 .vcxproj debug setting for older toolsets (#15986) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dc422d271e4504ebab2176e841480861a17d13e1 commit dc422d271e4504ebab2176e841480861a17d13e1 Author: Brad King AuthorDate: Wed Feb 24 12:15:48 2016 -0500 Commit: Brad King CommitDate: Wed Feb 24 12:29:50 2016 -0500 VS: Fix VS 2015 .vcxproj debug setting for older toolsets (#15986) Since commit v3.4.2~2^2 (VS: Fix VS 2015 .vcxproj file value for GenerateDebugInformation, 2016-01-08) we generate invalid project files for the v110 and v120 toolsets. VS complains: C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V120\Microsoft.CppCommon.targets(639,9): error MSB4030: "Debug" is an invalid value for the "GenerateDebugInformation" parameter of the "Link" task. The "GenerateDebugInformation" parameter is of type "System.Boolean". This reveals that our VS flag map selection should be based on the toolset instead of the version of VS. However, that will be a non-trivial change so for now fix this particular use case by hard-coding a correction to the flag map. Reported-by: Gregor Jasny diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 6b46773..769edac 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -2661,6 +2661,33 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config) } } + // Hack to fix flag version selection in a common use case. + // FIXME: Select flag table based on toolset instead of VS version. + if (this->LocalGenerator->GetVersion() >= + cmGlobalVisualStudioGenerator::VS14) + { + cmGlobalVisualStudio10Generator* gg = + static_cast(this->GlobalGenerator); + const char* toolset = gg->GetPlatformToolset(); + if (toolset && + (cmHasLiteralPrefix(toolset, "v110") || + cmHasLiteralPrefix(toolset, "v120"))) + { + if (const char* debug = linkOptions.GetFlag("GenerateDebugInformation")) + { + // Convert value from enumeration back to boolean for older toolsets. + if (strcmp(debug, "No") == 0) + { + linkOptions.AddFlag("GenerateDebugInformation", "false"); + } + else if (strcmp(debug, "Debug") == 0) + { + linkOptions.AddFlag("GenerateDebugInformation", "true"); + } + } + } + } + this->LinkOptions[config] = pOptions.release(); return true; } ----------------------------------------------------------------------- Summary of changes: Source/cmVisualStudio10TargetGenerator.cxx | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) hooks/post-receive -- CMake From eike at sf-mail.de Wed Feb 24 16:18:49 2016 From: eike at sf-mail.de (Rolf Eike Beer) Date: Wed, 24 Feb 2016 16:18:49 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-277-gfda5171 Message-ID: <20160224211849.52924E5C97@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, next has been updated via fda5171148f691addee7d8c735c906d5eb086591 (commit) via 2d85305d7faf3a0308e7a6769864a6a7602238f9 (commit) from 9061ec0b86f7dd4fca052c9000b2ceaa14735ac3 (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=fda5171148f691addee7d8c735c906d5eb086591 commit fda5171148f691addee7d8c735c906d5eb086591 Merge: 9061ec0 2d85305 Author: Rolf Eike Beer AuthorDate: Wed Feb 24 16:18:47 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 24 16:18:47 2016 -0500 Merge topic 'gnu-c-34' into next 2d85305d Revert "Compiler Features: gcc can handle C99 since at least 3.4" https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2d85305d7faf3a0308e7a6769864a6a7602238f9 commit 2d85305d7faf3a0308e7a6769864a6a7602238f9 Author: Rolf Eike Beer AuthorDate: Wed Feb 24 22:15:12 2016 +0100 Commit: Rolf Eike Beer CommitDate: Wed Feb 24 22:15:12 2016 +0100 Revert "Compiler Features: gcc can handle C99 since at least 3.4" This reverts commit 046b2b4d4a42d4e5ebe0a7abc8651163065ed505. This needs more work, e.g. in WriteCompilerDetectionHeader. will come back when that is ready. diff --git a/Help/release/dev/gnu-c-34.rst b/Help/release/dev/gnu-c-34.rst deleted file mode 100644 index 2fab592..0000000 --- a/Help/release/dev/gnu-c-34.rst +++ /dev/null @@ -1,6 +0,0 @@ -gnu-c-34 --------------- - -* The :manual:`Compile Features ` functionality - is now aware that the GNU compilers can handle C99 since at least version - 3.4. diff --git a/Modules/Compiler/GNU-C-FeatureTests.cmake b/Modules/Compiler/GNU-C-FeatureTests.cmake index 0ab5265..b3fe33f 100644 --- a/Modules/Compiler/GNU-C-FeatureTests.cmake +++ b/Modules/Compiler/GNU-C-FeatureTests.cmake @@ -1,5 +1,5 @@ -set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 304") +set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 404") # GNU 4.7 correctly sets __STDC_VERSION__ to 201112L, but GNU 4.6 sets it # to 201000L. As the former is strictly greater than the latter, test only @@ -8,10 +8,10 @@ set(_cmake_oldestSupported "(__GNUC__ * 100 + __GNUC_MINOR__) >= 304") # to the distinction between __cplusplus and __GXX_EXPERIMENTAL_CXX0X__ tests. set(GNU46_C11 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 406 && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201000L") set(_cmake_feature_test_c_static_assert "${GNU46_C11}") -# Since 3.4 at least: -set(GNU34_C99 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 304 && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L") -set(_cmake_feature_test_c_restrict "${GNU34_C99}") -set(_cmake_feature_test_c_variadic_macros "${GNU34_C99}") +# Since 4.4 at least: +set(GNU44_C99 "(__GNUC__ * 100 + __GNUC_MINOR__) >= 404 && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L") +set(_cmake_feature_test_c_restrict "${GNU44_C99}") +set(_cmake_feature_test_c_variadic_macros "${GNU44_C99}") set(GNU_C90 "${_cmake_oldestSupported}") set(_cmake_feature_test_c_function_prototypes "${GNU_C90}") diff --git a/Modules/Compiler/GNU-C.cmake b/Modules/Compiler/GNU-C.cmake index f76e07f..2c478da 100644 --- a/Modules/Compiler/GNU-C.cmake +++ b/Modules/Compiler/GNU-C.cmake @@ -4,12 +4,12 @@ __compiler_gnu(C) if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.5) set(CMAKE_C90_STANDARD_COMPILE_OPTION "-std=c90") set(CMAKE_C90_EXTENSION_COMPILE_OPTION "-std=gnu90") -elseif (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4) +elseif (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4) set(CMAKE_C90_STANDARD_COMPILE_OPTION "-std=c89") set(CMAKE_C90_EXTENSION_COMPILE_OPTION "-std=gnu89") endif() -if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4) +if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4) set(CMAKE_C99_STANDARD_COMPILE_OPTION "-std=c99") set(CMAKE_C99_EXTENSION_COMPILE_OPTION "-std=gnu99") endif() @@ -22,7 +22,7 @@ elseif (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.6) set(CMAKE_C11_EXTENSION_COMPILE_OPTION "-std=gnu1x") endif() -if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4) +if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4) if (NOT CMAKE_C_COMPILER_FORCED) if (NOT CMAKE_C_STANDARD_COMPUTED_DEFAULT) message(FATAL_ERROR "CMAKE_C_STANDARD_COMPUTED_DEFAULT should be set for ${CMAKE_C_COMPILER_ID} (${CMAKE_C_COMPILER}) version ${CMAKE_C_COMPILER_VERSION}") @@ -48,7 +48,7 @@ macro(cmake_record_c_compile_features) if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.6) _get_gcc_features(${CMAKE_C11_STANDARD_COMPILE_OPTION} CMAKE_C11_COMPILE_FEATURES) endif() - if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4) + if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 4.4) if (_result EQUAL 0) _get_gcc_features(${CMAKE_C99_STANDARD_COMPILE_OPTION} CMAKE_C99_COMPILE_FEATURES) endif() ----------------------------------------------------------------------- Summary of changes: Help/release/dev/gnu-c-34.rst | 6 ------ Modules/Compiler/GNU-C-FeatureTests.cmake | 10 +++++----- Modules/Compiler/GNU-C.cmake | 8 ++++---- 3 files changed, 9 insertions(+), 15 deletions(-) delete mode 100644 Help/release/dev/gnu-c-34.rst hooks/post-receive -- CMake From neundorf at kde.org Wed Feb 24 17:10:37 2016 From: neundorf at kde.org (Alexander Neundorf) Date: Wed, 24 Feb 2016 17:10:37 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-280-g892a534 Message-ID: <20160224221037.BE83FE4830@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, next has been updated via 892a53437ff2f626fdc19b568dd80eeb7a0a81a5 (commit) via aff38945d64fc56026255c9cc3c1051529887d7b (commit) via 6ee6b17ed538989e38efb2eafb7f92c557eca71a (commit) from fda5171148f691addee7d8c735c906d5eb086591 (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=892a53437ff2f626fdc19b568dd80eeb7a0a81a5 commit 892a53437ff2f626fdc19b568dd80eeb7a0a81a5 Merge: fda5171 aff3894 Author: Alexander Neundorf AuthorDate: Wed Feb 24 17:10:37 2016 -0500 Commit: CMake Topic Stage CommitDate: Wed Feb 24 17:10:37 2016 -0500 Merge topic 'AddNewEclipseVersions' into next aff38945 Eclipse: only add C/CXX macros if the language is enabled 6ee6b17e Eclipse: add newer version numbers https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aff38945d64fc56026255c9cc3c1051529887d7b commit aff38945d64fc56026255c9cc3c1051529887d7b Author: Alex Neundorf AuthorDate: Wed Feb 24 22:13:04 2016 +0100 Commit: Alex Neundorf CommitDate: Wed Feb 24 22:13:04 2016 +0100 Eclipse: only add C/CXX macros if the language is enabled With this patch, the builtin macros and include dirs are only added to the project file if the C/CXX langauges are really enabled. I.e. before this patch the CXX-stuff was in the project file as soon as CXX had been enabled at least once for this build tree. I.e. disabling CXX later on did not remove the CXX macros etc. from the project file (related to #15150) Alex diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx index aedf6f4..133a85a 100644 --- a/Source/cmExtraEclipseCDT4Generator.cxx +++ b/Source/cmExtraEclipseCDT4Generator.cxx @@ -42,6 +42,8 @@ cmExtraEclipseCDT4Generator this->GenerateLinkedResources = true; this->SupportsGmakeErrorParser = true; this->SupportsMachO64Parser = true; + this->CEnabled = false; + this->CXXEnabled = false; } //---------------------------------------------------------------------------- @@ -64,10 +66,12 @@ void cmExtraEclipseCDT4Generator { this->Natures.insert("org.eclipse.cdt.core.ccnature"); this->Natures.insert("org.eclipse.cdt.core.cnature"); + this->CXXEnabled = true; } else if (*lit == "C") { this->Natures.insert("org.eclipse.cdt.core.cnature"); + this->CEnabled = true; } else if (*lit == "Java") { @@ -890,7 +894,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const // add system defined c macros const char* cDefs=mf->GetDefinition( "CMAKE_EXTRA_GENERATOR_C_SYSTEM_DEFINED_MACROS"); - if(cDefs) + if(this->CEnabled && cDefs) { // Expand the list. std::vector defs; @@ -925,7 +929,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const // add system defined c++ macros const char* cxxDefs = mf->GetDefinition( "CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_DEFINED_MACROS"); - if(cxxDefs) + if(this->CXXEnabled && cxxDefs) { // Expand the list. std::vector defs; @@ -979,7 +983,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const // CMakeSystemSpecificInformation.cmake. This makes Eclipse find the // standard headers. std::string compiler = mf->GetSafeDefinition("CMAKE_C_COMPILER"); - if (!compiler.empty()) + if (this->CEnabled && !compiler.empty()) { std::string systemIncludeDirs = mf->GetSafeDefinition( "CMAKE_EXTRA_GENERATOR_C_SYSTEM_INCLUDE_DIRS"); @@ -988,7 +992,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const this->AppendIncludeDirectories(fout, dirs, emmited); } compiler = mf->GetSafeDefinition("CMAKE_CXX_COMPILER"); - if (!compiler.empty()) + if (this->CXXEnabled && !compiler.empty()) { std::string systemIncludeDirs = mf->GetSafeDefinition( "CMAKE_EXTRA_GENERATOR_CXX_SYSTEM_INCLUDE_DIRS"); diff --git a/Source/cmExtraEclipseCDT4Generator.h b/Source/cmExtraEclipseCDT4Generator.h index 16675f2..1da2077 100644 --- a/Source/cmExtraEclipseCDT4Generator.h +++ b/Source/cmExtraEclipseCDT4Generator.h @@ -116,6 +116,8 @@ private: bool SupportsVirtualFolders; bool SupportsGmakeErrorParser; bool SupportsMachO64Parser; + bool CEnabled; + bool CXXEnabled; }; https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6ee6b17ed538989e38efb2eafb7f92c557eca71a commit 6ee6b17ed538989e38efb2eafb7f92c557eca71a Author: Alex Neundorf AuthorDate: Wed Feb 24 21:07:45 2016 +0100 Commit: Alex Neundorf CommitDate: Wed Feb 24 21:07:45 2016 +0100 Eclipse: add newer version numbers Alex diff --git a/Modules/CMakeFindEclipseCDT4.cmake b/Modules/CMakeFindEclipseCDT4.cmake index 85c1fdf..5bf738a 100644 --- a/Modules/CMakeFindEclipseCDT4.cmake +++ b/Modules/CMakeFindEclipseCDT4.cmake @@ -30,6 +30,8 @@ function(_FIND_ECLIPSE_VERSION) set(_ECLIPSE_VERSION_NAME_3.7 "Indigo" ) set(_ECLIPSE_VERSION_NAME_4.2 "Juno" ) set(_ECLIPSE_VERSION_NAME_4.3 "Kepler" ) + set(_ECLIPSE_VERSION_NAME_4.4 "Luna" ) + set(_ECLIPSE_VERSION_NAME_4.5 "Mars" ) if(NOT DEFINED CMAKE_ECLIPSE_VERSION) if(CMAKE_ECLIPSE_EXECUTABLE) @@ -65,6 +67,8 @@ function(_FIND_ECLIPSE_VERSION) "3.7 (${_ECLIPSE_VERSION_NAME_3.7})" "4.2 (${_ECLIPSE_VERSION_NAME_4.2})" "4.3 (${_ECLIPSE_VERSION_NAME_4.3})" + "4.4 (${_ECLIPSE_VERSION_NAME_4.4})" + "4.5 (${_ECLIPSE_VERSION_NAME_4.5})" ) endfunction() ----------------------------------------------------------------------- Summary of changes: Modules/CMakeFindEclipseCDT4.cmake | 4 ++++ Source/cmExtraEclipseCDT4Generator.cxx | 12 ++++++++---- Source/cmExtraEclipseCDT4Generator.h | 2 ++ 3 files changed, 14 insertions(+), 4 deletions(-) hooks/post-receive -- CMake From kwrobot at kitware.com Thu Feb 25 00:01:11 2016 From: kwrobot at kitware.com (Kitware Robot) Date: Thu, 25 Feb 2016 00:01:11 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-135-g9b6fdbf Message-ID: <20160225050111.423EFE5DC6@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 9b6fdbfb922d65794847fabb047c3045632829c0 (commit) from 926cf998b5baceae2f334e1259d4fbd08d96cb2b (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=9b6fdbfb922d65794847fabb047c3045632829c0 commit 9b6fdbfb922d65794847fabb047c3045632829c0 Author: Kitware Robot AuthorDate: Thu Feb 25 00:01:08 2016 -0500 Commit: Kitware Robot CommitDate: Thu Feb 25 00:01:08 2016 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index b983213..2094bf2 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 5) -set(CMake_VERSION_PATCH 20160224) +set(CMake_VERSION_PATCH 20160225) #set(CMake_VERSION_RC 1) ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 25 08:50:54 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 25 Feb 2016 08:50:54 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-283-ge2b8af5 Message-ID: <20160225135054.A4DCFE591C@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, next has been updated via e2b8af58c0f4e497bd9a557a8eac7c53f974640a (commit) via f3ac06519f10ba535abe91dfd6e7074a366f5a14 (commit) via 9b6fdbfb922d65794847fabb047c3045632829c0 (commit) from 892a53437ff2f626fdc19b568dd80eeb7a0a81a5 (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=e2b8af58c0f4e497bd9a557a8eac7c53f974640a commit e2b8af58c0f4e497bd9a557a8eac7c53f974640a Merge: 892a534 f3ac065 Author: Brad King AuthorDate: Thu Feb 25 08:50:53 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Feb 25 08:50:53 2016 -0500 Merge topic 'compiler-check-message' into next f3ac0651 Improve compiler check message on non-Make generators 9b6fdbfb CMake Nightly Date Stamp https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f3ac06519f10ba535abe91dfd6e7074a366f5a14 commit f3ac06519f10ba535abe91dfd6e7074a366f5a14 Author: Brad King AuthorDate: Thu Feb 25 08:25:35 2016 -0500 Commit: Brad King CommitDate: Thu Feb 25 08:29:41 2016 -0500 Improve compiler check message on non-Make generators When we check for a working compiler we print a message of the form: Check for working compiler: ... At one time CMAKE__COMPILER was not well-defined for all generators so we printed the generator name instead of the path to the compiler. Nowadays we always know the compiler, so update the message to print it unconditionally. This is more informative than the generator name, especially when a toolset (cmake -T) is used. Suggested-by: Gregor Jasny diff --git a/Modules/CMakeTestCompilerCommon.cmake b/Modules/CMakeTestCompilerCommon.cmake index d51b503..e0d45e7 100644 --- a/Modules/CMakeTestCompilerCommon.cmake +++ b/Modules/CMakeTestCompilerCommon.cmake @@ -13,9 +13,5 @@ # License text for the above reference.) function(PrintTestCompilerStatus LANG MSG) - if(CMAKE_GENERATOR MATCHES Make) - message(STATUS "Check for working ${LANG} compiler: ${CMAKE_${LANG}_COMPILER}${MSG}") - else() - message(STATUS "Check for working ${LANG} compiler using: ${CMAKE_GENERATOR}${MSG}") - endif() + message(STATUS "Check for working ${LANG} compiler: ${CMAKE_${LANG}_COMPILER}${MSG}") endfunction() ----------------------------------------------------------------------- Summary of changes: Modules/CMakeTestCompilerCommon.cmake | 6 +----- Source/CMakeVersion.cmake | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 25 09:00:23 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 25 Feb 2016 09:00:23 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-137-gdd99bff Message-ID: <20160225140023.54D8AE5C5F@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 dd99bfff3a25668c2043e776d775f7ebaef82d03 (commit) via 430251245e1d6bff24db128491d8c5b3e1bb8357 (commit) from 9b6fdbfb922d65794847fabb047c3045632829c0 (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=dd99bfff3a25668c2043e776d775f7ebaef82d03 commit dd99bfff3a25668c2043e776d775f7ebaef82d03 Merge: 9b6fdbf 4302512 Author: Brad King AuthorDate: Thu Feb 25 09:00:21 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Feb 25 09:00:21 2016 -0500 Merge topic 'test-cmake_parse_arguments' 43025124 cmake_parse_arguments: Additional regression tests ----------------------------------------------------------------------- Summary of changes: .../cmake_parse_arguments/CornerCases.cmake | 20 ++++++++++++++++++++ .../cmake_parse_arguments/Initialization.cmake | 9 +++++++++ 2 files changed, 29 insertions(+) hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 25 09:00:25 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 25 Feb 2016 09:00:25 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-140-gc842411 Message-ID: <20160225140025.BE5A1E5956@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 c842411dc5a2123cdc9d949b67f8421379a4a928 (commit) via aff38945d64fc56026255c9cc3c1051529887d7b (commit) via 6ee6b17ed538989e38efb2eafb7f92c557eca71a (commit) from dd99bfff3a25668c2043e776d775f7ebaef82d03 (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=c842411dc5a2123cdc9d949b67f8421379a4a928 commit c842411dc5a2123cdc9d949b67f8421379a4a928 Merge: dd99bff aff3894 Author: Brad King AuthorDate: Thu Feb 25 09:00:24 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Feb 25 09:00:24 2016 -0500 Merge topic 'AddNewEclipseVersions' aff38945 Eclipse: only add C/CXX macros if the language is enabled 6ee6b17e Eclipse: add newer version numbers ----------------------------------------------------------------------- Summary of changes: Modules/CMakeFindEclipseCDT4.cmake | 4 ++++ Source/cmExtraEclipseCDT4Generator.cxx | 12 ++++++++---- Source/cmExtraEclipseCDT4Generator.h | 2 ++ 3 files changed, 14 insertions(+), 4 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 25 09:00:28 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 25 Feb 2016 09:00:28 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-142-gf8af218 Message-ID: <20160225140028.E8F44E5C7C@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 f8af218ea148baafcfc3db6ea5ba7389f5ea7206 (commit) via dc422d271e4504ebab2176e841480861a17d13e1 (commit) from c842411dc5a2123cdc9d949b67f8421379a4a928 (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=f8af218ea148baafcfc3db6ea5ba7389f5ea7206 commit f8af218ea148baafcfc3db6ea5ba7389f5ea7206 Merge: c842411 dc422d2 Author: Brad King AuthorDate: Thu Feb 25 09:00:27 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Feb 25 09:00:27 2016 -0500 Merge topic 'vs14-debug-enum-older-toolsets' dc422d27 VS: Fix VS 2015 .vcxproj debug setting for older toolsets (#15986) ----------------------------------------------------------------------- Summary of changes: Source/cmVisualStudio10TargetGenerator.cxx | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 25 09:00:52 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 25 Feb 2016 09:00:52 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-287-g5aa7416 Message-ID: <20160225140052.1D628E5C5A@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, next has been updated via 5aa7416f9bebe43aa98d8ff66e416721706ecbd5 (commit) via f8af218ea148baafcfc3db6ea5ba7389f5ea7206 (commit) via c842411dc5a2123cdc9d949b67f8421379a4a928 (commit) via dd99bfff3a25668c2043e776d775f7ebaef82d03 (commit) from e2b8af58c0f4e497bd9a557a8eac7c53f974640a (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=5aa7416f9bebe43aa98d8ff66e416721706ecbd5 commit 5aa7416f9bebe43aa98d8ff66e416721706ecbd5 Merge: e2b8af5 f8af218 Author: Brad King AuthorDate: Thu Feb 25 09:00:42 2016 -0500 Commit: Brad King CommitDate: Thu Feb 25 09:00:42 2016 -0500 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake From brad.king at kitware.com Thu Feb 25 11:44:48 2016 From: brad.king at kitware.com (Brad King) Date: Thu, 25 Feb 2016 11:44:48 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-289-gdd6870d Message-ID: <20160225164448.3D4C0E5964@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, next has been updated via dd6870d0dab8ede1a2861016f052897f26541919 (commit) via 6c9586f9c7804c4560a43aa6a03e490374174550 (commit) from 5aa7416f9bebe43aa98d8ff66e416721706ecbd5 (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=dd6870d0dab8ede1a2861016f052897f26541919 commit dd6870d0dab8ede1a2861016f052897f26541919 Merge: 5aa7416 6c9586f Author: Brad King AuthorDate: Thu Feb 25 11:44:44 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Feb 25 11:44:44 2016 -0500 Merge topic 'file-download-status-hash-mismatch' into next 6c9586f9 file(DOWNLOAD): Fill STATUS variable on hash mismatch (#15987) https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6c9586f9c7804c4560a43aa6a03e490374174550 commit 6c9586f9c7804c4560a43aa6a03e490374174550 Author: Brad King AuthorDate: Thu Feb 25 11:28:07 2016 -0500 Commit: Brad King CommitDate: Thu Feb 25 11:40:50 2016 -0500 file(DOWNLOAD): Fill STATUS variable on hash mismatch (#15987) Although we fail with an error on a hash mismatch, it is not a fatal error so the script may continue processing. If the download itself had no error then report in the STATUS variable that the operation was not successful due to the hash mismatch. Suggested-by: Tobias Hieta diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index b3557f9..1fa27eb 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -3300,6 +3300,15 @@ cmFileCommand::HandleDownloadCommand(std::vector const& args) << " status: [" << (int)res << ";\"" << ::curl_easy_strerror(res) << "\"]" << std::endl ; + + if(!statusVar.empty() && res == 0) + { + std::string status = "1;HASH mismatch: " + "expected: " + expectedHash + + " actual: " + actualHash; + this->Makefile->AddDefinition(statusVar, status.c_str()); + } + this->SetError(oss.str()); return false; } diff --git a/Tests/RunCMake/file/DOWNLOAD-hash-mismatch-result.txt b/Tests/RunCMake/file/DOWNLOAD-hash-mismatch-result.txt new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/Tests/RunCMake/file/DOWNLOAD-hash-mismatch-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/file/DOWNLOAD-hash-mismatch-stderr.txt b/Tests/RunCMake/file/DOWNLOAD-hash-mismatch-stderr.txt new file mode 100644 index 0000000..406e315 --- /dev/null +++ b/Tests/RunCMake/file/DOWNLOAD-hash-mismatch-stderr.txt @@ -0,0 +1,12 @@ +^CMake Error at DOWNLOAD-hash-mismatch.cmake:[0-9]+ \(file\): + file DOWNLOAD HASH mismatch + + for file: \[.*/Tests/RunCMake/file/DOWNLOAD-hash-mismatch-build/hash-mismatch.txt\] + expected hash: \[0123456789abcdef0123456789abcdef01234567\] + actual hash: \[da39a3ee5e6b4b0d3255bfef95601890afd80709\] + status: \[0;"No error"\] + +Call Stack \(most recent call first\): + CMakeLists.txt:[0-9]+ \(include\) ++ +status='1;HASH mismatch: expected: 0123456789abcdef0123456789abcdef01234567 actual: da39a3ee5e6b4b0d3255bfef95601890afd80709'$ diff --git a/Tests/RunCMake/file/DOWNLOAD-hash-mismatch.cmake b/Tests/RunCMake/file/DOWNLOAD-hash-mismatch.cmake new file mode 100644 index 0000000..ca72692 --- /dev/null +++ b/Tests/RunCMake/file/DOWNLOAD-hash-mismatch.cmake @@ -0,0 +1,7 @@ +file(DOWNLOAD + "file://${CMAKE_CURRENT_SOURCE_DIR}/DOWNLOAD-hash-mismatch.txt" + ${CMAKE_CURRENT_BINARY_DIR}/hash-mismatch.txt + EXPECTED_HASH SHA1=0123456789abcdef0123456789abcdef01234567 + STATUS status + ) +message("status='${status}'") diff --git a/Tests/RunCMake/file/DOWNLOAD-hash-mismatch.txt b/Tests/RunCMake/file/DOWNLOAD-hash-mismatch.txt new file mode 100644 index 0000000..e69de29 diff --git a/Tests/RunCMake/file/RunCMakeTest.cmake b/Tests/RunCMake/file/RunCMakeTest.cmake index d3dfb1b..5f85bba 100644 --- a/Tests/RunCMake/file/RunCMakeTest.cmake +++ b/Tests/RunCMake/file/RunCMakeTest.cmake @@ -1,5 +1,6 @@ include(RunCMake) +run_cmake(DOWNLOAD-hash-mismatch) run_cmake(INSTALL-DIRECTORY) run_cmake(INSTALL-MESSAGE-bad) run_cmake(FileOpenFailRead) ----------------------------------------------------------------------- Summary of changes: Source/cmFileCommand.cxx | 9 +++++++++ .../DOWNLOAD-hash-mismatch-result.txt} | 0 Tests/RunCMake/file/DOWNLOAD-hash-mismatch-stderr.txt | 12 ++++++++++++ Tests/RunCMake/file/DOWNLOAD-hash-mismatch.cmake | 7 +++++++ .../RunCMake/file/DOWNLOAD-hash-mismatch.txt | 0 Tests/RunCMake/file/RunCMakeTest.cmake | 1 + 6 files changed, 29 insertions(+) copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => file/DOWNLOAD-hash-mismatch-result.txt} (100%) create mode 100644 Tests/RunCMake/file/DOWNLOAD-hash-mismatch-stderr.txt create mode 100644 Tests/RunCMake/file/DOWNLOAD-hash-mismatch.cmake copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/file/DOWNLOAD-hash-mismatch.txt (100%) hooks/post-receive -- CMake From joe.snyder at kitware.com Thu Feb 25 13:14:09 2016 From: joe.snyder at kitware.com (Joe Snyder) Date: Thu, 25 Feb 2016 13:14:09 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-291-gca566cd Message-ID: <20160225181409.35533E53DC@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, next has been updated via ca566cd242b363f43e313ab9cd16f9521db8fc7b (commit) via bc29ed542bbe8ff6b0bc178a7940a166680e002e (commit) from dd6870d0dab8ede1a2861016f052897f26541919 (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=ca566cd242b363f43e313ab9cd16f9521db8fc7b commit ca566cd242b363f43e313ab9cd16f9521db8fc7b Merge: dd6870d bc29ed5 Author: Joe Snyder AuthorDate: Thu Feb 25 13:14:08 2016 -0500 Commit: CMake Topic Stage CommitDate: Thu Feb 25 13:14:08 2016 -0500 Merge topic 'fix_coverage_file_searching' into next bc29ed54 CTest: Make coverage file selection more specific. https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bc29ed542bbe8ff6b0bc178a7940a166680e002e commit bc29ed542bbe8ff6b0bc178a7940a166680e002e Author: Joseph Snyder AuthorDate: Wed Nov 18 13:01:22 2015 -0500 Commit: Joseph Snyder CommitDate: Thu Feb 25 13:01:37 2016 -0500 CTest: Make coverage file selection more specific. When performing some other testing, the globs for Blanket.js and Delphi code coverage are picking up unintended files. Change the query for the Delphi coverage to follow the naming convention, and check the second line of the found JSON files for certain text before parsing them as coverage files. diff --git a/Source/CTest/cmCTestCoverageHandler.cxx b/Source/CTest/cmCTestCoverageHandler.cxx index 2c2cd48..fd62696 100644 --- a/Source/CTest/cmCTestCoverageHandler.cxx +++ b/Source/CTest/cmCTestCoverageHandler.cxx @@ -983,7 +983,7 @@ int cmCTestCoverageHandler::HandleDelphiCoverage( std::string BinDir = this->CTest->GetBinaryDir(); - std::string coverageFile = BinDir+ "/*.html"; + std::string coverageFile = BinDir+ "/*(*.pas).html"; g.FindFiles(coverageFile); @@ -1017,9 +1017,25 @@ int cmCTestCoverageHandler::HandleBlanketJSCoverage( std::string coverageFile = SourceDir+ "/*.json"; cmsys::Glob g; std::vector files; + std::vector blanketFiles; g.FindFiles(coverageFile); files=g.GetFiles(); - if (!files.empty()) + // Ensure that the JSON files found are the result of the + // Blanket.js output. Check for the "node-jscoverage" + // string on the second line + std::string line; + for(unsigned int fileEntry=0;fileEntryCTest, HANDLER_VERBOSE_OUTPUT, "Found BlanketJS output JSON, Performing Coverage" << std::endl, ----------------------------------------------------------------------- Summary of changes: Source/CTest/cmCTestCoverageHandler.cxx | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) hooks/post-receive -- CMake From kwrobot at kitware.com Fri Feb 26 00:01:09 2016 From: kwrobot at kitware.com (Kitware Robot) Date: Fri, 26 Feb 2016 00:01:09 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-143-g9f7a232 Message-ID: <20160226050109.6024DE5B4B@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 9f7a2328acac8fa52e4b46535c69611041571de0 (commit) from f8af218ea148baafcfc3db6ea5ba7389f5ea7206 (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=9f7a2328acac8fa52e4b46535c69611041571de0 commit 9f7a2328acac8fa52e4b46535c69611041571de0 Author: Kitware Robot AuthorDate: Fri Feb 26 00:01:05 2016 -0500 Commit: Kitware Robot CommitDate: Fri Feb 26 00:01:05 2016 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 2094bf2..c307854 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 5) -set(CMake_VERSION_PATCH 20160225) +set(CMake_VERSION_PATCH 20160226) #set(CMake_VERSION_RC 1) ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Fri Feb 26 10:31:27 2016 From: brad.king at kitware.com (Brad King) Date: Fri, 26 Feb 2016 10:31:27 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-145-gcc7a1b1 Message-ID: <20160226153127.6D5B0E5D42@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 cc7a1b194152a171725ae9cb66c6de1e710b4ecb (commit) via 6c9586f9c7804c4560a43aa6a03e490374174550 (commit) from 9f7a2328acac8fa52e4b46535c69611041571de0 (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=cc7a1b194152a171725ae9cb66c6de1e710b4ecb commit cc7a1b194152a171725ae9cb66c6de1e710b4ecb Merge: 9f7a232 6c9586f Author: Brad King AuthorDate: Fri Feb 26 10:31:24 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 26 10:31:24 2016 -0500 Merge topic 'file-download-status-hash-mismatch' 6c9586f9 file(DOWNLOAD): Fill STATUS variable on hash mismatch (#15987) ----------------------------------------------------------------------- Summary of changes: Source/cmFileCommand.cxx | 9 +++++++++ .../DOWNLOAD-hash-mismatch-result.txt} | 0 Tests/RunCMake/file/DOWNLOAD-hash-mismatch-stderr.txt | 12 ++++++++++++ Tests/RunCMake/file/DOWNLOAD-hash-mismatch.cmake | 7 +++++++ .../RunCMake/file/DOWNLOAD-hash-mismatch.txt | 0 Tests/RunCMake/file/RunCMakeTest.cmake | 1 + 6 files changed, 29 insertions(+) copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => file/DOWNLOAD-hash-mismatch-result.txt} (100%) create mode 100644 Tests/RunCMake/file/DOWNLOAD-hash-mismatch-stderr.txt create mode 100644 Tests/RunCMake/file/DOWNLOAD-hash-mismatch.cmake copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/file/DOWNLOAD-hash-mismatch.txt (100%) hooks/post-receive -- CMake From brad.king at kitware.com Fri Feb 26 10:31:30 2016 From: brad.king at kitware.com (Brad King) Date: Fri, 26 Feb 2016 10:31:30 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-147-g79d4b5b Message-ID: <20160226153130.3BB60E5D44@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 79d4b5bec911f057c87dd6c558cbe112afbc3a7e (commit) via 7f1bd9fe6910f7633d98dec018cc01331a46b87e (commit) from cc7a1b194152a171725ae9cb66c6de1e710b4ecb (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=79d4b5bec911f057c87dd6c558cbe112afbc3a7e commit 79d4b5bec911f057c87dd6c558cbe112afbc3a7e Merge: cc7a1b1 7f1bd9f Author: Brad King AuthorDate: Fri Feb 26 10:31:28 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 26 10:31:28 2016 -0500 Merge topic 'try_compile-target-type' 7f1bd9fe try_compile: Add option to control type of target ----------------------------------------------------------------------- Summary of changes: Help/command/try_compile.rst | 3 + Help/manual/cmake-variables.7.rst | 1 + Help/release/dev/try_compile-target-type.rst | 8 +++ Help/variable/CMAKE_TRY_COMPILE_TARGET_TYPE.rst | 15 ++++ Source/cmCoreTryCompile.cxx | 73 +++++++++++++++++--- Source/cmCoreTryCompile.h | 6 +- Source/cmTryCompileCommand.cxx | 2 +- Source/cmTryRunCommand.cxx | 2 +- Tests/RunCMake/try_compile/RunCMakeTest.cmake | 4 ++ Tests/RunCMake/try_compile/TargetTypeExe.cmake | 14 ++++ .../TargetTypeInvalid-result.txt} | 0 .../try_compile/TargetTypeInvalid-stderr.txt | 5 ++ Tests/RunCMake/try_compile/TargetTypeInvalid.cmake | 2 + Tests/RunCMake/try_compile/TargetTypeStatic.cmake | 14 ++++ Tests/RunCMake/try_compile/other.c | 1 + 15 files changed, 135 insertions(+), 15 deletions(-) create mode 100644 Help/release/dev/try_compile-target-type.rst create mode 100644 Help/variable/CMAKE_TRY_COMPILE_TARGET_TYPE.rst create mode 100644 Tests/RunCMake/try_compile/TargetTypeExe.cmake copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => try_compile/TargetTypeInvalid-result.txt} (100%) create mode 100644 Tests/RunCMake/try_compile/TargetTypeInvalid-stderr.txt create mode 100644 Tests/RunCMake/try_compile/TargetTypeInvalid.cmake create mode 100644 Tests/RunCMake/try_compile/TargetTypeStatic.cmake create mode 100644 Tests/RunCMake/try_compile/other.c hooks/post-receive -- CMake From brad.king at kitware.com Fri Feb 26 10:31:32 2016 From: brad.king at kitware.com (Brad King) Date: Fri, 26 Feb 2016 10:31:32 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-149-g467f83d Message-ID: <20160226153132.67C8BE5D78@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 467f83d2e5b215dba49901ceb1de53895fbfe6a7 (commit) via bc29ed542bbe8ff6b0bc178a7940a166680e002e (commit) from 79d4b5bec911f057c87dd6c558cbe112afbc3a7e (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=467f83d2e5b215dba49901ceb1de53895fbfe6a7 commit 467f83d2e5b215dba49901ceb1de53895fbfe6a7 Merge: 79d4b5b bc29ed5 Author: Brad King AuthorDate: Fri Feb 26 10:31:30 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 26 10:31:30 2016 -0500 Merge topic 'fix_coverage_file_searching' bc29ed54 CTest: Make coverage file selection more specific. ----------------------------------------------------------------------- Summary of changes: Source/CTest/cmCTestCoverageHandler.cxx | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Fri Feb 26 10:31:34 2016 From: brad.king at kitware.com (Brad King) Date: Fri, 26 Feb 2016 10:31:34 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-151-g6b0a664 Message-ID: <20160226153134.7CFD7E5D96@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 6b0a664c1639b19ccc652a4be5f9824d0bf88e48 (commit) via f3ac06519f10ba535abe91dfd6e7074a366f5a14 (commit) from 467f83d2e5b215dba49901ceb1de53895fbfe6a7 (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=6b0a664c1639b19ccc652a4be5f9824d0bf88e48 commit 6b0a664c1639b19ccc652a4be5f9824d0bf88e48 Merge: 467f83d f3ac065 Author: Brad King AuthorDate: Fri Feb 26 10:31:32 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 26 10:31:32 2016 -0500 Merge topic 'compiler-check-message' f3ac0651 Improve compiler check message on non-Make generators ----------------------------------------------------------------------- Summary of changes: Modules/CMakeTestCompilerCommon.cmake | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Fri Feb 26 10:32:32 2016 From: brad.king at kitware.com (Brad King) Date: Fri, 26 Feb 2016 10:32:32 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-297-gf51df41 Message-ID: <20160226153232.D1B6FE5DB0@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, next has been updated via f51df41763ad67dc955e79dbd3a95bee436eb154 (commit) via 6b0a664c1639b19ccc652a4be5f9824d0bf88e48 (commit) via 467f83d2e5b215dba49901ceb1de53895fbfe6a7 (commit) via 79d4b5bec911f057c87dd6c558cbe112afbc3a7e (commit) via cc7a1b194152a171725ae9cb66c6de1e710b4ecb (commit) via 9f7a2328acac8fa52e4b46535c69611041571de0 (commit) from ca566cd242b363f43e313ab9cd16f9521db8fc7b (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=f51df41763ad67dc955e79dbd3a95bee436eb154 commit f51df41763ad67dc955e79dbd3a95bee436eb154 Merge: ca566cd 6b0a664 Author: Brad King AuthorDate: Fri Feb 26 10:32:25 2016 -0500 Commit: Brad King CommitDate: Fri Feb 26 10:32:25 2016 -0500 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From brad.king at kitware.com Fri Feb 26 11:05:41 2016 From: brad.king at kitware.com (Brad King) Date: Fri, 26 Feb 2016 11:05:41 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-299-gdd764e1 Message-ID: <20160226160541.CBB77E5C70@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, next has been updated via dd764e11ffcb065779e6ca84e6ffa8435db7f681 (commit) via 6122909c33bea1256867a40a09e0eafa569e8c8b (commit) from f51df41763ad67dc955e79dbd3a95bee436eb154 (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=dd764e11ffcb065779e6ca84e6ffa8435db7f681 commit dd764e11ffcb065779e6ca84e6ffa8435db7f681 Merge: f51df41 6122909 Author: Brad King AuthorDate: Fri Feb 26 11:05:40 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 26 11:05:40 2016 -0500 Merge topic 'vs-vcxproj-ConfigurationType' into next 6122909c VS: Add option to set `ConfigurationType` of a .vcxproj file https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6122909c33bea1256867a40a09e0eafa569e8c8b commit 6122909c33bea1256867a40a09e0eafa569e8c8b Author: Fabian Otto AuthorDate: Thu Feb 25 22:04:05 2016 +0100 Commit: Brad King CommitDate: Fri Feb 26 10:52:13 2016 -0500 VS: Add option to set `ConfigurationType` of a .vcxproj file Add a VS_CONFIGURATION_TYPE target property to set this value explicitly. This is useful to build a Windows Kernel Mode Driver, for example. diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst index a41d484..d6618fe 100644 --- a/Help/manual/cmake-properties.7.rst +++ b/Help/manual/cmake-properties.7.rst @@ -255,6 +255,7 @@ Properties on Targets /prop_tgt/TYPE /prop_tgt/VERSION /prop_tgt/VISIBILITY_INLINES_HIDDEN + /prop_tgt/VS_CONFIGURATION_TYPE /prop_tgt/VS_DESKTOP_EXTENSIONS_VERSION /prop_tgt/VS_DOTNET_REFERENCES /prop_tgt/VS_DOTNET_TARGET_FRAMEWORK_VERSION diff --git a/Help/prop_tgt/VS_CONFIGURATION_TYPE.rst b/Help/prop_tgt/VS_CONFIGURATION_TYPE.rst new file mode 100644 index 0000000..ff987ff --- /dev/null +++ b/Help/prop_tgt/VS_CONFIGURATION_TYPE.rst @@ -0,0 +1,10 @@ +VS_CONFIGURATION_TYPE +--------------------- + +Visual Studio project configuration type. + +Sets the ``ConfigurationType`` attribute for a generated Visual Studio project. +If this property is set, it overrides the default setting that is based on the +target type (e.g. ``StaticLibrary``, ``Application``, ...). + +Supported on :ref:`Visual Studio Generators` for VS 2010 and higher. diff --git a/Help/release/dev/vs-vcxproj-ConfigurationType.rst b/Help/release/dev/vs-vcxproj-ConfigurationType.rst new file mode 100644 index 0000000..46d05b4 --- /dev/null +++ b/Help/release/dev/vs-vcxproj-ConfigurationType.rst @@ -0,0 +1,6 @@ +vs-vcxproj-ConfigurationType +---------------------------- + +* :ref:`Visual Studio Generators` for VS 2010 and above learned a new + :prop_tgt:`VS_CONFIGURATION_TYPE` target property to specify a custom + project file type. diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index a664442..61d7855 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -696,43 +696,51 @@ void cmVisualStudio10TargetGenerator::WriteProjectConfigurationValues() i->c_str(), 1, " Label=\"Configuration\"", "\n"); std::string configType = ""; - switch(this->GeneratorTarget->GetType()) - { - case cmState::SHARED_LIBRARY: - case cmState::MODULE_LIBRARY: - configType += "DynamicLibrary"; - break; - case cmState::OBJECT_LIBRARY: - case cmState::STATIC_LIBRARY: - configType += "StaticLibrary"; - break; - case cmState::EXECUTABLE: - if(this->NsightTegra && - !this->GeneratorTarget->GetPropertyAsBool("ANDROID_GUI")) - { - // Android executables are .so too. + if (const char* vsConfigurationType = + this->GeneratorTarget->GetProperty("VS_CONFIGURATION_TYPE")) + { + configType += cmVS10EscapeXML(vsConfigurationType); + } + else + { + switch(this->GeneratorTarget->GetType()) + { + case cmState::SHARED_LIBRARY: + case cmState::MODULE_LIBRARY: configType += "DynamicLibrary"; - } - else - { - configType += "Application"; - } - break; - case cmState::UTILITY: - case cmState::GLOBAL_TARGET: - if(this->NsightTegra) - { - // Tegra-Android platform does not understand "Utility". + break; + case cmState::OBJECT_LIBRARY: + case cmState::STATIC_LIBRARY: configType += "StaticLibrary"; - } - else - { - configType += "Utility"; - } - break; - case cmState::UNKNOWN_LIBRARY: - case cmState::INTERFACE_LIBRARY: - break; + break; + case cmState::EXECUTABLE: + if(this->NsightTegra && + !this->GeneratorTarget->GetPropertyAsBool("ANDROID_GUI")) + { + // Android executables are .so too. + configType += "DynamicLibrary"; + } + else + { + configType += "Application"; + } + break; + case cmState::UTILITY: + case cmState::GLOBAL_TARGET: + if(this->NsightTegra) + { + // Tegra-Android platform does not understand "Utility". + configType += "StaticLibrary"; + } + else + { + configType += "Utility"; + } + break; + case cmState::UNKNOWN_LIBRARY: + case cmState::INTERFACE_LIBRARY: + break; + } } configType += "\n"; this->WriteString(configType.c_str(), 2); diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index 0a388c5..5bef629 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -236,6 +236,10 @@ if("${CMAKE_GENERATOR}" MATCHES "Visual Studio [^6]") add_RunCMake_test(SolutionGlobalSections) endif() +if("${CMAKE_GENERATOR}" MATCHES "Visual Studio ([^6789]|[6789][0-9])") + add_RunCMake_test(VS10Project) +endif() + if(XCODE_VERSION AND NOT "${XCODE_VERSION}" VERSION_LESS 3) add_RunCMake_test(XcodeProject -DXCODE_VERSION=${XCODE_VERSION}) endif() diff --git a/Tests/RunCMake/VS10Project/CMakeLists.txt b/Tests/RunCMake/VS10Project/CMakeLists.txt new file mode 100644 index 0000000..91baae7 --- /dev/null +++ b/Tests/RunCMake/VS10Project/CMakeLists.txt @@ -0,0 +1,3 @@ +cmake_minimum_required(VERSION 3.5.0) +project(${RunCMake_TEST} NONE) +include(${RunCMake_TEST}.cmake) diff --git a/Tests/RunCMake/VS10Project/RunCMakeTest.cmake b/Tests/RunCMake/VS10Project/RunCMakeTest.cmake new file mode 100644 index 0000000..cc2cc2e --- /dev/null +++ b/Tests/RunCMake/VS10Project/RunCMakeTest.cmake @@ -0,0 +1,2 @@ +include(RunCMake) +run_cmake(VsConfigurationType) diff --git a/Tests/RunCMake/VS10Project/VsConfigurationType-check.cmake b/Tests/RunCMake/VS10Project/VsConfigurationType-check.cmake new file mode 100644 index 0000000..4690970 --- /dev/null +++ b/Tests/RunCMake/VS10Project/VsConfigurationType-check.cmake @@ -0,0 +1,24 @@ +set(vcProjectFile "${RunCMake_TEST_BINARY_DIR}/foo.vcxproj") +if(NOT EXISTS "${vcProjectFile}") + set(RunCMake_TEST_FAILED "Project file ${vcProjectFile} does not exist.") + return() +endif() + +set(propertyFound FALSE) +file(STRINGS "${vcProjectFile}" lines) +foreach(line IN LISTS lines) + if(line MATCHES "^ *(.*)$") + set(propertyFound TRUE) + set(expectedValue "MyValue") + set(actualValue ${CMAKE_MATCH_1}) + if(NOT (${actualValue} STREQUAL ${expectedValue})) + set(RunCMake_TEST_FAILED "ConfigurationType \"${actualValue}\" differs from expected value \"${expectedValue}\".") + return() + endif() + endif() +endforeach() + +if(NOT propertyFound) + set(RunCMake_TEST_FAILED "Property ConfigurationType not found in project file.") + return() +endif() diff --git a/Tests/RunCMake/VS10Project/VsConfigurationType.cmake b/Tests/RunCMake/VS10Project/VsConfigurationType.cmake new file mode 100644 index 0000000..a73dfe8 --- /dev/null +++ b/Tests/RunCMake/VS10Project/VsConfigurationType.cmake @@ -0,0 +1,3 @@ +enable_language(CXX) +add_library(foo foo.cpp) +set_target_properties(foo PROPERTIES VS_CONFIGURATION_TYPE "MyValue") diff --git a/Tests/RunCMake/VS10Project/foo.cpp b/Tests/RunCMake/VS10Project/foo.cpp new file mode 100644 index 0000000..2fb55ee --- /dev/null +++ b/Tests/RunCMake/VS10Project/foo.cpp @@ -0,0 +1 @@ +void foo() { } ----------------------------------------------------------------------- Summary of changes: Help/manual/cmake-properties.7.rst | 1 + Help/prop_tgt/VS_CONFIGURATION_TYPE.rst | 10 +++ Help/release/dev/vs-vcxproj-ConfigurationType.rst | 6 ++ Source/cmVisualStudio10TargetGenerator.cxx | 78 +++++++++++--------- Tests/RunCMake/CMakeLists.txt | 4 + .../{AutoExportDll => VS10Project}/CMakeLists.txt | 2 +- Tests/RunCMake/VS10Project/RunCMakeTest.cmake | 2 + .../VS10Project/VsConfigurationType-check.cmake | 24 ++++++ .../RunCMake/VS10Project/VsConfigurationType.cmake | 3 + .../RunCMake/{XcodeProject => VS10Project}/foo.cpp | 0 10 files changed, 94 insertions(+), 36 deletions(-) create mode 100644 Help/prop_tgt/VS_CONFIGURATION_TYPE.rst create mode 100644 Help/release/dev/vs-vcxproj-ConfigurationType.rst copy Tests/RunCMake/{AutoExportDll => VS10Project}/CMakeLists.txt (62%) create mode 100644 Tests/RunCMake/VS10Project/RunCMakeTest.cmake create mode 100644 Tests/RunCMake/VS10Project/VsConfigurationType-check.cmake create mode 100644 Tests/RunCMake/VS10Project/VsConfigurationType.cmake copy Tests/RunCMake/{XcodeProject => VS10Project}/foo.cpp (100%) hooks/post-receive -- CMake From brad.king at kitware.com Fri Feb 26 14:34:02 2016 From: brad.king at kitware.com (Brad King) Date: Fri, 26 Feb 2016 14:34:02 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-301-gd7b1a40 Message-ID: <20160226193402.4E6FCE5E4E@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, next has been updated via d7b1a40b0f039ed46522d5c9f3c7c421833ba32c (commit) via 2f07b2c4ec7f60071b9e42bf2de909eb2529eac1 (commit) from dd764e11ffcb065779e6ca84e6ffa8435db7f681 (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=d7b1a40b0f039ed46522d5c9f3c7c421833ba32c commit d7b1a40b0f039ed46522d5c9f3c7c421833ba32c Merge: dd764e1 2f07b2c Author: Brad King AuthorDate: Fri Feb 26 14:34:01 2016 -0500 Commit: CMake Topic Stage CommitDate: Fri Feb 26 14:34:01 2016 -0500 Merge topic 'enable-ssl-automatically' into next 2f07b2c4 Automatically use OpenSSL by default on UNIX if it is available https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2f07b2c4ec7f60071b9e42bf2de909eb2529eac1 commit 2f07b2c4ec7f60071b9e42bf2de909eb2529eac1 Author: Brad King AuthorDate: Fri Feb 26 14:19:51 2016 -0500 Commit: Brad King CommitDate: Fri Feb 26 14:30:13 2016 -0500 Automatically use OpenSSL by default on UNIX if it is available Since https is almost ubiquitous nowadays we should support it by default whenever possible. When building our own curl, we already automatically enable SSL/TLS support on Windows and OS X by using the OS-native APIs. On UNIX platforms we need to use OpenSSL but have not done so by default before, leading to possible user confusion when https transfers fail later. Fix this by searching for OpenSSL quietly and enabling use of it automatically if it is found. diff --git a/CMakeLists.txt b/CMakeLists.txt index 9381f35..e4c4081 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -327,7 +327,14 @@ macro (CMAKE_BUILD_UTILITIES) if(CMAKE_TESTS_CDASH_SERVER) set(CMAKE_CURL_TEST_URL "${CMAKE_TESTS_CDASH_SERVER}/user.php") endif() - option(CMAKE_USE_OPENSSL "Use OpenSSL." OFF) + set(_CMAKE_USE_OPENSSL_DEFAULT OFF) + if(NOT DEFINED CMAKE_USE_OPENSSL AND NOT WIN32 AND NOT APPLE) + find_package(OpenSSL QUIET) + if(OPENSSL_FOUND) + set(_CMAKE_USE_OPENSSL_DEFAULT ON) + endif() + endif() + option(CMAKE_USE_OPENSSL "Use OpenSSL." ${_CMAKE_USE_OPENSSL_DEFAULT}) mark_as_advanced(CMAKE_USE_OPENSSL) if(CMAKE_USE_OPENSSL) set(CURL_CA_BUNDLE "" CACHE FILEPATH "Path to SSL CA Certificate Bundle") diff --git a/Help/release/dev/enable-ssl-automatically.rst b/Help/release/dev/enable-ssl-automatically.rst new file mode 100644 index 0000000..32726b4 --- /dev/null +++ b/Help/release/dev/enable-ssl-automatically.rst @@ -0,0 +1,8 @@ +enable-ssl-automatically +------------------------ + +* On UNIX platforms, when building CMake itself from source and not using a + system-provided libcurl, OpenSSL is now used by default if it is found on + the system. This enables SSL/TLS support for commands supporting network + communication via ``https``, such as :command:`file(DOWNLOAD)`, + :command:`file(UPLOAD)`, and :command:`ctest_submit`. ----------------------------------------------------------------------- Summary of changes: CMakeLists.txt | 9 ++++++++- Help/release/dev/enable-ssl-automatically.rst | 8 ++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 Help/release/dev/enable-ssl-automatically.rst hooks/post-receive -- CMake From kwrobot at kitware.com Sat Feb 27 00:01:07 2016 From: kwrobot at kitware.com (Kitware Robot) Date: Sat, 27 Feb 2016 00:01:07 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-152-g499be36 Message-ID: <20160227050107.77F48E5B1B@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 499be36a64e186a7426aae5ee4613b07a722827a (commit) from 6b0a664c1639b19ccc652a4be5f9824d0bf88e48 (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=499be36a64e186a7426aae5ee4613b07a722827a commit 499be36a64e186a7426aae5ee4613b07a722827a Author: Kitware Robot AuthorDate: Sat Feb 27 00:01:04 2016 -0500 Commit: Kitware Robot CommitDate: Sat Feb 27 00:01:04 2016 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index c307854..df67cc7 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 5) -set(CMake_VERSION_PATCH 20160226) +set(CMake_VERSION_PATCH 20160227) #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 Feb 28 00:01:06 2016 From: kwrobot at kitware.com (Kitware Robot) Date: Sun, 28 Feb 2016 00:01:06 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-153-gb500c98 Message-ID: <20160228050106.7AB9FE5E2E@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 b500c98c91ce1ca90d152daab81b5761a6c480ee (commit) from 499be36a64e186a7426aae5ee4613b07a722827a (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=b500c98c91ce1ca90d152daab81b5761a6c480ee commit b500c98c91ce1ca90d152daab81b5761a6c480ee Author: Kitware Robot AuthorDate: Sun Feb 28 00:01:03 2016 -0500 Commit: Kitware Robot CommitDate: Sun Feb 28 00:01:03 2016 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index df67cc7..ee5e22f 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 5) -set(CMake_VERSION_PATCH 20160227) +set(CMake_VERSION_PATCH 20160228) #set(CMake_VERSION_RC 1) ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From gjasny at googlemail.com Sun Feb 28 11:35:54 2016 From: gjasny at googlemail.com (Gregor Jasny) Date: Sun, 28 Feb 2016 11:35:54 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-305-g5be433e Message-ID: <20160228163554.B39B3E5CEE@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, next has been updated via 5be433e1cad0265f8e972c7a18f3f489878657fe (commit) via aa4b5ea60018e38683fc8960c2e3534845c44a02 (commit) via b500c98c91ce1ca90d152daab81b5761a6c480ee (commit) via 499be36a64e186a7426aae5ee4613b07a722827a (commit) from d7b1a40b0f039ed46522d5c9f3c7c421833ba32c (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=5be433e1cad0265f8e972c7a18f3f489878657fe commit 5be433e1cad0265f8e972c7a18f3f489878657fe Merge: d7b1a40 aa4b5ea Author: Gregor Jasny AuthorDate: Sun Feb 28 11:35:53 2016 -0500 Commit: CMake Topic Stage CommitDate: Sun Feb 28 11:35:53 2016 -0500 Merge topic 'xcode-regenerate-on-deleted-files' into next aa4b5ea6 Xcode: ReRunCMake even if files disappeared (#15992) b500c98c CMake Nightly Date Stamp 499be36a CMake Nightly Date Stamp https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aa4b5ea60018e38683fc8960c2e3534845c44a02 commit aa4b5ea60018e38683fc8960c2e3534845c44a02 Author: Gregor Jasny AuthorDate: Sun Feb 28 17:27:17 2016 +0100 Commit: Gregor Jasny CommitDate: Sun Feb 28 17:35:15 2016 +0100 Xcode: ReRunCMake even if files disappeared (#15992) diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index ef18729..7844611 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -603,7 +603,8 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile( for(std::vector::const_iterator i = lfiles.begin(); i != lfiles.end(); ++i) { - makefileStream << "\\\n" << this->ConvertToRelativeForMake(i->c_str()); + makefileStream << "\\\n" << "$(wildcard " + << this->ConvertToRelativeForMake(i->c_str()) << ")"; } makefileStream << "\n\t" << this->ConvertToRelativeForMake(cmSystemTools::GetCMakeCommand().c_str()) diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake index a07bbbe..274e13e 100644 --- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake +++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake @@ -298,3 +298,37 @@ set(CMAKE_RELATIVE_PATH_TOP_BINARY \"${RunCMake_TEST_BINARY_DIR}\") ) endfunction() run_cmake_depends() + +# test re-generation of project even if CMakeLists.txt files disappeared +if(UNIX) + # Use a single build tree for a few tests without cleaning. + set(RunCMake_TEST_BINARY_DIR + ${RunCMake_BINARY_DIR}/regenerate-project-build) + set(RunCMake_TEST_SOURCE_DIR + ${RunCMake_BINARY_DIR}/regenerate-project-source) + set(RunCMake_TEST_NO_CLEAN 1) + file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}") + file(REMOVE_RECURSE "${RunCMake_TEST_SOURCE_DIR}") + set(ProjectHeader [=[ + cmake_minimum_required(VERSION 3.5) + project(regenerate-project NONE) + ]=]) + + file(WRITE "${RunCMake_TEST_SOURCE_DIR}/CMakeLists.txt" "${ProjectHeader}" + "add_subdirectory(mysubdir)") + file(MAKE_DIRECTORY "${RunCMake_TEST_SOURCE_DIR}/mysubdir") + file(WRITE "${RunCMake_TEST_SOURCE_DIR}/mysubdir/CMakeLists.txt" "# empty") + + run_cmake(regenerate-project-create) + + # now we delete the subdirectory and adjust the CMakeLists.txt + file(REMOVE_RECURSE "${RunCMake_TEST_SOURCE_DIR}/mysubdir") + file(WRITE "${RunCMake_TEST_SOURCE_DIR}/CMakeLists.txt" "${ProjectHeader}") + + run_cmake_command(regenerate-project-should-work + ${CMAKE_COMMAND} --build "${RunCMake_TEST_BINARY_DIR}") + + unset(RunCMake_TEST_BINARY_DIR) + unset(RunCMake_TEST_SOURCE_DIR) + unset(RunCMake_TEST_NO_CLEAN) +endif() ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- Source/cmGlobalXCodeGenerator.cxx | 3 ++- Tests/RunCMake/CommandLine/RunCMakeTest.cmake | 34 +++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 2 deletions(-) hooks/post-receive -- CMake From kwrobot at kitware.com Mon Feb 29 00:01:08 2016 From: kwrobot at kitware.com (Kitware Robot) Date: Mon, 29 Feb 2016 00:01:08 -0500 (EST) Subject: [Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-154-g26d615a Message-ID: <20160229050108.BF4D5E5D1C@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 26d615ad9ff58e1cae3b605efeb0cd1b6823622a (commit) from b500c98c91ce1ca90d152daab81b5761a6c480ee (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=26d615ad9ff58e1cae3b605efeb0cd1b6823622a commit 26d615ad9ff58e1cae3b605efeb0cd1b6823622a Author: Kitware Robot AuthorDate: Mon Feb 29 00:01:04 2016 -0500 Commit: Kitware Robot CommitDate: Mon Feb 29 00:01:04 2016 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index ee5e22f..4f5eefe 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 5) -set(CMake_VERSION_PATCH 20160228) +set(CMake_VERSION_PATCH 20160229) #set(CMake_VERSION_RC 1) ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake From gjasny at googlemail.com Mon Feb 29 03:30:28 2016 From: gjasny at googlemail.com (Gregor Jasny) Date: Mon, 29 Feb 2016 03:30:28 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-307-g67e7b48 Message-ID: <20160229083028.7DC5CE5F02@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, next has been updated via 67e7b4843d0df72f6b50278970352c42852ead17 (commit) via b59d4aa65317e1c2292bd70d85e2de65fe773dec (commit) from 5be433e1cad0265f8e972c7a18f3f489878657fe (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=67e7b4843d0df72f6b50278970352c42852ead17 commit 67e7b4843d0df72f6b50278970352c42852ead17 Merge: 5be433e b59d4aa Author: Gregor Jasny AuthorDate: Mon Feb 29 03:30:27 2016 -0500 Commit: CMake Topic Stage CommitDate: Mon Feb 29 03:30:27 2016 -0500 Merge topic 'xcode-regenerate-on-deleted-files' into next b59d4aa6 Revert "Xcode: ReRunCMake even if files disappeared (#15992)" https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b59d4aa65317e1c2292bd70d85e2de65fe773dec commit b59d4aa65317e1c2292bd70d85e2de65fe773dec Author: Gregor Jasny AuthorDate: Mon Feb 29 09:29:50 2016 +0100 Commit: Gregor Jasny CommitDate: Mon Feb 29 09:29:50 2016 +0100 Revert "Xcode: ReRunCMake even if files disappeared (#15992)" Whitespace handling in paths is broken. This reverts commit aa4b5ea60018e38683fc8960c2e3534845c44a02. diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 7844611..ef18729 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -603,8 +603,7 @@ void cmGlobalXCodeGenerator::CreateReRunCMakeFile( for(std::vector::const_iterator i = lfiles.begin(); i != lfiles.end(); ++i) { - makefileStream << "\\\n" << "$(wildcard " - << this->ConvertToRelativeForMake(i->c_str()) << ")"; + makefileStream << "\\\n" << this->ConvertToRelativeForMake(i->c_str()); } makefileStream << "\n\t" << this->ConvertToRelativeForMake(cmSystemTools::GetCMakeCommand().c_str()) diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake index 274e13e..a07bbbe 100644 --- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake +++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake @@ -298,37 +298,3 @@ set(CMAKE_RELATIVE_PATH_TOP_BINARY \"${RunCMake_TEST_BINARY_DIR}\") ) endfunction() run_cmake_depends() - -# test re-generation of project even if CMakeLists.txt files disappeared -if(UNIX) - # Use a single build tree for a few tests without cleaning. - set(RunCMake_TEST_BINARY_DIR - ${RunCMake_BINARY_DIR}/regenerate-project-build) - set(RunCMake_TEST_SOURCE_DIR - ${RunCMake_BINARY_DIR}/regenerate-project-source) - set(RunCMake_TEST_NO_CLEAN 1) - file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}") - file(REMOVE_RECURSE "${RunCMake_TEST_SOURCE_DIR}") - set(ProjectHeader [=[ - cmake_minimum_required(VERSION 3.5) - project(regenerate-project NONE) - ]=]) - - file(WRITE "${RunCMake_TEST_SOURCE_DIR}/CMakeLists.txt" "${ProjectHeader}" - "add_subdirectory(mysubdir)") - file(MAKE_DIRECTORY "${RunCMake_TEST_SOURCE_DIR}/mysubdir") - file(WRITE "${RunCMake_TEST_SOURCE_DIR}/mysubdir/CMakeLists.txt" "# empty") - - run_cmake(regenerate-project-create) - - # now we delete the subdirectory and adjust the CMakeLists.txt - file(REMOVE_RECURSE "${RunCMake_TEST_SOURCE_DIR}/mysubdir") - file(WRITE "${RunCMake_TEST_SOURCE_DIR}/CMakeLists.txt" "${ProjectHeader}") - - run_cmake_command(regenerate-project-should-work - ${CMAKE_COMMAND} --build "${RunCMake_TEST_BINARY_DIR}") - - unset(RunCMake_TEST_BINARY_DIR) - unset(RunCMake_TEST_SOURCE_DIR) - unset(RunCMake_TEST_NO_CLEAN) -endif() ----------------------------------------------------------------------- Summary of changes: Source/cmGlobalXCodeGenerator.cxx | 3 +-- Tests/RunCMake/CommandLine/RunCMakeTest.cmake | 34 ------------------------- 2 files changed, 1 insertion(+), 36 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Mon Feb 29 11:50:28 2016 From: brad.king at kitware.com (Brad King) Date: Mon, 29 Feb 2016 11:50:28 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-309-gb5f27e7 Message-ID: <20160229165028.DC98AE5BC3@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, next has been updated via b5f27e7d852f5f64bfca2d7c6e1d068696d4372a (commit) via 995162da6266d139e42b3db819a7c85386f22d7a (commit) from 67e7b4843d0df72f6b50278970352c42852ead17 (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=b5f27e7d852f5f64bfca2d7c6e1d068696d4372a commit b5f27e7d852f5f64bfca2d7c6e1d068696d4372a Merge: 67e7b48 995162d Author: Brad King AuthorDate: Mon Feb 29 11:50:27 2016 -0500 Commit: CMake Topic Stage CommitDate: Mon Feb 29 11:50:27 2016 -0500 Merge topic 'enable-ssl-automatically' into next 995162da fixup! Automatically use OpenSSL by default on UNIX if it is available https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=995162da6266d139e42b3db819a7c85386f22d7a commit 995162da6266d139e42b3db819a7c85386f22d7a Author: Brad King AuthorDate: Mon Feb 29 11:50:09 2016 -0500 Commit: Brad King CommitDate: Mon Feb 29 11:50:09 2016 -0500 fixup! Automatically use OpenSSL by default on UNIX if it is available diff --git a/CMakeLists.txt b/CMakeLists.txt index e4c4081..787f319 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -328,7 +328,8 @@ macro (CMAKE_BUILD_UTILITIES) set(CMAKE_CURL_TEST_URL "${CMAKE_TESTS_CDASH_SERVER}/user.php") endif() set(_CMAKE_USE_OPENSSL_DEFAULT OFF) - if(NOT DEFINED CMAKE_USE_OPENSSL AND NOT WIN32 AND NOT APPLE) + if(NOT DEFINED CMAKE_USE_OPENSSL AND NOT WIN32 AND NOT APPLE + AND CMAKE_SYSTEM_NAME MATCHES "(Linux|FreeBSD)") find_package(OpenSSL QUIET) if(OPENSSL_FOUND) set(_CMAKE_USE_OPENSSL_DEFAULT ON) diff --git a/Help/release/dev/enable-ssl-automatically.rst b/Help/release/dev/enable-ssl-automatically.rst index 32726b4..8ded656 100644 --- a/Help/release/dev/enable-ssl-automatically.rst +++ b/Help/release/dev/enable-ssl-automatically.rst @@ -1,8 +1,8 @@ enable-ssl-automatically ------------------------ -* On UNIX platforms, when building CMake itself from source and not using a - system-provided libcurl, OpenSSL is now used by default if it is found on - the system. This enables SSL/TLS support for commands supporting network - communication via ``https``, such as :command:`file(DOWNLOAD)`, +* On Linux and FreeBSD platforms, when building CMake itself from source and + not using a system-provided libcurl, OpenSSL is now used by default if it is + found on the system. This enables SSL/TLS support for commands supporting + network communication via ``https``, such as :command:`file(DOWNLOAD)`, :command:`file(UPLOAD)`, and :command:`ctest_submit`. ----------------------------------------------------------------------- Summary of changes: CMakeLists.txt | 3 ++- Help/release/dev/enable-ssl-automatically.rst | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) hooks/post-receive -- CMake From brad.king at kitware.com Mon Feb 29 11:53:12 2016 From: brad.king at kitware.com (Brad King) Date: Mon, 29 Feb 2016 11:53:12 -0500 (EST) Subject: [Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-311-g84a28fb Message-ID: <20160229165312.E486BE5CD1@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, next has been updated via 84a28fb506bbb398eab98c3524c050adc43acd6d (commit) via 190a5fdffd8104ad613854bdd563a0a11dd88f63 (commit) from b5f27e7d852f5f64bfca2d7c6e1d068696d4372a (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=84a28fb506bbb398eab98c3524c050adc43acd6d commit 84a28fb506bbb398eab98c3524c050adc43acd6d Merge: b5f27e7 190a5fd Author: Brad King AuthorDate: Mon Feb 29 11:53:12 2016 -0500 Commit: CMake Topic Stage CommitDate: Mon Feb 29 11:53:12 2016 -0500 Merge topic 'enable-ssl-automatically' into next 190a5fdf Automatically use OpenSSL by default on Linux and FreeBSD if available https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=190a5fdffd8104ad613854bdd563a0a11dd88f63 commit 190a5fdffd8104ad613854bdd563a0a11dd88f63 Author: Brad King AuthorDate: Fri Feb 26 14:19:51 2016 -0500 Commit: Brad King CommitDate: Mon Feb 29 11:51:04 2016 -0500 Automatically use OpenSSL by default on Linux and FreeBSD if available Since https is almost ubiquitous nowadays we should support it by default whenever possible. When building our own curl, we already automatically enable SSL/TLS support on Windows and OS X by using the OS-native APIs. On UNIX platforms we need to use OpenSSL but have not done so by default before, leading to possible user confusion when https transfers fail later. Fix this by searching for OpenSSL quietly and enabling use of it automatically if it is found. Do this only on Linux and FreeBSD for now because on other UNIX platforms (e.g. AIX, HP-UX, SunOS) it seems too easy to find an OpenSSL that is not compatible with the target compiler. diff --git a/CMakeLists.txt b/CMakeLists.txt index 9381f35..787f319 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -327,7 +327,15 @@ macro (CMAKE_BUILD_UTILITIES) if(CMAKE_TESTS_CDASH_SERVER) set(CMAKE_CURL_TEST_URL "${CMAKE_TESTS_CDASH_SERVER}/user.php") endif() - option(CMAKE_USE_OPENSSL "Use OpenSSL." OFF) + set(_CMAKE_USE_OPENSSL_DEFAULT OFF) + if(NOT DEFINED CMAKE_USE_OPENSSL AND NOT WIN32 AND NOT APPLE + AND CMAKE_SYSTEM_NAME MATCHES "(Linux|FreeBSD)") + find_package(OpenSSL QUIET) + if(OPENSSL_FOUND) + set(_CMAKE_USE_OPENSSL_DEFAULT ON) + endif() + endif() + option(CMAKE_USE_OPENSSL "Use OpenSSL." ${_CMAKE_USE_OPENSSL_DEFAULT}) mark_as_advanced(CMAKE_USE_OPENSSL) if(CMAKE_USE_OPENSSL) set(CURL_CA_BUNDLE "" CACHE FILEPATH "Path to SSL CA Certificate Bundle") diff --git a/Help/release/dev/enable-ssl-automatically.rst b/Help/release/dev/enable-ssl-automatically.rst new file mode 100644 index 0000000..8ded656 --- /dev/null +++ b/Help/release/dev/enable-ssl-automatically.rst @@ -0,0 +1,8 @@ +enable-ssl-automatically +------------------------ + +* On Linux and FreeBSD platforms, when building CMake itself from source and + not using a system-provided libcurl, OpenSSL is now used by default if it is + found on the system. This enables SSL/TLS support for commands supporting + network communication via ``https``, such as :command:`file(DOWNLOAD)`, + :command:`file(UPLOAD)`, and :command:`ctest_submit`. ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake