diff options
| author | Brad King <brad.king@kitware.com> | 2016-09-19 12:55:03 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-09-19 12:55:03 (GMT) |
| commit | b4ea74c5ca58d4327823c78dce1b6906fda72c7e (patch) | |
| tree | a31c9108c62c748cc30bbc81321a0a867d1fe054 | |
| parent | 009bb0139deb32d7ab9d08f15a7364b4c37c5960 (diff) | |
| parent | a098ca0d7ac25455a9a1304ecedb8fd8790c6ca7 (diff) | |
| download | CMake-b4ea74c5ca58d4327823c78dce1b6906fda72c7e.zip CMake-b4ea74c5ca58d4327823c78dce1b6906fda72c7e.tar.gz CMake-b4ea74c5ca58d4327823c78dce1b6906fda72c7e.tar.bz2 | |
Merge topic 'find-package-mode-fixes'
a098ca0d cmake: Fix --find-package mode link line output
d9c600c5 cmGlobalGenerator: Fix use of uninitialized value in --find-package mode
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 1 | ||||
| -rw-r--r-- | Source/cmake.cxx | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 64c9870..ed73450 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); 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()); |