[Cmake-commits] [cmake-commits] dgregor committed FindBoost.cmake 1.12 1.13

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv29521

Modified Files:
	FindBoost.cmake 
Log Message:
BUG: Be more careful with Boost_MINOR_VERSION in FindBoost module


Index: FindBoost.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindBoost.cmake,v
retrieving revision 1.12
retrieving revision 1.13
diff -C 2 -d -r1.12 -r1.13
*** FindBoost.cmake	28 Jul 2008 18:33:40 -0000	1.12
--- FindBoost.cmake	28 Jul 2008 19:40:04 -0000	1.13
***************
*** 377,389 ****
          _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}")
--- 377,395 ----
          _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}")