diff options
| author | Brad King <brad.king@kitware.com> | 2019-08-21 16:01:16 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-08-21 16:01:32 (GMT) |
| commit | bce0d4c27d0adaaf25b1a6527e0aecfc7a673d0e (patch) | |
| tree | 3c2a999c2d85b381a5e41dae1729b6642d380c87 /Modules | |
| parent | 28ef1081401fb62da98157083eae254502d350c0 (diff) | |
| parent | 5edceff308b82a2c27946e0c80961c7d6699f0f9 (diff) | |
| download | CMake-bce0d4c27d0adaaf25b1a6527e0aecfc7a673d0e.zip CMake-bce0d4c27d0adaaf25b1a6527e0aecfc7a673d0e.tar.gz CMake-bce0d4c27d0adaaf25b1a6527e0aecfc7a673d0e.tar.bz2 | |
Merge topic 'FindBZip2-windows-lib-names'
5edceff308 FindBZip2: Add Windows library names emitted from bzip2 1.0.6 makefile
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3711
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindBZip2.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindBZip2.cmake b/Modules/FindBZip2.cmake index 309b971..98ab72c 100644 --- a/Modules/FindBZip2.cmake +++ b/Modules/FindBZip2.cmake @@ -45,8 +45,8 @@ set(_BZIP2_PATHS PATHS find_path(BZIP2_INCLUDE_DIR bzlib.h ${_BZIP2_PATHS} PATH_SUFFIXES include) if (NOT BZIP2_LIBRARIES) - find_library(BZIP2_LIBRARY_RELEASE NAMES bz2 bzip2 ${_BZIP2_PATHS} PATH_SUFFIXES lib) - find_library(BZIP2_LIBRARY_DEBUG NAMES bz2d bzip2d ${_BZIP2_PATHS} PATH_SUFFIXES lib) + find_library(BZIP2_LIBRARY_RELEASE NAMES bz2 bzip2 libbz2 libbzip2 ${_BZIP2_PATHS} PATH_SUFFIXES lib) + find_library(BZIP2_LIBRARY_DEBUG NAMES bz2d bzip2d libbz2d libbzip2d ${_BZIP2_PATHS} PATH_SUFFIXES lib) include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake) SELECT_LIBRARY_CONFIGURATIONS(BZIP2) |