BUG: Work around Boost 1.36.0 bug fix on Darwin by setting the mangled compiler name to -xgccVERSION
This commit is contained in:
parent
36b898ccf4
commit
c2a782a621
@ -364,25 +364,31 @@ ELSE (_boost_IN_CACHE)
|
|||||||
SET (_boost_COMPILER "-mgw${_boost_COMPILER_VERSION}")
|
SET (_boost_COMPILER "-mgw${_boost_COMPILER_VERSION}")
|
||||||
ENDIF(MINGW)
|
ENDIF(MINGW)
|
||||||
IF (UNIX)
|
IF (UNIX)
|
||||||
IF (APPLE)
|
IF (NOT CMAKE_COMPILER_IS_GNUCC)
|
||||||
# Due to a quirk in Boost.Build, there is no compiler name
|
# We assume that we have the Intel compiler.
|
||||||
# mangled into library names on Mac OS X/Darwin.
|
SET (_boost_COMPILER "-il")
|
||||||
SET (_boost_COMPILER "")
|
ELSE (NOT CMAKE_COMPILER_IS_GNUCC)
|
||||||
ELSE (APPLE)
|
# Determine which version of GCC we have.
|
||||||
IF (NOT CMAKE_COMPILER_IS_GNUCC)
|
EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
|
||||||
# We assume that we have the Intel compiler.
|
ARGS -dumpversion
|
||||||
SET (_boost_COMPILER "-il")
|
OUTPUT_VARIABLE _boost_COMPILER_VERSION
|
||||||
ELSE (NOT CMAKE_COMPILER_IS_GNUCC)
|
|
||||||
# Determine which version of GCC we have.
|
|
||||||
EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
|
|
||||||
ARGS -dumpversion
|
|
||||||
OUTPUT_VARIABLE _boost_COMPILER_VERSION
|
|
||||||
)
|
)
|
||||||
STRING(REGEX REPLACE "([0-9])\\.([0-9])\\.[0-9]" "\\1\\2"
|
STRING(REGEX REPLACE "([0-9])\\.([0-9])\\.[0-9]" "\\1\\2"
|
||||||
_boost_COMPILER_VERSION ${_boost_COMPILER_VERSION})
|
_boost_COMPILER_VERSION ${_boost_COMPILER_VERSION})
|
||||||
|
IF(APPLE)
|
||||||
|
IF (${Boost_MINOR_VERSION} GREATER 35)
|
||||||
|
# In Boost 1.36.0 and newer, the mangled compiler name used
|
||||||
|
# on Mac OS X/Darwin is "xgcc".
|
||||||
|
SET (_boost_COMPILER "-xgcc${_boost_COMPILER_VERSION}")
|
||||||
|
ELSE()
|
||||||
|
# In Boost <= 1.35.0, there is no mangled compiler name for
|
||||||
|
# the Mac OS X/Darwin version of GCC.
|
||||||
|
SET (_boost_COMPILER "")
|
||||||
|
ENDIF()
|
||||||
|
ELSE()
|
||||||
SET (_boost_COMPILER "-gcc${_boost_COMPILER_VERSION}")
|
SET (_boost_COMPILER "-gcc${_boost_COMPILER_VERSION}")
|
||||||
ENDIF (NOT CMAKE_COMPILER_IS_GNUCC)
|
ENDIF()
|
||||||
ENDIF (APPLE)
|
ENDIF (NOT CMAKE_COMPILER_IS_GNUCC)
|
||||||
ENDIF(UNIX)
|
ENDIF(UNIX)
|
||||||
|
|
||||||
SET (_boost_MULTITHREADED "-mt")
|
SET (_boost_MULTITHREADED "-mt")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user