diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2009-02-18 12:40:26 -0500 |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2009-02-18 12:40:26 -0500 |
| commit | 4a553b00fbbe8f95f51f010ef45346da1a3dedfa (patch) | |
| tree | 2099631b84d35d2fe12e5dd43f4184e7e79a859f | |
| parent | d65a8be4d04cc0440ad28f6075487e90c9b70021 (diff) | |
| download | cmake-4a553b00fbbe8f95f51f010ef45346da1a3dedfa.tar.gz | |
ENH: put in fix for Xcode rebuild issue on branch
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ChangeLog.manual | 3 | ||||
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e5f5890ba1..272e924419 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -354,7 +354,7 @@ ENDMACRO (CMAKE_BUILD_UTILITIES) SET(CMake_VERSION_MAJOR 2) SET(CMake_VERSION_MINOR 6) SET(CMake_VERSION_PATCH 3) -SET(CMake_VERSION_RC 14) +SET(CMake_VERSION_RC 15) # CVS versions are odd, if this is an odd minor version # then set the CMake_VERSION_DATE variable IF("${CMake_VERSION_MINOR}" MATCHES "[13579]$") diff --git a/ChangeLog.manual b/ChangeLog.manual index 0f2f4b15a2..26802d1492 100644 --- a/ChangeLog.manual +++ b/ChangeLog.manual @@ -1,3 +1,6 @@ +Changes in CMake 2.6.3 RC 15 +- Fix Xcode rebuild issue with static libraries + Changes in CMake 2.6.3 RC 14 - Take cmake-gui out of beta for windows installer diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index c749321c9c..46564147cd 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -2691,7 +2691,8 @@ cmGlobalXCodeGenerator::CreateXCodeDependHackTarget( { std::string universal = t->GetDirectory(); universal += "/"; - universal += this->CurrentMakefile->GetProjectName(); + universal += + this->LocalGenerators[0]->GetMakefile()->GetProjectName(); universal += ".build/"; universal += configName; universal += "/"; |