[Cmake-commits] [cmake-commits] lowman committed FindBoost.cmake 1.41 1.42

[cmake-commits at cmake.org]

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

Modified Files:
	FindBoost.cmake 
Log Message:
Add Boost 1.39 & 1.40.  Move ${Boost_INCLUDE_DIR}/lib to front of library search.


Index: FindBoost.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindBoost.cmake,v
retrieving revision 1.41
retrieving revision 1.42
diff -C 2 -d -r1.41 -r1.42
*** FindBoost.cmake	23 Jun 2009 20:40:50 -0000	1.41
--- FindBoost.cmake	20 Aug 2009 02:28:46 -0000	1.42
***************
*** 58,62 ****
  # Currently this module searches for the following version numbers:
  # 1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1, 1.35, 1.35.0, 1.35.1,
! # 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0, 1.38, 1.38.0
  #
  # NOTE: If you add a new major 1.x version in Boost_ADDITIONAL_VERSIONS you should
--- 58,63 ----
  # Currently this module searches for the following version numbers:
  # 1.33, 1.33.0, 1.33.1, 1.34, 1.34.0, 1.34.1, 1.35, 1.35.0, 1.35.1,
! # 1.36, 1.36.0, 1.36.1, 1.37, 1.37.0, 1.38, 1.38.0, 1.39, 1.39.0,
! # 1.40, 1.40.0
  #
  # NOTE: If you add a new major 1.x version in Boost_ADDITIONAL_VERSIONS you should
***************
*** 272,276 ****
    # versions, find those that are acceptable to the user request.
    set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
!     "1.38.0" "1.38" "1.37.0" "1.37"
      "1.36.1" "1.36.0" "1.36" "1.35.1" "1.35.0" "1.35" "1.34.1" "1.34.0"
      "1.34" "1.33.1" "1.33.0" "1.33")
--- 273,277 ----
    # versions, find those that are acceptable to the user request.
    set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
!     "1.40.0" "1.40" "1.39.0" "1.39" "1.38.0" "1.38" "1.37.0" "1.37"
      "1.36.1" "1.36.0" "1.36" "1.35.1" "1.35.0" "1.35" "1.34.1" "1.34.0"
      "1.34" "1.33.1" "1.33.0" "1.33")
***************
*** 637,645 ****
    
    SET(_boost_LIBRARIES_SEARCH_DIRS
      C:/boost/lib
      C:/boost
      "$ENV{ProgramFiles}/boost/boost_${Boost_MAJOR_VERSION}_${Boost_MINOR_VERSION}_${Boost_SUBMINOR_VERSION}/lib"
      "$ENV{ProgramFiles}/boost/boost_${Boost_MAJOR_VERSION}_${Boost_MINOR_VERSION}/lib"
-     ${Boost_INCLUDE_DIR}/lib
      "$ENV{ProgramFiles}/boost"
      /sw/local/lib
--- 638,646 ----
    
    SET(_boost_LIBRARIES_SEARCH_DIRS
+     ${Boost_INCLUDE_DIR}/lib
      C:/boost/lib
      C:/boost
      "$ENV{ProgramFiles}/boost/boost_${Boost_MAJOR_VERSION}_${Boost_MINOR_VERSION}_${Boost_SUBMINOR_VERSION}/lib"
      "$ENV{ProgramFiles}/boost/boost_${Boost_MAJOR_VERSION}_${Boost_MINOR_VERSION}/lib"
      "$ENV{ProgramFiles}/boost"
      /sw/local/lib