[Cmake-commits] CMake branch, next, updated. v2.8.7-2086-g57a091d

Brad King brad.king at kitware.com
Fri Jan 13 14:13:27 EST 2012


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  57a091d4475b63f5d8f3478c1f40d1b71a061d59 (commit)
       via  b881315314ae397d125f1b56f81d143388ef7b4f (commit)
      from  31c644d908af3d2e85a656576b6901c7a4580500 (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=57a091d4475b63f5d8f3478c1f40d1b71a061d59
commit 57a091d4475b63f5d8f3478c1f40d1b71a061d59
Merge: 31c644d b881315
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 13 14:13:24 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 13 14:13:24 2012 -0500

    Merge topic 'bug10950' into next
    
    b881315 Revert "make sure to use the correct header if using shipped zlib or bzip2 (#10950)"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b881315314ae397d125f1b56f81d143388ef7b4f
commit b881315314ae397d125f1b56f81d143388ef7b4f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 13 14:12:11 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 13 14:12:11 2012 -0500

    Revert "make sure to use the correct header if using shipped zlib or bzip2 (#10950)"
    
    This reverts commit 201cf33271093d0e50e4c88c795e595a2fd55327.
    
    It will be replaced by an alternative fix that is more consistent with
    how we handle this problem for other third-party libraries.

diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt
index ae7246e..7f7a69f 100644
--- a/Utilities/cmlibarchive/CMakeLists.txt
+++ b/Utilities/cmlibarchive/CMakeLists.txt
@@ -169,13 +169,7 @@ FIND_PACKAGE(ZLIB)
 IF(ZLIB_FOUND)
   SET(HAVE_LIBZ 1)
   SET(HAVE_ZLIB_H 1)
-  # if we use the internal version make sure to include our header first
-  # before something that may hang around in the system include dirs
-  IF(ZLIB_INCLUDE_DIR MATCHES "^${CMAKE_SOURCE_DIR}.*")
-    INCLUDE_DIRECTORIES(BEFORE ${ZLIB_INCLUDE_DIR})
-  ELSE()
-    INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
-  ENDIF()
+  INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
   LIST(APPEND ADDITIONAL_LIBS ${ZLIB_LIBRARIES})
   IF(WIN32 AND NOT CYGWIN)
     SET(CMAKE_REQUIRED_INCLUDES ${ZLIB_INCLUDE_DIR})
@@ -196,13 +190,7 @@ FIND_PACKAGE(BZip2)
 IF(BZIP2_FOUND)
   SET(HAVE_LIBBZ2 1)
   SET(HAVE_BZLIB_H 1)
-  # if we use the internal version make sure to include our header first
-  # before something that may hang around in the system include dirs
-  IF(BZIP2_INCLUDE_DIR MATCHES "^${CMAKE_SOURCE_DIR}.*")
-    INCLUDE_DIRECTORIES(BEFORE ${BZIP2_INCLUDE_DIR})
-  ELSE()
-    INCLUDE_DIRECTORIES(${BZIP2_INCLUDE_DIR})
-  ENDIF()
+  INCLUDE_DIRECTORIES(${BZIP2_INCLUDE_DIR})
   LIST(APPEND ADDITIONAL_LIBS ${BZIP2_LIBRARIES})
 ENDIF(BZIP2_FOUND)
 MARK_AS_ADVANCED(CLEAR BZIP2_INCLUDE_DIR)

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

Summary of changes:
 Utilities/cmlibarchive/CMakeLists.txt |   16 ++--------------
 1 files changed, 2 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list