diff options
| author | Brad King <brad.king@kitware.com> | 2016-06-09 13:18:26 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-06-09 13:18:26 (GMT) |
| commit | c21397b2df9470bde02d19175e393110871cee91 (patch) | |
| tree | 16fde701eb5e6e5a350ab821a4d6f2266abf99ff /Source/cmNinjaNormalTargetGenerator.cxx | |
| parent | 065bb0ffebb51c0a3b90e8be3958095afaf4231a (diff) | |
| parent | b0d3e693f1ab466451c7a0d17bbbdd3cae76e93a (diff) | |
| download | CMake-c21397b2df9470bde02d19175e393110871cee91.zip CMake-c21397b2df9470bde02d19175e393110871cee91.tar.gz CMake-c21397b2df9470bde02d19175e393110871cee91.tar.bz2 | |
Merge topic 'refactor-cmLocalGenerator-flags'
b0d3e693 cmLocalGenerator: Pass configuration to GetTargetFlags
Diffstat (limited to 'Source/cmNinjaNormalTargetGenerator.cxx')
| -rw-r--r-- | Source/cmNinjaNormalTargetGenerator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index 3e91545..60eb904 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -434,9 +434,9 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement() vars["TARGET_FILE"] = localGen.ConvertToOutputFormat(targetOutputReal, cmOutputConverter::SHELL); - localGen.GetTargetFlags(vars["LINK_LIBRARIES"], vars["FLAGS"], - vars["LINK_FLAGS"], frameworkPath, linkPath, - &genTarget, useWatcomQuote); + localGen.GetTargetFlags(this->GetConfigName(), vars["LINK_LIBRARIES"], + vars["FLAGS"], vars["LINK_FLAGS"], frameworkPath, + linkPath, &genTarget, useWatcomQuote); if (this->GetMakefile()->IsOn("CMAKE_SUPPORT_WINDOWS_EXPORT_ALL_SYMBOLS") && gt.GetType() == cmState::SHARED_LIBRARY) { if (gt.GetPropertyAsBool("WINDOWS_EXPORT_ALL_SYMBOLS")) { |