Commit 02946e0b authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'FindBoost-minor-cleanup'

08b9a0fd FindBoost: Simplify library dir detection with cascading if/elseif/else
ca4029fa FindBoost: Minor style updates
2e242b5c FindBoost: Use list(INSERT) to simplify suffix list generation
6699d46a FindBoost: Use string(APPEND) in more cases
parents 8b496672 08b9a0fd
...@@ -1313,13 +1313,13 @@ string(APPEND _boost_DEBUG_ABI_TAG "d") ...@@ -1313,13 +1313,13 @@ string(APPEND _boost_DEBUG_ABI_TAG "d")
# p using the STLport standard library rather than the # p using the STLport standard library rather than the
# default one supplied with your compiler # default one supplied with your compiler
if(Boost_USE_STLPORT) if(Boost_USE_STLPORT)
set( _boost_RELEASE_ABI_TAG "${_boost_RELEASE_ABI_TAG}p") string(APPEND _boost_RELEASE_ABI_TAG "p")
set( _boost_DEBUG_ABI_TAG "${_boost_DEBUG_ABI_TAG}p") string(APPEND _boost_DEBUG_ABI_TAG "p")
endif() endif()
# n using the STLport deprecated "native iostreams" feature # n using the STLport deprecated "native iostreams" feature
if(Boost_USE_STLPORT_DEPRECATED_NATIVE_IOSTREAMS) if(Boost_USE_STLPORT_DEPRECATED_NATIVE_IOSTREAMS)
set( _boost_RELEASE_ABI_TAG "${_boost_RELEASE_ABI_TAG}n") string(APPEND _boost_RELEASE_ABI_TAG "n")
set( _boost_DEBUG_ABI_TAG "${_boost_DEBUG_ABI_TAG}n") string(APPEND _boost_DEBUG_ABI_TAG "n")
endif() endif()
if(Boost_DEBUG) if(Boost_DEBUG)
...@@ -1390,9 +1390,9 @@ endif() ...@@ -1390,9 +1390,9 @@ endif()
if( Boost_USE_STATIC_LIBS ) if( Boost_USE_STATIC_LIBS )
set( _boost_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) set( _boost_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
if(WIN32) if(WIN32)
set(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES}) list(INSERT CMAKE_FIND_LIBRARY_SUFFIXES 0 .lib .a)
else() else()
set(CMAKE_FIND_LIBRARY_SUFFIXES .a ) set(CMAKE_FIND_LIBRARY_SUFFIXES .a)
endif() endif()
endif() endif()
...@@ -1418,7 +1418,7 @@ endif() ...@@ -1418,7 +1418,7 @@ endif()
set(_boost_STATIC_RUNTIME_WORKAROUND false) set(_boost_STATIC_RUNTIME_WORKAROUND false)
if(WIN32 AND Boost_USE_STATIC_LIBS) if(WIN32 AND Boost_USE_STATIC_LIBS)
if(NOT DEFINED Boost_USE_STATIC_RUNTIME) if(NOT DEFINED Boost_USE_STATIC_RUNTIME)
set(_boost_STATIC_RUNTIME_WORKAROUND true) set(_boost_STATIC_RUNTIME_WORKAROUND TRUE)
endif() endif()
endif() endif()
...@@ -1681,13 +1681,11 @@ if(Boost_FOUND) ...@@ -1681,13 +1681,11 @@ if(Boost_FOUND)
endif() endif()
if(EXISTS "${_boost_LIB_DIR}/lib") if(EXISTS "${_boost_LIB_DIR}/lib")
set(_boost_LIB_DIR ${_boost_LIB_DIR}/lib) string(APPEND _boost_LIB_DIR /lib)
elseif(EXISTS "${_boost_LIB_DIR}/stage/lib")
string(APPEND _boost_LIB_DIR "/stage/lib")
else() else()
if(EXISTS "${_boost_LIB_DIR}/stage/lib") set(_boost_LIB_DIR "")
set(_boost_LIB_DIR ${_boost_LIB_DIR}/stage/lib)
else()
set(_boost_LIB_DIR "")
endif()
endif() endif()
if(_boost_LIB_DIR AND EXISTS "${_boost_LIB_DIR}") if(_boost_LIB_DIR AND EXISTS "${_boost_LIB_DIR}")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment