diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2014-02-09 22:48:34 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-03-08 13:05:36 -0500 |
| commit | 84fdc9921cab35addba8c57cd201778de2cf87a4 (patch) | |
| tree | a43cc1d2782da4bd54734beb3fa5494048a08a18 /Source/CPack | |
| parent | f154475b65738444414312d7d5a255f3220d90c6 (diff) | |
| download | cmake-84fdc9921cab35addba8c57cd201778de2cf87a4.tar.gz | |
stringapi: Pass configuration names as strings
Diffstat (limited to 'Source/CPack')
| -rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index bed3891c04..4c52c9614a 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -623,7 +623,8 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( componentsVector.push_back(installComponent); } - const char* buildConfig = this->GetOption("CPACK_BUILD_CONFIG"); + const char* buildConfigCstr = this->GetOption("CPACK_BUILD_CONFIG"); + std::string buildConfig = buildConfigCstr ? buildConfigCstr : ""; cmGlobalGenerator* globalGenerator = this->MakefileMap->GetCMakeInstance()->CreateGlobalGenerator( cmakeGenerator); @@ -822,9 +823,9 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( << "'" << std::endl); } - if ( buildConfig && *buildConfig ) + if (!buildConfig.empty()) { - mf->AddDefinition("BUILD_TYPE", buildConfig); + mf->AddDefinition("BUILD_TYPE", buildConfig.c_str()); } std::string installComponentLowerCase = cmSystemTools::LowerCase(installComponent); |