[Cmake-commits] CMake branch, next, updated. v3.6.2-2100-g48c68b9

[Brad King]

This is an automated email from 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  48c68b9b5e6a1be92dcaaab66a53d11643ecb7b2 (commit)
       via  a098ca0d7ac25455a9a1304ecedb8fd8790c6ca7 (commit)
       via  d9c600c504408c79393b9f5b4e334cecca30e67a (commit)
       via  3bb18e708da186927f59bbc94875e27b57278fcf (commit)
      from  cafd74b307f291f13ac950a3cb671c758676f0ad (commit)

Those revisions listed 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=48c68b9b5e6a1be92dcaaab66a53d11643ecb7b2
commit 48c68b9b5e6a1be92dcaaab66a53d11643ecb7b2
Merge: cafd74b a098ca0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 16 10:06:27 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 16 10:06:27 2016 -0400

    Merge topic 'find-package-mode-fixes' into next
    
    a098ca0d cmake: Fix --find-package mode link line output
    d9c600c5 cmGlobalGenerator: Fix use of uninitialized value in --find-package mode
    3bb18e70 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a098ca0d7ac25455a9a1304ecedb8fd8790c6ca7
commit a098ca0d7ac25455a9a1304ecedb8fd8790c6ca7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 16 09:49:25 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 16 10:03:15 2016 -0400

    cmake: Fix --find-package mode link line output
    
    Refactoring in commit v2.8.10~58^2~2 (Ninja: move -LIBPATH behind -link
    option, 2012-09-26) added arguments to cmLocalGenerator::GetTargetFlags
    and updated the call sites.  However, in the cmake::FindPackage and
    cmLocalGenerator::AddBuildTargetRule call sites it added the new
    arguments in the wrong order.  The latter was never used and has been
    removed.  The former remains buggy and prints out compiler flags instead
    of the link framework/library search paths.  Fix its argument order.

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 18a7894..112a5f7 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -595,8 +595,8 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
     gg->CreateGenerationObjects();
     cmGeneratorTarget* gtgt = gg->FindGeneratorTarget(tgt->GetName());
     cmLocalGenerator* lg = gtgt->GetLocalGenerator();
-    lg->GetTargetFlags(buildType, linkLibs, frameworkPath, linkPath, flags,
-                       linkFlags, gtgt, false);
+    lg->GetTargetFlags(buildType, linkLibs, flags, linkFlags, frameworkPath,
+                       linkPath, gtgt, false);
     linkLibs = frameworkPath + linkPath + linkLibs;
 
     printf("%s\n", linkLibs.c_str());

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d9c600c504408c79393b9f5b4e334cecca30e67a
commit d9c600c504408c79393b9f5b4e334cecca30e67a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 16 09:25:41 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 16 09:25:41 2016 -0400

    cmGlobalGenerator: Fix use of uninitialized value in --find-package mode

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index e85d80e..3d2b60e 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -94,6 +94,7 @@ cmGlobalGenerator::cmGlobalGenerator(cmake* cm)
   this->TryCompileOuterMakefile = CM_NULLPTR;
 
   this->ConfigureDoneCMP0026AndCMP0024 = false;
+  this->FirstTimeProgress = 0.0f;
 
   cm->GetState()->SetMinGWMake(false);
   cm->GetState()->SetMSYSShell(false);

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake    |    2 +-
 Source/cmGlobalGenerator.cxx |    1 +
 Source/cmake.cxx             |    4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake