Bladeren bron

BUG: fix xcode depend issue and add a test for it

Bill Hoffman 17 jaren geleden
bovenliggende
commit
756cb547f3
2 gewijzigde bestanden met toevoegingen van 4 en 2 verwijderingen
  1. 1 1
      Source/cmGlobalXCodeGenerator.cxx
  2. 3 1
      Tests/BuildDepends/Project/CMakeLists.txt

+ 1 - 1
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();

+ 3 - 1
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})