diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2007-03-02 16:33:37 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2007-03-02 16:33:37 (GMT) |
| commit | b9ab2b1932b08fb98308de6b271fcbca3ce313e2 (patch) | |
| tree | 6dfd795df2d00b8581e20b1bba77fc10760d78a9 | |
| parent | 971f9e48691dc372c6c99ab4a128891ffc5402d4 (diff) | |
| download | CMake-b9ab2b1932b08fb98308de6b271fcbca3ce313e2.zip CMake-b9ab2b1932b08fb98308de6b271fcbca3ce313e2.tar.gz CMake-b9ab2b1932b08fb98308de6b271fcbca3ce313e2.tar.bz2 | |
BUG: Propagate platform settings such as CMAKE_OSX_ARCHITECTURES to the try compile
| -rw-r--r-- | Modules/Platform/Darwin.cmake | 5 | ||||
| -rw-r--r-- | Source/cmTryCompileCommand.cxx | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake index 035e37c..da11540 100644 --- a/Modules/Platform/Darwin.cmake +++ b/Modules/Platform/Darwin.cmake @@ -97,3 +97,8 @@ SET(CMAKE_SYSTEM_APPBUNDLE_PATH INCLUDE(Platform/UnixPaths) SET(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SYSTEM_INCLUDE_PATH} /sw/include) 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) diff --git a/Source/cmTryCompileCommand.cxx b/Source/cmTryCompileCommand.cxx index d299162..9109ae0 100644 --- a/Source/cmTryCompileCommand.cxx +++ b/Source/cmTryCompileCommand.cxx @@ -204,6 +204,11 @@ int cmTryCompileCommand::CoreTryCompileCode( } 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, |