diff options
| author | Philip Lowman <philip@yhbt.com> | 2009-01-18 20:41:18 (GMT) |
|---|---|---|
| committer | Philip Lowman <philip@yhbt.com> | 2009-01-18 20:41:18 (GMT) |
| commit | c4e85549c9e5a9e3c83cfb5073650c882eb146dc (patch) | |
| tree | f63b2a2a38b51691feccaf2d8a0f04361ac98b17 | |
| parent | 909dd8af484c4ac194bac3d3c609743003cff8f0 (diff) | |
| download | CMake-c4e85549c9e5a9e3c83cfb5073650c882eb146dc.zip CMake-c4e85549c9e5a9e3c83cfb5073650c882eb146dc.tar.gz CMake-c4e85549c9e5a9e3c83cfb5073650c882eb146dc.tar.bz2 | |
BUG: Removed some code which was squashing Boost_LIBRARIES on WIN32 under the auspices of forcing the user to use autolinking, but it only did this squashing on the first call to FindBoost. Subsequent calls to FindBoost would not have Boost_LIBRARIES squashed so this code was doing nothing. If you link your target_link_libraries() against dynamic boost libraries it appears from tools like Dependency Walker that the pragma calls to autolink to the static boost libraries are ignored. It's therefore too late to make this squash apply to all calls to FindBoost because that would break users that have not setup autolinking properly. For now this fix is largely cosmetic since the original code never worked anyways (see version 1.5 introduced on 4/22/08).
| -rw-r--r-- | Modules/FindBoost.cmake | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index 8dfc9e5..961433d 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -792,13 +792,6 @@ ELSE (_boost_IN_CACHE) ENDIF(Boost_FIND_REQUIRED) ENDIF(Boost_FOUND) - # Under Windows, automatic linking is performed, so no need to specify the libraries. - IF (WIN32) - IF (NOT MINGW) - SET(Boost_LIBRARIES "") - ENDIF (NOT MINGW) - ENDIF(WIN32) - # show the Boost_INCLUDE_DIRS AND Boost_LIBRARIES variables only in the advanced view MARK_AS_ADVANCED(Boost_INCLUDE_DIR Boost_INCLUDE_DIRS |