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

BUG: Missing "icpc" as a possible CXX compiler for Intel C++. Also refactored 

gcc -dumpversion code and regex to a function.
This commit is contained in:
Philip Lowman 2009-01-19 21:30:04 -05:00
parent 9aaa9f7529
commit 4dae139ad4
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Modules/FindBoost.cmake
View File

@ -265,6 +265,23 @@ MACRO (_Boost_ADJUST_LIB_VARS basename)
) )
ENDMACRO (_Boost_ADJUST_LIB_VARS) ENDMACRO (_Boost_ADJUST_LIB_VARS)
#
# Runs compiler with "-dumpversion" and parses major/minor
# version with a regex.
#
FUNCTION(_Boost_COMPILER_DUMPVERSION _OUTPUT_VERSION)
EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
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(${_OUTPUT_VERSION} ${_boost_COMPILER_VERSION} PARENT_SCOPE)
ENDFUNCTION()
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -513,7 +530,8 @@ ELSE (_boost_IN_CACHE)
SET (_boost_COMPILER "-vc6") # yes, this is correct SET (_boost_COMPILER "-vc6") # yes, this is correct
elseif (BORLAND) elseif (BORLAND)
SET (_boost_COMPILER "-bcb") SET (_boost_COMPILER "-bcb")
elseif("${CMAKE_CXX_COMPILER}" MATCHES "icl") elseif("${CMAKE_CXX_COMPILER}" MATCHES "icl"
OR "${CMAKE_CXX_COMPILER}" MATCHES "icpc")
if(WIN32) if(WIN32)
set (_boost_COMPILER "-iw") set (_boost_COMPILER "-iw")
else() else()
@ -523,12 +541,7 @@ ELSE (_boost_IN_CACHE)
if(${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} VERSION_LESS 1.34) if(${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} VERSION_LESS 1.34)
SET(_boost_COMPILER "-mgw") # no GCC version encoding prior to 1.34 SET(_boost_COMPILER "-mgw") # no GCC version encoding prior to 1.34
else() else()
EXEC_PROGRAM(${CMAKE_CXX_COMPILER} _Boost_COMPILER_DUMPVERSION(_boost_COMPILER_VERSION)
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}") SET (_boost_COMPILER "-mgw${_boost_COMPILER_VERSION}")
endif() endif()
elseif (UNIX) elseif (UNIX)
@ -536,13 +549,8 @@ ELSE (_boost_IN_CACHE)
if(${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} VERSION_LESS 1.34) if(${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} VERSION_LESS 1.34)
SET(_boost_COMPILER "-gcc") # no GCC version encoding prior to 1.34 SET(_boost_COMPILER "-gcc") # no GCC version encoding prior to 1.34
else() else()
_Boost_COMPILER_DUMPVERSION(_boost_COMPILER_VERSION)
# Determine which version of GCC we have. # Determine which version of GCC we have.
EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
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})
IF(APPLE) IF(APPLE)
IF(Boost_MINOR_VERSION) IF(Boost_MINOR_VERSION)
IF(${Boost_MINOR_VERSION} GREATER 35) IF(${Boost_MINOR_VERSION} GREATER 35)