[Cmake-commits] [cmake-commits] lowman committed FindBoost.cmake 1.32 1.33

cmake-commits at cmake.org cmake-commits at cmake.org
Mon Feb 9 22:39:34 EST 2009


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

Modified Files:
	FindBoost.cmake 
Log Message:
BUG: Resolves Issue #8393, Remove workarounds in FindBoost once UNC-Path bug
is fixed


Index: FindBoost.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindBoost.cmake,v
retrieving revision 1.32
retrieving revision 1.33
diff -C 2 -d -r1.32 -r1.33
*** FindBoost.cmake	10 Feb 2009 03:34:13 -0000	1.32
--- FindBoost.cmake	10 Feb 2009 03:39:31 -0000	1.33
***************
*** 243,252 ****
      
      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
--- 243,247 ----
      
      IF (Boost_${basename}_LIBRARY)
!       set(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY} CACHE FILEPATH "The Boost ${basename} library")
  
        # Remove superfluous "debug" / "optimized" keywords from
***************
*** 258,267 ****
        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)
--- 253,257 ----
        LIST(REMOVE_DUPLICATES Boost_LIBRARY_DIRS)
  
!       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)



More information about the Cmake-commits mailing list