[Cmake-commits] [cmake-commits] lowman committed FindBoost.cmake 1.48 1.49

[cmake-commits at cmake.org]

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

Modified Files:
	FindBoost.cmake 
Log Message:
Fix Issue #9792, remove superfluous output when not searching for COMPONENTS, add 1.41 to the search


Index: FindBoost.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindBoost.cmake,v
retrieving revision 1.48
retrieving revision 1.49
diff -C 2 -d -r1.48 -r1.49
*** FindBoost.cmake	22 Oct 2009 01:34:24 -0000	1.48
--- FindBoost.cmake	5 Jan 2010 05:55:14 -0000	1.49
***************
*** 64,68 ****
  # 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
--- 64,68 ----
  # 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, 1.41, 1.41.0
  #
  # NOTE: If you add a new major 1.x version in Boost_ADDITIONAL_VERSIONS you should
***************
*** 266,269 ****
--- 266,280 ----
  
  #
+ # A convenience function for marking desired components
+ # as found or not
+ #
+ function(_Boost_MARK_COMPONENTS_FOUND _yes_or_no)
+   foreach(COMPONENT ${Boost_FIND_COMPONENTS})
+     string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
+     set(Boost_${UPPERCOMPONENT}_FOUND ${_yes_or_no} CACHE INTERNAL "Whether the Boost ${COMPONENT} library found" FORCE)
+   endforeach()
+ endfunction()
+ 
+ #
  # End functions/macros
  #  
***************
*** 287,291 ****
    # 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")
--- 298,302 ----
    # versions, find those that are acceptable to the user request.
    set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
!     "1.41.0" "1.41" "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")
***************
*** 761,764 ****
--- 772,779 ----
      endif( Boost_MAJOR_VERSION LESS "${Boost_FIND_VERSION_MAJOR}" )
  
+     if (NOT Boost_FOUND)
+       _Boost_MARK_COMPONENTS_FOUND(OFF)
+     endif()
+ 
      if (Boost_FOUND AND Boost_FIND_VERSION_EXACT)
        # If the user requested an exact version of Boost, check
***************
*** 774,781 ****
--- 789,798 ----
        # We'll set Boost_FOUND true again if we have an exact version match.
        set(Boost_FOUND FALSE)
+       _Boost_MARK_COMPONENTS_FOUND(OFF)
        if(Boost_MAJOR_VERSION EQUAL "${Boost_FIND_VERSION_MAJOR}" )
          if(Boost_MINOR_VERSION EQUAL "${Boost_FIND_VERSION_MINOR}" )
            if(Boost_SUBMINOR_VERSION EQUAL "${Boost_FIND_VERSION_PATCH}" )
              set( Boost_FOUND TRUE )
+             _Boost_MARK_COMPONENTS_FOUND(ON)
            endif(Boost_SUBMINOR_VERSION EQUAL "${Boost_FIND_VERSION_PATCH}" )
          endif( Boost_MINOR_VERSION EQUAL "${Boost_FIND_VERSION_MINOR}" )
***************
*** 797,813 ****
      endif (NOT Boost_FOUND)
  
!     if (Boost_FOUND)
!       set(_boost_CHECKED_COMPONENT FALSE)
!       set(_Boost_MISSING_COMPONENTS)
!       foreach(COMPONENT ${Boost_FIND_COMPONENTS})
!         string(TOUPPER ${COMPONENT} COMPONENT)
!         set(_boost_CHECKED_COMPONENT TRUE)
!         if(NOT Boost_${COMPONENT}_FOUND)
!           string(TOLOWER ${COMPONENT} COMPONENT)
!           list(APPEND _Boost_MISSING_COMPONENTS ${COMPONENT})
!           set( Boost_FOUND FALSE)
!         endif(NOT Boost_${COMPONENT}_FOUND)
!       endforeach(COMPONENT)
!     endif (Boost_FOUND)
  
      if(Boost_DEBUG)
--- 814,829 ----
      endif (NOT Boost_FOUND)
  
!     # Always check for missing components
!     set(_boost_CHECKED_COMPONENT FALSE)
!     set(_Boost_MISSING_COMPONENTS "")
!     foreach(COMPONENT ${Boost_FIND_COMPONENTS})
!       string(TOUPPER ${COMPONENT} COMPONENT)
!       set(_boost_CHECKED_COMPONENT TRUE)
!       if(NOT Boost_${COMPONENT}_FOUND)
!         string(TOLOWER ${COMPONENT} COMPONENT)
!         list(APPEND _Boost_MISSING_COMPONENTS ${COMPONENT})
!         set( Boost_FOUND FALSE)
!       endif(NOT Boost_${COMPONENT}_FOUND)
!     endforeach(COMPONENT)
  
      if(Boost_DEBUG)
***************
*** 877,883 ****
        IF (NOT Boost_FIND_QUIETLY)
          MESSAGE(STATUS "Boost version: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
!       ENDIF(NOT Boost_FIND_QUIETLY)
!       IF (NOT Boost_FIND_QUIETLY)
!         MESSAGE(STATUS "Found the following Boost libraries:")
        ENDIF(NOT Boost_FIND_QUIETLY)
        FOREACH ( COMPONENT  ${Boost_FIND_COMPONENTS} )
--- 893,899 ----
        IF (NOT Boost_FIND_QUIETLY)
          MESSAGE(STATUS "Boost version: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
!         if(Boost_FIND_COMPONENTS)
!           message(STATUS "Found the following Boost libraries:")
!         endif()
        ENDIF(NOT Boost_FIND_QUIETLY)
        FOREACH ( COMPONENT  ${Boost_FIND_COMPONENTS} )