[Cmake-commits] [cmake-commits] lowman committed FindBoost.cmake 1.24 1.25
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon Jan 19 01:02:48 EST 2009
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv11988
Modified Files:
FindBoost.cmake
Log Message:
BUG: Do not check for GCC version encoding in filenames on Boost libraries prior to 1.35. Eliminate "lib" prefix except on MSVC.
Index: FindBoost.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindBoost.cmake,v
retrieving revision 1.24
retrieving revision 1.25
diff -C 2 -d -r1.24 -r1.25
*** FindBoost.cmake 18 Jan 2009 22:19:54 -0000 1.24
--- FindBoost.cmake 19 Jan 2009 06:02:46 -0000 1.25
***************
*** 470,476 ****
# Setting some more suffixes for the library
SET (Boost_LIB_PREFIX "")
! IF ( WIN32 AND Boost_USE_STATIC_LIBS )
SET (Boost_LIB_PREFIX "lib")
! ENDIF ( WIN32 AND Boost_USE_STATIC_LIBS )
if (Boost_COMPILER)
--- 470,476 ----
# Setting some more suffixes for the library
SET (Boost_LIB_PREFIX "")
! if ( MSVC AND Boost_USE_STATIC_LIBS )
SET (Boost_LIB_PREFIX "lib")
! endif()
if (Boost_COMPILER)
***************
*** 482,485 ****
--- 482,488 ----
else(Boost_COMPILER)
# Attempt to guess the compiler suffix
+ # NOTE: this is not perfect yet, if you experience any issues
+ # please report them and use the Boost_COMPILER variable
+ # to work around the problems.
if (MSVC90)
SET (_boost_COMPILER "-vc90")
***************
*** 501,514 ****
endif()
elseif (MINGW)
! 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 (_boost_COMPILER "-mgw${_boost_COMPILER_VERSION}")
! elseif (UNIX)
! if (CMAKE_COMPILER_IS_GNUCC)
! # Determine which version of GCC we have.
EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
--- 504,510 ----
endif()
elseif (MINGW)
! if(${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} VERSION_LESS 1.34)
! SET(_boost_COMPILER "-mgw") # no GCC version encoding prior to 1.34
! else()
EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
***************
*** 517,539 ****
STRING(REGEX REPLACE "([0-9])\\.([0-9])(\\.[0-9])?" "\\1\\2"
_boost_COMPILER_VERSION ${_boost_COMPILER_VERSION})
! IF(APPLE)
! IF(Boost_MINOR_VERSION)
! 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(${Boost_MINOR_VERSION} GREATER 35)
! # In Boost <= 1.35.0, there is no mangled compiler name for
! # the Mac OS X/Darwin version of GCC.
SET(_boost_COMPILER "")
! ENDIF(${Boost_MINOR_VERSION} GREATER 35)
! ELSE(Boost_MINOR_VERSION)
! # We don't know the Boost version, so assume it's
! # pre-1.36.0.
! SET(_boost_COMPILER "")
! ENDIF(Boost_MINOR_VERSION)
! ELSE()
! SET (_boost_COMPILER "-gcc${_boost_COMPILER_VERSION}")
! ENDIF()
endif (CMAKE_COMPILER_IS_GNUCC)
endif()
--- 513,550 ----
STRING(REGEX REPLACE "([0-9])\\.([0-9])(\\.[0-9])?" "\\1\\2"
_boost_COMPILER_VERSION ${_boost_COMPILER_VERSION})
! SET (_boost_COMPILER "-mgw${_boost_COMPILER_VERSION}")
! endif()
! elseif (UNIX)
! if (CMAKE_COMPILER_IS_GNUCC)
! if(${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION} VERSION_LESS 1.34)
! SET(_boost_COMPILER "-gcc") # no GCC version encoding prior to 1.34
! else()
! # 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(Boost_MINOR_VERSION)
! 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(${Boost_MINOR_VERSION} GREATER 35)
! # In Boost <= 1.35.0, there is no mangled compiler name for
! # the Mac OS X/Darwin version of GCC.
! SET(_boost_COMPILER "")
! ENDIF(${Boost_MINOR_VERSION} GREATER 35)
! ELSE(Boost_MINOR_VERSION)
! # We don't know the Boost version, so assume it's
! # pre-1.36.0.
SET(_boost_COMPILER "")
! ENDIF(Boost_MINOR_VERSION)
! ELSE()
! SET (_boost_COMPILER "-gcc${_boost_COMPILER_VERSION}")
! ENDIF()
! endif()
endif (CMAKE_COMPILER_IS_GNUCC)
endif()
***************
*** 545,549 ****
SET (_boost_MULTITHREADED "-mt")
-
if( NOT Boost_USE_MULTITHREADED )
set (_boost_MULTITHREADED "")
--- 556,559 ----
***************
*** 565,569 ****
ENDIF(WIN32)
SET (_boost_ABI_TAG "${_boost_ABI_TAG}d")
-
if(Boost_DEBUG)
message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
--- 575,578 ----
More information about the Cmake-commits
mailing list