diff options
| author | Philip Lowman <philip@yhbt.com> | 2009-01-18 22:19:54 (GMT) |
|---|---|---|
| committer | Philip Lowman <philip@yhbt.com> | 2009-01-18 22:19:54 (GMT) |
| commit | f7ba5a7fc8b0dfce95c5b6f6d59d441c1b986d49 (patch) | |
| tree | aac3353cd155fbfbb5589d86f5c6a02298d871e3 /Modules/FindBoost.cmake | |
| parent | ee91442a9046cfc4e0996543f1b4d1dc4de5541f (diff) | |
| download | CMake-f7ba5a7fc8b0dfce95c5b6f6d59d441c1b986d49.zip CMake-f7ba5a7fc8b0dfce95c5b6f6d59d441c1b986d49.tar.gz CMake-f7ba5a7fc8b0dfce95c5b6f6d59d441c1b986d49.tar.bz2 | |
BUG: Fixed additional issues with autodetecting compiler tags properly including Issue #6926
Diffstat (limited to 'Modules/FindBoost.cmake')
| -rw-r--r-- | Modules/FindBoost.cmake | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index f9f0a8b..b59f109 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -477,11 +477,10 @@ ELSE (_boost_IN_CACHE) set(_boost_COMPILER ${Boost_COMPILER}) if(Boost_DEBUG) message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " - "using user-specified _boost_COMPILER = ${_boost_COMPILER}") + "using user-specified Boost_COMPILER = ${_boost_COMPILER}") endif() else(Boost_COMPILER) # Attempt to guess the compiler suffix - SET (_boost_COMPILER "-gcc") if (MSVC90) SET (_boost_COMPILER "-vc90") elseif (MSVC80) @@ -489,20 +488,27 @@ ELSE (_boost_IN_CACHE) elseif (MSVC71) SET (_boost_COMPILER "-vc71") elseif (MSVC70) # Good luck! - SET (_boost_COMPILER "-vc70") + SET (_boost_COMPILER "-vc7") # yes, this is correct + elseif (MSVC60) # Good luck! + SET (_boost_COMPILER "-vc6") # yes, this is correct + elseif (BORLAND) + SET (_boost_COMPILER "-bcb") + elseif("${CMAKE_CXX_COMPILER}" MATCHES "icl") + if(WIN32) + set (_boost_COMPILER "-iw") + else() + set (_boost_COMPILER "-il") + endif() elseif (MINGW) EXEC_PROGRAM(${CMAKE_CXX_COMPILER} - ARGS -dumpversion + ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion OUTPUT_VARIABLE _boost_COMPILER_VERSION ) STRING(REGEX REPLACE "([0-9])\\.([0-9])(\\.[0-9])?" "\\1\\2" _boost_COMPILER_VERSION ${_boost_COMPILER_VERSION}) SET (_boost_COMPILER "-mgw${_boost_COMPILER_VERSION}") elseif (UNIX) - IF (NOT CMAKE_COMPILER_IS_GNUCC) - # We assume that we have the Intel compiler. - SET (_boost_COMPILER "-il") - ELSE (NOT CMAKE_COMPILER_IS_GNUCC) + if (CMAKE_COMPILER_IS_GNUCC) # Determine which version of GCC we have. EXEC_PROGRAM(${CMAKE_CXX_COMPILER} ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion @@ -529,7 +535,7 @@ ELSE (_boost_IN_CACHE) ELSE() SET (_boost_COMPILER "-gcc${_boost_COMPILER_VERSION}") ENDIF() - ENDIF (NOT CMAKE_COMPILER_IS_GNUCC) + endif (CMAKE_COMPILER_IS_GNUCC) endif() if(Boost_DEBUG) message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] " |