This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via bce0d4c27d0adaaf25b1a6527e0aecfc7a673d0e (commit)
via 5edceff308b82a2c27946e0c80961c7d6699f0f9 (commit)
from 28ef1081401fb62da98157083eae254502d350c0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bce0d4c27d0adaaf25b1a6527e0aecfc7a673d0e
commit bce0d4c27d0adaaf25b1a6527e0aecfc7a673d0e
Merge: 28ef108 5edceff
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Aug 21 16:01:16 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Aug 21 12:01:32 2019 -0400
Merge topic 'FindBZip2-windows-lib-names'
5edceff308 FindBZip2: Add Windows library names emitted from bzip2 1.0.6
makefile
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3711
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5edceff308b82a2c27946e0c80961c7d6699f0f9
commit 5edceff308b82a2c27946e0c80961c7d6699f0f9
Author: Braden McDaniel <bra...@endoframe.com>
AuthorDate: Tue Aug 20 18:07:32 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Aug 21 12:00:11 2019 -0400
FindBZip2: Add Windows library names emitted from bzip2 1.0.6 makefile
As of release 1.0.6, the bzip2 distribution includs a makefile for nmake
on Windows that emits library names of the form `libbz2.lib`.
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)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindBZip2.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
