Commit 1dda6a59 authored by Bill Hoffman's avatar Bill Hoffman
Browse files

BUG: fix xcode depend issue again on branch

parent 4a553b00
...@@ -354,7 +354,7 @@ ENDMACRO (CMAKE_BUILD_UTILITIES) ...@@ -354,7 +354,7 @@ ENDMACRO (CMAKE_BUILD_UTILITIES)
SET(CMake_VERSION_MAJOR 2) SET(CMake_VERSION_MAJOR 2)
SET(CMake_VERSION_MINOR 6) SET(CMake_VERSION_MINOR 6)
SET(CMake_VERSION_PATCH 3) SET(CMake_VERSION_PATCH 3)
SET(CMake_VERSION_RC 15) SET(CMake_VERSION_RC 16)
# CVS versions are odd, if this is an odd minor version # CVS versions are odd, if this is an odd minor version
# then set the CMake_VERSION_DATE variable # then set the CMake_VERSION_DATE variable
IF("${CMake_VERSION_MINOR}" MATCHES "[13579]$") IF("${CMake_VERSION_MINOR}" MATCHES "[13579]$")
......
Changes in CMake 2.6.3 RC 16
- Fix Xcode rebuild issue again...
Changes in CMake 2.6.3 RC 15 Changes in CMake 2.6.3 RC 15
- Fix Xcode rebuild issue with static libraries - Fix Xcode rebuild issue with static libraries
......
...@@ -2691,8 +2691,7 @@ cmGlobalXCodeGenerator::CreateXCodeDependHackTarget( ...@@ -2691,8 +2691,7 @@ cmGlobalXCodeGenerator::CreateXCodeDependHackTarget(
{ {
std::string universal = t->GetDirectory(); std::string universal = t->GetDirectory();
universal += "/"; universal += "/";
universal += universal += this->CurrentProject;
this->LocalGenerators[0]->GetMakefile()->GetProjectName();
universal += ".build/"; universal += ".build/";
universal += configName; universal += configName;
universal += "/"; universal += "/";
...@@ -2705,7 +2704,7 @@ cmGlobalXCodeGenerator::CreateXCodeDependHackTarget( ...@@ -2705,7 +2704,7 @@ cmGlobalXCodeGenerator::CreateXCodeDependHackTarget(
std::string universalFile = universal; std::string universalFile = universal;
universalFile += *arch; universalFile += *arch;
universalFile += "/"; universalFile += "/";
universalFile += t->GetName(); universalFile += t->GetFullName(configName);
makefileStream << "\t/bin/rm -f " makefileStream << "\t/bin/rm -f "
<< <<
this->ConvertToRelativeForMake(universalFile.c_str()) this->ConvertToRelativeForMake(universalFile.c_str())
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment