This is an automated email from 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 fccc59c38c0bf56c21922fb1a79f0f3f653b2a1a (commit)
via ecee33c3ae2396a46e7576277a3db3872d28dda1 (commit)
via d2f20ab217c3e21bb573a3d4b1f90b1248f5b8b3 (commit)
via 96b10e47bef6b78f64172d39b40b0a9e27b4cfdf (commit)
from dd433c98e4297cc4b7bfeaa510f4c2cc84ea9da4 (commit)
Those revisions listed 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=fccc59c38c0bf56c21922fb1a79f0f3f653b2a1a
commit fccc59c38c0bf56c21922fb1a79f0f3f653b2a1a
Merge: ecee33c 96b10e4
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Jul 1 13:59:41 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Mon Jul 1 09:59:51 2019 -0400
Merge topic 'remove_unneeded_variables_from_cmFindPackageCommand'
96b10e47be Remove unused variables from cmFindPackageCommand
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3488
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ecee33c3ae2396a46e7576277a3db3872d28dda1
commit ecee33c3ae2396a46e7576277a3db3872d28dda1
Merge: dd433c9 d2f20ab
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Jul 1 13:52:50 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Mon Jul 1 09:54:19 2019 -0400
Merge topic 'override-rules-RC'
d2f20ab217 RC: Honor CMAKE_USER_MAKE_RULES_OVERRIDE
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3489
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d2f20ab217c3e21bb573a3d4b1f90b1248f5b8b3
commit d2f20ab217c3e21bb573a3d4b1f90b1248f5b8b3
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Jun 27 07:39:24 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Jun 27 07:39:24 2019 -0400
RC: Honor CMAKE_USER_MAKE_RULES_OVERRIDE
Since the refactoring in commit 48f7e2d300 (Unhardcode the
CMAKE_CONFIGURATION_TYPES values, 2017-11-27, v3.11.0-rc1~130^2~1),
`CMAKE_BUILD_TYPE` is initialized while enabling the RC language.
Therefore we need to honor `CMAKE_USER_MAKE_RULES_OVERRIDE`
as part of enabling RC so that a `CMAKE_BUILD_TYPE_INIT` setting
in the override file is honored.
Fixes: #19401
diff --git a/Modules/CMakeRCInformation.cmake b/Modules/CMakeRCInformation.cmake
index 7bf6567..7c3a5ab 100644
--- a/Modules/CMakeRCInformation.cmake
+++ b/Modules/CMakeRCInformation.cmake
@@ -17,6 +17,17 @@ set(CMAKE_SYSTEM_AND_RC_COMPILER_INFO_FILE
${CMAKE_ROOT}/Modules/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}.cmake)
include(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL)
+# This should be included before the _INIT variables are
+# used to initialize the cache. Since the rule variables
+# have if blocks on them, users can still define them here.
+# But, it should still be after the platform file so changes can
+# be made to those values.
+if(CMAKE_USER_MAKE_RULES_OVERRIDE)
+ # Save the full path of the file so try_compile can use it.
+ include(${CMAKE_USER_MAKE_RULES_OVERRIDE} RESULT_VARIABLE _override)
+ set(CMAKE_USER_MAKE_RULES_OVERRIDE "${_override}")
+endif()
+
set(CMAKE_RC_FLAGS_INIT "$ENV{RCFLAGS} ${CMAKE_RC_FLAGS_INIT}")
cmake_initialize_per_config_variable(CMAKE_RC_FLAGS "Flags for Windows
Resource Compiler")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=96b10e47bef6b78f64172d39b40b0a9e27b4cfdf
commit 96b10e47bef6b78f64172d39b40b0a9e27b4cfdf
Author: Robert Maynard <robert.mayn...@kitware.com>
AuthorDate: Wed Jun 26 16:06:21 2019 -0400
Commit: Robert Maynard <robert.mayn...@kitware.com>
CommitDate: Wed Jun 26 16:06:21 2019 -0400
Remove unused variables from cmFindPackageCommand
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 828488f..557069b 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -732,12 +732,6 @@ bool cmFindPackageCommand::HandlePackageMode(
{
this->ConsideredConfigs.clear();
- // Support old capitalization behavior.
- std::string upperDir = cmSystemTools::UpperCase(this->Name);
- std::string upperFound = cmSystemTools::UpperCase(this->Name);
- upperDir += "_DIR";
- upperFound += "_FOUND";
-
// Try to find the config file.
const char* def = this->Makefile->GetDefinition(this->Variable);
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeRCInformation.cmake | 11 +++++++++++
Source/cmFindPackageCommand.cxx | 6 ------
2 files changed, 11 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
