Home Explore Help
Register Sign In
Apq
/
CMake
mirror of https://github.com/Kitware/CMake.git
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

BUG: Fix detection of boost libraries without any compiler encoding (e.g.
Gentoo 1.37 system installed boost). Fixes issue #8404 reported on mailing
list.

Philip Lowman 17 years ago
parent
47588ac8d0
commit
163af93449
1 changed files with 4 additions and 0 deletions
Split View Show Diff Stats
  1. 4 0
      Modules/FindBoost.cmake

+ 4 - 0
Modules/FindBoost.cmake
View File 

@@ -654,6 +654,8 @@ ELSE (_boost_IN_CACHE)
 
     FIND_LIBRARY(Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE
 
         NAMES  ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}-${Boost_LIB_VERSION}
 
                ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_STATIC_TAG}-${Boost_LIB_VERSION}
 
+               ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${Boost_LIB_VERSION}
 
+               ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}-${Boost_LIB_VERSION}
 
                ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}
 
                ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}
 
                ${Boost_LIB_PREFIX}boost_${COMPONENT}
 
@@ -663,6 +665,8 @@ ELSE (_boost_IN_CACHE)
 
     FIND_LIBRARY(Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG
 
         NAMES  ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}-${_boost_ABI_TAG}-${Boost_LIB_VERSION}
 
                ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_STATIC_TAG}${_boost_ABI_TAG}-${Boost_LIB_VERSION}
 
+               ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${_boost_ABI_TAG}-${Boost_LIB_VERSION}
 
+               ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}${_boost_ABI_TAG}-${Boost_LIB_VERSION}
 
                ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${_boost_ABI_TAG}
 
                ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_STATIC_TAG}${_boost_ABI_TAG}
 
                ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_boost_ABI_TAG}