kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Bill Hoffman 2009-02-19 11:51:24 -05:00
parent 6e87aa49e6
commit 756cb547f3
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmGlobalXCodeGenerator.cxx
View File

@ -2706,7 +2706,7 @@ cmGlobalXCodeGenerator::CreateXCodeDependHackTarget(
universal += ".build/"; universal += ".build/";
universal += configName; universal += configName;
universal += "/"; universal += "/";
universal += t->GetName(); universal += t->GetFullName(configName);
universal += ".build/Objects-normal/"; universal += ".build/Objects-normal/";
for( std::vector<std::string>::iterator arch = for( std::vector<std::string>::iterator arch =
this->Architectures.begin(); this->Architectures.begin();

4
Tests/BuildDepends/Project/CMakeLists.txt
View File

@ -1,7 +1,8 @@
cmake_minimum_required(VERSION 2.6) cmake_minimum_required(VERSION 2.6)
project(testRebuild) project(testRebuild)
set(CMAKE_OSX_ARCHITECTURES "ppc;i386")
add_library(foo STATIC ${testRebuild_BINARY_DIR}/foo.cxx) 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 # Add a generated header that regenerates when the generator is
# rebuilt. # rebuilt.
add_custom_command( add_custom_command(
@ -21,6 +22,7 @@ add_custom_command(
# changes. This should cause regen.h to be recreated also. # changes. This should cause regen.h to be recreated also.
add_executable(generator generator.cxx) add_executable(generator generator.cxx)
target_link_libraries(generator foo) target_link_libraries(generator foo)
set_target_properties(generator PROPERTIES OUTPUT_NAME "gen")
# Build an executable to drive the build and rebuild. # Build an executable to drive the build and rebuild.
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})