diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2009-02-19 16:51:24 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2009-02-19 16:51:24 (GMT) |
| commit | 756cb547f3c9462ce4c2276160a73cc174bcd2b0 (patch) | |
| tree | c50fe68c87a0a14193a490ec7ab507ebeabbb4bd | |
| parent | 6e87aa49e677bcfa87ed86e4b3a7b1c8d9ce4814 (diff) | |
| download | CMake-756cb547f3c9462ce4c2276160a73cc174bcd2b0.zip CMake-756cb547f3c9462ce4c2276160a73cc174bcd2b0.tar.gz CMake-756cb547f3c9462ce4c2276160a73cc174bcd2b0.tar.bz2 | |
BUG: fix xcode depend issue and add a test for it
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 2 | ||||
| -rw-r--r-- | Tests/BuildDepends/Project/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index f110c20..db1d78f 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -2706,7 +2706,7 @@ cmGlobalXCodeGenerator::CreateXCodeDependHackTarget( universal += ".build/"; universal += configName; universal += "/"; - universal += t->GetName(); + universal += t->GetFullName(configName); universal += ".build/Objects-normal/"; for( std::vector<std::string>::iterator arch = this->Architectures.begin(); diff --git a/Tests/BuildDepends/Project/CMakeLists.txt b/Tests/BuildDepends/Project/CMakeLists.txt index 23aac4d..a8bb445 100644 --- a/Tests/BuildDepends/Project/CMakeLists.txt +++ b/Tests/BuildDepends/Project/CMakeLists.txt @@ -1,7 +1,8 @@ cmake_minimum_required(VERSION 2.6) project(testRebuild) +set(CMAKE_OSX_ARCHITECTURES "ppc;i386") add_library(foo STATIC ${testRebuild_BINARY_DIR}/foo.cxx) - +set_target_properties(foo PROPERTIES OUTPUT_NAME "foolib") # Add a generated header that regenerates when the generator is # rebuilt. add_custom_command( @@ -21,6 +22,7 @@ add_custom_command( # changes. This should cause regen.h to be recreated also. add_executable(generator generator.cxx) target_link_libraries(generator foo) +set_target_properties(generator PROPERTIES OUTPUT_NAME "gen") # Build an executable to drive the build and rebuild. include_directories(${CMAKE_CURRENT_BINARY_DIR}) |