[Cmake-commits] CMake branch, master, updated. v3.14.1-577-g3d6d7c1

[Kitware Robot via Cmake-commits]

This is an automated email from 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  3d6d7c170ca9ad291a0deedd125b8f9ce82d15bb (commit)
  from  6fdba8b8beb6d971a3c2efe8973cdee970dfd40a (commit)

Those revisions listed 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=3d6d7c170ca9ad291a0deedd125b8f9ce82d15bb
commit 3d6d7c170ca9ad291a0deedd125b8f9ce82d15bb
Author: Kitware Robot 
AuthorDate: Thu Apr 4 00:01:07 2019 -0400
Commit: Kitware Robot 
CommitDate: Thu Apr 4 00:01:07 2019 -0400

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index f7c65f5..3ba392e 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -1,5 +1,5 @@
 # CMake version number components.
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MINOR 14)
-set(CMake_VERSION_PATCH 20190403)
+set(CMake_VERSION_PATCH 20190404)
 #set(CMake_VERSION_RC 1)

---

Summary of changes:
 Source/CMakeVersion.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, master, updated. v3.14.1-576-g6fdba8b

[Kitware Robot via Cmake-commits]

This is an automated email from 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  6fdba8b8beb6d971a3c2efe8973cdee970dfd40a (commit)
   via  058217669fdb089f652c68b9eb0a3231a7172c91 (commit)
   via  707283981fd455bf0bf3ec62a669cf1c0a2e1edb (commit)
   via  8ca1b262863d8a5cbb8306a52873101c2e940f78 (commit)
   via  37da6af17d0d2cc8b499dc58f74866351e06c288 (commit)
  from  d724060459f6adb5e7d99efde08c8fbacc4fdb5d (commit)

Those revisions listed 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=6fdba8b8beb6d971a3c2efe8973cdee970dfd40a
commit 6fdba8b8beb6d971a3c2efe8973cdee970dfd40a
Merge: 0582176 7072839
Author: Brad King 
AuthorDate: Wed Apr 3 18:06:38 2019 +
Commit: Kitware Robot 
CommitDate: Wed Apr 3 14:07:11 2019 -0400

Merge topic 'refactor-lang-flags'

707283981f VS: Use AddLanguageFlags to de-duplicate CMAKE__FLAGS* 
lookup
8ca1b26286 cmLocalGenerator: Factor IPO logic out of AddLanguageFlags

Acked-by: Kitware Robot 
Merge-request: !3177


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=058217669fdb089f652c68b9eb0a3231a7172c91
commit 058217669fdb089f652c68b9eb0a3231a7172c91
Merge: d724060 37da6af
Author: Brad King 
AuthorDate: Wed Apr 3 18:05:32 2019 +
Commit: Kitware Robot 
CommitDate: Wed Apr 3 14:05:57 2019 -0400

Merge topic 'find-dependency-fix-17583'

37da6af17d find_dependency: Always search dependencies

Acked-by: Kitware Robot 
Merge-request: !3161


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=707283981fd455bf0bf3ec62a669cf1c0a2e1edb
commit 707283981fd455bf0bf3ec62a669cf1c0a2e1edb
Author: Brad King 
AuthorDate: Mon Apr 1 13:38:55 2019 -0400
Commit: Brad King 
CommitDate: Tue Apr 2 14:23:46 2019 -0400

VS: Use AddLanguageFlags to de-duplicate CMAKE__FLAGS* lookup

diff --git a/Source/cmLocalVisualStudio7Generator.cxx 
b/Source/cmLocalVisualStudio7Generator.cxx
index e519d78..7ba3471 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -662,14 +662,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(
 langForClCompile = linkLanguage;
 if (langForClCompile == "C" || langForClCompile == "CXX" ||
 langForClCompile == "Fortran") {
-  std::string baseFlagVar = "CMAKE_";
-  baseFlagVar += langForClCompile;
-  baseFlagVar += "_FLAGS";
-  flags = this->Makefile->GetRequiredDefinition(baseFlagVar);
-  std::string flagVar =
-baseFlagVar + std::string("_") + cmSystemTools::UpperCase(configName);
-  flags += " ";
-  flags += this->Makefile->GetRequiredDefinition(flagVar);
+  this->AddLanguageFlags(flags, target, langForClCompile, configName);
 }
 // set the correct language
 if (linkLanguage == "C") {
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx 
b/Source/cmVisualStudio10TargetGenerator.cxx
index 8804e6c..5195957 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2540,14 +2540,8 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
   }
   this->LangForClCompile = langForClCompile;
   if (!langForClCompile.empty()) {
-std::string baseFlagVar = "CMAKE_";
-baseFlagVar += langForClCompile;
-baseFlagVar += "_FLAGS";
-flags = this->Makefile->GetRequiredDefinition(baseFlagVar);
-std::string flagVar =
-  baseFlagVar + "_" + cmSystemTools::UpperCase(configName);
-flags += " ";
-flags += this->Makefile->GetRequiredDefinition(flagVar);
+this->LocalGenerator->AddLanguageFlags(flags, this->GeneratorTarget,
+   langForClCompile, configName);
 this->LocalGenerator->AddCompileOptions(flags, this->GeneratorTarget,
 langForClCompile, configName);
   }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8ca1b262863d8a5cbb8306a52873101c2e940f78
commit 8ca1b262863d8a5cbb8306a52873101c2e940f78
Author: Brad King 
AuthorDate: Mon Apr 1 13:37:02 2019 -0400
Commit: Brad King 
CommitDate: Tue Apr 2 14:23:32 2019 -0400

cmLocalGenerator: Factor IPO logic out of AddLanguageFlags

The IPO flag logic was added to `AddLanguageFlags` based on my advice.
However, this method should really only be about `CMAKE__FLAGS*`
variables.  Move the IPO logic out to its call sites.

diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index af165f6..2fc6121 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1800,6 +1800,10 @@ void