[Cmake-commits] [cmake-commits] lowman committed FindBoost.cmake 1.18 1.19

[cmake-commits at cmake.org]

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

Modified Files:
	FindBoost.cmake 
Log Message:
BUG: Fixed superfluous and duplicate dirs in Boost_LIBRARY_DIR.  Employed workaround for Issue #8378.  Resolves Issue #8099


Index: FindBoost.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindBoost.cmake,v
retrieving revision 1.18
retrieving revision 1.19
diff -C 2 -d -r1.18 -r1.19
*** FindBoost.cmake	16 Jan 2009 09:07:03 -0000	1.18
--- FindBoost.cmake	18 Jan 2009 19:40:48 -0000	1.19
***************
*** 212,218 ****
      
      IF (Boost_${basename}_LIBRARY)
!       SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY} CACHE FILEPATH "The Boost ${basename} library")
!       GET_FILENAME_COMPONENT(Boost_LIBRARY_DIRS "${Boost_${basename}_LIBRARY}" PATH)
!       SET(Boost_LIBRARY_DIRS ${Boost_LIBRARY_DIRS} CACHE FILEPATH "Boost library directory")
        SET(Boost_${basename}_FOUND ON CACHE INTERNAL "Whether the Boost ${basename} library found")
      ENDIF (Boost_${basename}_LIBRARY)
--- 212,236 ----
      
      IF (Boost_${basename}_LIBRARY)
!       IF(WIN32)
!         # Workaround issue #8378.
!         SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY} CACHE STRING "The Boost ${basename} library")
!       ELSE()
!         SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY} CACHE FILEPATH "The Boost ${basename} library")
!       ENDIF()
! 
!       # Remove superfluous "debug" / "optimized" keywords from
!       # Boost_LIBRARY_DIRS
!       FOREACH(_boost_my_lib ${Boost_${basename}_LIBRARY})
!         GET_FILENAME_COMPONENT(_boost_my_lib_path "${_boost_my_lib}" PATH)
!         LIST(APPEND Boost_LIBRARY_DIRS ${_boost_my_lib_path})
!       ENDFOREACH()
!       LIST(REMOVE_DUPLICATES Boost_LIBRARY_DIRS)
! 
!       IF(WIN32)
!         # Workaround issue #8378.
!         SET(Boost_LIBRARY_DIRS ${Boost_LIBRARY_DIRS} CACHE STRING "Boost library directory")
!       ELSE()
!         SET(Boost_LIBRARY_DIRS ${Boost_LIBRARY_DIRS} CACHE FILEPATH "Boost library directory")
!       ENDIF()
        SET(Boost_${basename}_FOUND ON CACHE INTERNAL "Whether the Boost ${basename} library found")
      ENDIF (Boost_${basename}_LIBRARY)