BUG: Resolves Issue #8393, Remove workarounds in FindBoost once UNC-Path bug

is fixed
This commit is contained in:
Philip Lowman 2009-02-09 22:39:31 -05:00
parent cae2da8d16
commit 17656ace03
1 changed files with 2 additions and 12 deletions

View File

@ -242,12 +242,7 @@ MACRO (_Boost_ADJUST_LIB_VARS basename)
ENDIF (Boost_${basename}_LIBRARY_DEBUG AND NOT Boost_${basename}_LIBRARY_RELEASE) ENDIF (Boost_${basename}_LIBRARY_DEBUG AND NOT Boost_${basename}_LIBRARY_RELEASE)
IF (Boost_${basename}_LIBRARY) IF (Boost_${basename}_LIBRARY)
IF(WIN32) set(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY} CACHE FILEPATH "The Boost ${basename} library")
# 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 # Remove superfluous "debug" / "optimized" keywords from
# Boost_LIBRARY_DIRS # Boost_LIBRARY_DIRS
@ -257,12 +252,7 @@ MACRO (_Boost_ADJUST_LIB_VARS basename)
ENDFOREACH() ENDFOREACH()
LIST(REMOVE_DUPLICATES Boost_LIBRARY_DIRS) LIST(REMOVE_DUPLICATES Boost_LIBRARY_DIRS)
IF(WIN32) set(Boost_LIBRARY_DIRS ${Boost_LIBRARY_DIRS} CACHE FILEPATH "Boost library directory")
# 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") SET(Boost_${basename}_FOUND ON CACHE INTERNAL "Whether the Boost ${basename} library found")
ENDIF (Boost_${basename}_LIBRARY) ENDIF (Boost_${basename}_LIBRARY)