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

BUG: Propagate platform settings such as CMAKE_OSX_ARCHITECTURES to the try compile

Browse Source
This commit is contained in:
Andy Cedilnik 2007-03-02 11:33:37 -05:00
parent 971f9e4869
commit b9ab2b1932
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Modules/Platform/Darwin.cmake
View File

@ -97,3 +97,8 @@ SET(CMAKE_SYSTEM_APPBUNDLE_PATH
INCLUDE(Platform/UnixPaths) INCLUDE(Platform/UnixPaths)
SET(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SYSTEM_INCLUDE_PATH} /sw/include) SET(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SYSTEM_INCLUDE_PATH} /sw/include)
SET(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} /sw/lib) SET(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} /sw/lib)
IF(CMAKE_OSX_ARCHITECTURES)
SET(CMAKE_TRY_COMPILE_PLATFORM_OPTIONS "${CMAKE_TRY_COMPILE_PLATFORM_OPTIONS}
SET(CMAKE_OSX_ARCHITECTURES \"${CMAKE_OSX_ARCHITECTURES}\")")
ENDIF(CMAKE_OSX_ARCHITECTURES)

5
Source/cmTryCompileCommand.cxx
View File

@ -204,6 +204,11 @@ int cmTryCompileCommand::CoreTryCompileCode(
} }
fprintf(fout, ")\n"); fprintf(fout, ")\n");
} }
const char* platformOptions = mf->GetDefinition("CMAKE_TRY_COMPILE_PLATFORM_OPTIONS");
if ( platformOptions )
{
fprintf(fout, "%s\n", platformOptions);
}
fprintf(fout, "ADD_EXECUTABLE(cmTryCompileExec \"%s\")\n",source.c_str()); fprintf(fout, "ADD_EXECUTABLE(cmTryCompileExec \"%s\")\n",source.c_str());
fprintf(fout, fprintf(fout,