[Cmake-commits] [cmake-commits] lowman committed FindBoost.cmake 1.21 1.22

[cmake-commits at cmake.org]

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

Modified Files:
	FindBoost.cmake 
Log Message:
STYLE: minor cleanup


Index: FindBoost.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindBoost.cmake,v
retrieving revision 1.21
retrieving revision 1.22
diff -C 2 -d -r1.21 -r1.22
*** FindBoost.cmake	18 Jan 2009 20:41:18 -0000	1.21
--- FindBoost.cmake	18 Jan 2009 20:53:45 -0000	1.22
***************
*** 13,17 ****
  # the part of the actual library files that differ on different libraries. So
  # its "date_time" for "libboost_date_time...". Anything else will result in
! # errors.
  #
  # You can provide a minimum version number that should be used. If you provide this 
--- 13,18 ----
  # the part of the actual library files that differ on different libraries. So
  # its "date_time" for "libboost_date_time...". Anything else will result in
! # errors.  If you're using parts of Boost that contains header files only (e.g.
! # foreach) you do not need to specify COMPONENTS.
  #
  # You can provide a minimum version number that should be used. If you provide this 
***************
*** 101,112 ****
  #
  #  Boost_MAJOR_VERSION                  major version number of boost
- #
  #  Boost_MINOR_VERSION                  minor version number of boost
- #
  #  Boost_SUBMINOR_VERSION               subminor version number of boost
  #
! #  Boost_LIB_DIAGNOSTIC_DEFINITIONS     Only set on windows. Can be used with add_definitions 
! #                                       to print diagnostic information about the automatic 
! #                                       linking done on windows.
  
  # For each component you list the following variables are set.
--- 102,113 ----
  #
  #  Boost_MAJOR_VERSION                  major version number of boost
  #  Boost_MINOR_VERSION                  minor version number of boost
  #  Boost_SUBMINOR_VERSION               subminor version number of boost
  #
! #  Boost_LIB_DIAGNOSTIC_DEFINITIONS     [WIN32 Only] You can call
! #                                       add_definitions(${Boost_LIB_DIAGNOSTIC_DEFINTIIONS})
! #                                       to have diagnostic information about
! #                                       Boost's automatic linking outputted
! #                                       during compilation time.
  
  # For each component you list the following variables are set.
***************
*** 131,134 ****
--- 132,136 ----
  #  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
  #
+ 
  IF(NOT DEFINED Boost_USE_MULTITHREADED)
      SET(Boost_USE_MULTITHREADED TRUE)
***************
*** 284,291 ****
    # Need to search for boost
    if(Boost_DEBUG)
!       message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
!                      "boost not in cache")
!       message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
!                      "_boost_TEST_VERSIONS = ${_boost_TEST_VERSIONS}")
    endif()
  
--- 286,298 ----
    # Need to search for boost
    if(Boost_DEBUG)
!     message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
!                    "Boost not in cache")
!     # Output some of their choices
!     message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
!                    "_boost_TEST_VERSIONS = ${_boost_TEST_VERSIONS}")
!     message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
!                    "Boost_USE_MULTITHREADED = ${Boost_USE_MULTITHREADED}")
!     message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
!                    "Boost_USE_STATIC_LIBS = ${Boost_USE_STATIC_LIBS}")
    endif()
  
***************
*** 476,487 ****
      # Attempt to guess the compiler suffix
      SET (_boost_COMPILER "-gcc")
!     IF (MSVC90)
        SET (_boost_COMPILER "-vc90")
!     ELSEIF (MSVC80)
        SET (_boost_COMPILER "-vc80")
!     ELSEIF (MSVC71)
        SET (_boost_COMPILER "-vc71")
!     ENDIF(MSVC90)
!     IF (MINGW)
        EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
          ARGS -dumpversion
--- 483,495 ----
      # Attempt to guess the compiler suffix
      SET (_boost_COMPILER "-gcc")
!     if (MSVC90)
        SET (_boost_COMPILER "-vc90")
!     elseif (MSVC80)
        SET (_boost_COMPILER "-vc80")
!     elseif (MSVC71)
        SET (_boost_COMPILER "-vc71")
!     elseif (MSVC70) # Good luck!
!       SET (_boost_COMPILER "-vc70")
!     elseif (MINGW)
        EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
          ARGS -dumpversion
***************
*** 491,496 ****
          _boost_COMPILER_VERSION ${_boost_COMPILER_VERSION})
        SET (_boost_COMPILER "-mgw${_boost_COMPILER_VERSION}")
!     ENDIF(MINGW)
!     IF (UNIX)
        IF (NOT CMAKE_COMPILER_IS_GNUCC)
          # We assume that we have the Intel compiler.
--- 499,503 ----
          _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.
***************
*** 524,528 ****
          ENDIF()
        ENDIF (NOT CMAKE_COMPILER_IS_GNUCC)
!     ENDIF(UNIX)
      if(Boost_DEBUG)
        message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
--- 531,535 ----
          ENDIF()
        ENDIF (NOT CMAKE_COMPILER_IS_GNUCC)
!     endif()
      if(Boost_DEBUG)
        message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
***************
*** 533,539 ****
    SET (_boost_MULTITHREADED "-mt")
  
!   IF( NOT Boost_USE_MULTITHREADED )
!     SET (_boost_MULTITHREADED "")
!   ENDIF( NOT Boost_USE_MULTITHREADED )
    if(Boost_DEBUG)
      message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
--- 540,546 ----
    SET (_boost_MULTITHREADED "-mt")
  
!   if( NOT Boost_USE_MULTITHREADED )
!     set (_boost_MULTITHREADED "")
!   endif()
    if(Boost_DEBUG)
      message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
***************
*** 797,801 ****
        Boost_INCLUDE_DIRS
        Boost_LIBRARY_DIRS
-       Boost_USE_MULTITHREADED
    )
  ENDIF(_boost_IN_CACHE)
--- 804,807 ----