kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'fix-8914-allow-config-types-override' 

e6221ed Xcode: Allow override of CMAKE_CONFIGURATION_TYPES (#8914)
This commit is contained in:
Brad King 2011-02-22 14:31:26 -05:00 committed by CMake Topic Stage
parent e0d0e879cf e6221ed2c4
commit 554641f320
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/cmGlobalXCodeGenerator.cxx
View File

@ -165,13 +165,16 @@ void cmGlobalXCodeGenerator::EnableLanguage(std::vector<std::string>const&
} }
else else
{ {
mf->AddCacheDefinition( if(!mf->GetDefinition("CMAKE_CONFIGURATION_TYPES"))
"CMAKE_CONFIGURATION_TYPES", {
"Debug;Release;MinSizeRel;RelWithDebInfo", mf->AddCacheDefinition(
"Semicolon separated list of supported configuration types, " "CMAKE_CONFIGURATION_TYPES",
"only supports Debug, Release, MinSizeRel, and RelWithDebInfo, " "Debug;Release;MinSizeRel;RelWithDebInfo",
"anything else will be ignored.", "Semicolon separated list of supported configuration types, "
cmCacheManager::STRING); "only supports Debug, Release, MinSizeRel, and RelWithDebInfo, "
"anything else will be ignored.",
cmCacheManager::STRING);
}
} }
mf->AddDefinition("CMAKE_GENERATOR_CC", "gcc"); mf->AddDefinition("CMAKE_GENERATOR_CC", "gcc");
mf->AddDefinition("CMAKE_GENERATOR_CXX", "g++"); mf->AddDefinition("CMAKE_GENERATOR_CXX", "g++");