diff options
| author | Brad King <brad.king@kitware.com> | 2011-02-22 19:31:26 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-02-22 19:31:26 (GMT) |
| commit | 554641f320dfaed924a8a0edd89d7a69cc3943f2 (patch) | |
| tree | d091a08ddd4965040a7a0e46435008d17ebef59c /Source | |
| parent | e0d0e879cf8d381ad1dfce6152aa4ab0459c5369 (diff) | |
| parent | e6221ed2c41de86020083c4d2af58c7b28d36bb0 (diff) | |
| download | CMake-554641f320dfaed924a8a0edd89d7a69cc3943f2.zip CMake-554641f320dfaed924a8a0edd89d7a69cc3943f2.tar.gz CMake-554641f320dfaed924a8a0edd89d7a69cc3943f2.tar.bz2 | |
Merge topic 'fix-8914-allow-config-types-override'
e6221ed Xcode: Allow override of CMAKE_CONFIGURATION_TYPES (#8914)
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index df679ea..d5c0fef 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -165,13 +165,16 @@ void cmGlobalXCodeGenerator::EnableLanguage(std::vector<std::string>const& } else { - mf->AddCacheDefinition( - "CMAKE_CONFIGURATION_TYPES", - "Debug;Release;MinSizeRel;RelWithDebInfo", - "Semicolon separated list of supported configuration types, " - "only supports Debug, Release, MinSizeRel, and RelWithDebInfo, " - "anything else will be ignored.", - cmCacheManager::STRING); + if(!mf->GetDefinition("CMAKE_CONFIGURATION_TYPES")) + { + mf->AddCacheDefinition( + "CMAKE_CONFIGURATION_TYPES", + "Debug;Release;MinSizeRel;RelWithDebInfo", + "Semicolon separated list of supported configuration types, " + "only supports Debug, Release, MinSizeRel, and RelWithDebInfo, " + "anything else will be ignored.", + cmCacheManager::STRING); + } } mf->AddDefinition("CMAKE_GENERATOR_CC", "gcc"); mf->AddDefinition("CMAKE_GENERATOR_CXX", "g++"); |