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

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

Browse Source 
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
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

3
Source/cmGlobalXCodeGenerator.cxx
View File

@ -164,6 +164,8 @@ void cmGlobalXCodeGenerator::EnableLanguage(std::vector<std::string>const&
{ {
} }
else else
{
if(!mf->GetDefinition("CMAKE_CONFIGURATION_TYPES"))
{ {
mf->AddCacheDefinition( mf->AddCacheDefinition(
"CMAKE_CONFIGURATION_TYPES", "CMAKE_CONFIGURATION_TYPES",
@ -173,6 +175,7 @@ void cmGlobalXCodeGenerator::EnableLanguage(std::vector<std::string>const&
"anything else will be ignored.", "anything else will be ignored.",
cmCacheManager::STRING); 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++");
mf->AddDefinition("CMAKE_GENERATOR_NO_COMPILER_ENV", "1"); mf->AddDefinition("CMAKE_GENERATOR_NO_COMPILER_ENV", "1");