diff options
| author | Brad King <brad.king@kitware.com> | 2020-03-30 17:24:05 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-03-30 17:24:38 (GMT) |
| commit | e20146b429afb12950a20adef83c73d36a74e558 (patch) | |
| tree | aaba1996a044440234612760d0e2c0bb25094ae6 | |
| parent | 026083f97b0898fedf5c36ffdf80b37ec9bc185f (diff) | |
| parent | 040f503d83321ddfdf3f401f538dec721fe03842 (diff) | |
| download | CMake-e20146b429afb12950a20adef83c73d36a74e558.zip CMake-e20146b429afb12950a20adef83c73d36a74e558.tar.gz CMake-e20146b429afb12950a20adef83c73d36a74e558.tar.bz2 | |
Merge topic 'FindBoost-lib-prefix-clarify'
040f503d83 FindBoost: Clarify logic selecting Boost_LIB_PREFIX
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4537
| -rw-r--r-- | Modules/FindBoost.cmake | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index 3c52466..38d3bfa 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -1646,10 +1646,15 @@ endif() # Prefix initialization # ------------------------------------------------------------------------ -set(Boost_LIB_PREFIX "") -if ( (GHSMULTI AND Boost_USE_STATIC_LIBS) OR - (WIN32 AND Boost_USE_STATIC_LIBS AND NOT CYGWIN) ) +# Boost's static libraries use a "lib" prefix on DLL platforms +# to distinguish them from the DLL import libraries. +if (Boost_USE_STATIC_LIBS AND ( + (WIN32 AND NOT CYGWIN) + OR GHSMULTI + )) set(Boost_LIB_PREFIX "lib") +else() + set(Boost_LIB_PREFIX "") endif() if ( NOT Boost_NAMESPACE ) |