diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-07-06 20:04:49 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-07-06 20:04:49 (GMT) |
| commit | 5a71f83f7a23a683b6da7cca2735736db6318353 (patch) | |
| tree | 949f5578d23c0c6eff93bc430fd3b34bae38250b /Source/cmMakefileTargetGenerator.cxx | |
| parent | 9e9653713cf10727c05049da50dc153be237be30 (diff) | |
| download | CMake-5a71f83f7a23a683b6da7cca2735736db6318353.zip CMake-5a71f83f7a23a683b6da7cca2735736db6318353.tar.gz CMake-5a71f83f7a23a683b6da7cca2735736db6318353.tar.bz2 | |
BUG: Several fixes to handle bundle content on Mac OSX
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 0f1a087..5ca3bb8 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -309,8 +309,11 @@ void cmMakefileTargetGenerator::WriteObjectRuleFiles(cmSourceFile& source) this->ExtraContent.insert(obj); } this->Objects.push_back(obj); - std::string relativeObj = this->LocalGenerator->GetHomeRelativeOutputPath(); - relativeObj += obj; + + // TODO: Remove + //std::string relativeObj = this->LocalGenerator->GetHomeRelativeOutputPath(); + //relativeObj += obj; + // we compute some depends when writing the depend.make that we will also // use in the build.make, same with depMakeFile std::vector<std::string> depends; @@ -346,6 +349,10 @@ cmMakefileTargetGenerator this->WriteObjectDependRules(source, depends); std::string relativeObj = this->LocalGenerator->GetHomeRelativeOutputPath(); + if ( source.GetPropertyAsBool("MACOSX_CONTENT") ) + { + relativeObj = ""; + } relativeObj += obj; if(this->Makefile->GetDefinition("CMAKE_WINDOWS_OBJECT_PATH")) { |