From 17656ace033dcb9950f74cd0549abca8db3de385 Mon Sep 17 00:00:00 2001 From: Philip Lowman Date: Mon, 9 Feb 2009 22:39:31 -0500 Subject: [PATCH] BUG: Resolves Issue #8393, Remove workarounds in FindBoost once UNC-Path bug is fixed --- Modules/FindBoost.cmake | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index 3dc673970..518f8a87d 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -242,12 +242,7 @@ MACRO (_Boost_ADJUST_LIB_VARS basename) ENDIF (Boost_${basename}_LIBRARY_DEBUG AND NOT Boost_${basename}_LIBRARY_RELEASE) 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() + set(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY} CACHE FILEPATH "The Boost ${basename} library") # Remove superfluous "debug" / "optimized" keywords from # Boost_LIBRARY_DIRS @@ -257,12 +252,7 @@ MACRO (_Boost_ADJUST_LIB_VARS basename) 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_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)