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

Merge topic 'xcode-object-dir' 

b237dbd Xcode: Fix object library references in multi-project trees (#13452)
This commit is contained in:
David Cole 2012-08-13 13:28:07 -04:00 committed by CMake Topic Stage
parent 0d28661999 b237dbd8c3
commit c1163632de
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmGlobalXCodeGenerator.cxx
View File

@ -3739,7 +3739,7 @@ cmGlobalXCodeGenerator
const char* configName = this->GetCMakeCFGIntDir(); const char* configName = this->GetCMakeCFGIntDir();
std::string dir = this->GetObjectsNormalDirectory( std::string dir = this->GetObjectsNormalDirectory(
this->CurrentProject, configName, gt->Target); "$(PROJECT_NAME)", configName, gt->Target);
if(this->XcodeVersion >= 21) if(this->XcodeVersion >= 21)
{ {
dir += "$(CURRENT_ARCH)/"; dir += "$(CURRENT_ARCH)/";

1
Tests/ObjectLibrary/A/CMakeLists.txt
View File

@ -1,3 +1,4 @@
project(ObjectLibraryA)
# Add -fPIC so objects can be used in shared libraries. # Add -fPIC so objects can be used in shared libraries.
# TODO: Need property for this. # TODO: Need property for this.
if(CMAKE_SHARED_LIBRARY_C_FLAGS AND NOT WATCOM) if(CMAKE_SHARED_LIBRARY_C_FLAGS AND NOT WATCOM)

1
Tests/ObjectLibrary/B/CMakeLists.txt
View File

@ -1,3 +1,4 @@
project(ObjectLibraryB)
if("${CMAKE_GENERATOR}" MATCHES "Visual Studio 6") if("${CMAKE_GENERATOR}" MATCHES "Visual Studio 6")
# VS 6 generator does not use per-target object locations. # VS 6 generator does not use per-target object locations.
set(vs6 _vs6) set(vs6 _vs6)