[Cmake-commits] CMake branch, next, updated. v3.3.0-rc4-1200-gf5350a9

[Brad King]

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, next has been updated
       via  f5350a90875848979d56e6843b2e61c5a6b2a725 (commit)
       via  23876eda9f1d4b5725407aef7d218fc3ce4113cb (commit)
      from  ccc30aa9cbbb69e6ff0c4baac99b3cfdc7ce19d5 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f5350a90875848979d56e6843b2e61c5a6b2a725
commit f5350a90875848979d56e6843b2e61c5a6b2a725
Merge: ccc30aa 23876ed
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 21 14:08:53 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 21 14:08:53 2015 -0400

    Merge topic 'FindBZip2-check-with-prototype' into next
    
    23876eda FindBZip2: Check BZIP2_NEED_PREFIX with real prototype


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=23876eda9f1d4b5725407aef7d218fc3ce4113cb
commit 23876eda9f1d4b5725407aef7d218fc3ce4113cb
Author:     Ralf Habacker <ralf.habacker at freenet.de>
AuthorDate: Tue Jul 21 18:10:16 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 21 14:00:06 2015 -0400

    FindBZip2: Check BZIP2_NEED_PREFIX with real prototype
    
    Run our check for the '_' prefix using a bzip2 API function as declared
    with a prototype in the real header file.  This is needed in case the
    function is provided in a DLL import library where the symbol name may
    not match without proper markup from the header.

diff --git a/Modules/FindBZip2.cmake b/Modules/FindBZip2.cmake
index b479332..6af42dd 100644
--- a/Modules/FindBZip2.cmake
+++ b/Modules/FindBZip2.cmake
@@ -56,11 +56,13 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(BZip2
                                   VERSION_VAR BZIP2_VERSION_STRING)
 
 if (BZIP2_FOUND)
-   include(${CMAKE_CURRENT_LIST_DIR}/CheckLibraryExists.cmake)
+   include(${CMAKE_CURRENT_LIST_DIR}/CheckSymbolExists.cmake)
    include(${CMAKE_CURRENT_LIST_DIR}/CMakePushCheckState.cmake)
    cmake_push_check_state()
    set(CMAKE_REQUIRED_QUIET ${BZip2_FIND_QUIETLY})
-   CHECK_LIBRARY_EXISTS("${BZIP2_LIBRARIES}" BZ2_bzCompressInit "" BZIP2_NEED_PREFIX)
+   set(CMAKE_REQUIRED_INCLUDES ${BZIP2_INCLUDE_DIR})
+   set(CMAKE_REQUIRED_LIBRARIES ${BZIP2_LIBRARIES})
+   CHECK_SYMBOL_EXISTS(BZ2_bzCompressInit "bzlib.h" BZIP2_NEED_PREFIX)
    cmake_pop_check_state()
 endif ()
 

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindBZip2.cmake |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake