[Cmake-commits] CMake branch, next, updated. v2.8.7-2088-g2ee866a

Brad King brad.king at kitware.com
Fri Jan 13 14:13:34 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  2ee866a2320722c485a1244163f9d7183b5e6d01 (commit)
       via  d4a9e334d3d65b2d65097e7c202db52b4a9c0509 (commit)
      from  57a091d4475b63f5d8f3478c1f40d1b71a061d59 (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=2ee866a2320722c485a1244163f9d7183b5e6d01
commit 2ee866a2320722c485a1244163f9d7183b5e6d01
Merge: 57a091d d4a9e33
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 13 14:13:32 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 13 14:13:32 2012 -0500

    Merge topic 'cm-bzip2-header-issue-10950' into next
    
    d4a9e33 Include bzlib.h consistently across CMake build (#10950)


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

    Include bzlib.h consistently across CMake build (#10950)
    
    Use the approach originally used in commit f91b3c1d (Add options to
    build with system utility libraries, 2006-10-19) for all other
    third-party libraries.  Create a "cm_bzlib.h" header wrapper that
    robustly includes the header from the bzip2 library chosen for the CMake
    build (either builtin or system version).  Include the header wrapper
    anywhere we need the API provided by <bzlib.h>.

diff --git a/Utilities/cmThirdParty.h.in b/Utilities/cmThirdParty.h.in
index daf8114..c824085 100644
--- a/Utilities/cmThirdParty.h.in
+++ b/Utilities/cmThirdParty.h.in
@@ -16,6 +16,7 @@
 #cmakedefine CMAKE_USE_SYSTEM_CURL
 #cmakedefine CMAKE_USE_SYSTEM_EXPAT
 #cmakedefine CMAKE_USE_SYSTEM_ZLIB
+#cmakedefine CMAKE_USE_SYSTEM_BZIP2
 #cmakedefine CMAKE_USE_SYSTEM_LIBARCHIVE
 #cmakedefine CTEST_USE_XMLRPC
 
diff --git a/Utilities/cmThirdParty.h.in b/Utilities/cm_bzlib.h
similarity index 59%
copy from Utilities/cmThirdParty.h.in
copy to Utilities/cm_bzlib.h
index daf8114..d1fffa1 100644
--- a/Utilities/cmThirdParty.h.in
+++ b/Utilities/cm_bzlib.h
@@ -1,6 +1,6 @@
 /*============================================================================
   CMake - Cross Platform Makefile Generator
-  Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
+  Copyright 2000-2012 Kitware, Inc., Insight Software Consortium
 
   Distributed under the OSI-approved BSD License (the "License");
   see accompanying file Copyright.txt for details.
@@ -9,14 +9,15 @@
   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the License for more information.
 ============================================================================*/
-#ifndef __cmThirdParty_h
-#define __cmThirdParty_h
+#ifndef __cm_bzlib_h
+#define __cm_bzlib_h
 
-/* Whether CMake is using its own utility libraries.  */
-#cmakedefine CMAKE_USE_SYSTEM_CURL
-#cmakedefine CMAKE_USE_SYSTEM_EXPAT
-#cmakedefine CMAKE_USE_SYSTEM_ZLIB
-#cmakedefine CMAKE_USE_SYSTEM_LIBARCHIVE
-#cmakedefine CTEST_USE_XMLRPC
+/* Use the bzip2 library configured for CMake.  */
+#include "cmThirdParty.h"
+#ifdef CMAKE_USE_SYSTEM_BZIP2
+# include <bzlib.h>
+#else
+# include <cmbzip2/bzlib.h>
+#endif
 
 #endif
diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_filter_bzip2.c b/Utilities/cmlibarchive/libarchive/archive_read_support_filter_bzip2.c
index 8d5bd1c..af618b0 100644
--- a/Utilities/cmlibarchive/libarchive/archive_read_support_filter_bzip2.c
+++ b/Utilities/cmlibarchive/libarchive/archive_read_support_filter_bzip2.c
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <unistd.h>
 #endif
 #ifdef HAVE_BZLIB_H
-#include <bzlib.h>
+#include <cm_bzlib.h>
 #endif
 
 #include "archive.h"
diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_format_7zip.c b/Utilities/cmlibarchive/libarchive/archive_read_support_format_7zip.c
index 1580c92..2be2267 100644
--- a/Utilities/cmlibarchive/libarchive/archive_read_support_format_7zip.c
+++ b/Utilities/cmlibarchive/libarchive/archive_read_support_format_7zip.c
@@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$");
 #include <stdlib.h>
 #endif
 #ifdef HAVE_BZLIB_H
-#include <bzlib.h>
+#include <cm_bzlib.h>
 #endif
 #ifdef HAVE_LZMA_H
 #include <lzma.h>
diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_format_xar.c b/Utilities/cmlibarchive/libarchive/archive_read_support_format_xar.c
index 00f283d..0834e6f 100644
--- a/Utilities/cmlibarchive/libarchive/archive_read_support_format_xar.c
+++ b/Utilities/cmlibarchive/libarchive/archive_read_support_format_xar.c
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$");
 #include <expat.h>
 #endif
 #ifdef HAVE_BZLIB_H
-#include <bzlib.h>
+#include <cm_bzlib.h>
 #endif
 #if HAVE_LZMA_H
 #include <lzma.h>
diff --git a/Utilities/cmlibarchive/libarchive/archive_write_add_filter_bzip2.c b/Utilities/cmlibarchive/libarchive/archive_write_add_filter_bzip2.c
index e0d07a9..096a6a4 100644
--- a/Utilities/cmlibarchive/libarchive/archive_write_add_filter_bzip2.c
+++ b/Utilities/cmlibarchive/libarchive/archive_write_add_filter_bzip2.c
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_write_set_compression_bzip2.c 20
 #include <string.h>
 #endif
 #ifdef HAVE_BZLIB_H
-#include <bzlib.h>
+#include <cm_bzlib.h>
 #endif
 
 #include "archive.h"
diff --git a/Utilities/cmlibarchive/libarchive/archive_write_set_format_7zip.c b/Utilities/cmlibarchive/libarchive/archive_write_set_format_7zip.c
index ce3298b..5bb248c 100644
--- a/Utilities/cmlibarchive/libarchive/archive_write_set_format_7zip.c
+++ b/Utilities/cmlibarchive/libarchive/archive_write_set_format_7zip.c
@@ -31,7 +31,7 @@ __FBSDID("$FreeBSD$");
 #endif
 #include <stdlib.h>
 #ifdef HAVE_BZLIB_H
-#include <bzlib.h>
+#include <cm_bzlib.h>
 #endif
 #if HAVE_LZMA_H
 #include <lzma.h>
diff --git a/Utilities/cmlibarchive/libarchive/archive_write_set_format_xar.c b/Utilities/cmlibarchive/libarchive/archive_write_set_format_xar.c
index 0f003a8..96b7b2f 100644
--- a/Utilities/cmlibarchive/libarchive/archive_write_set_format_xar.c
+++ b/Utilities/cmlibarchive/libarchive/archive_write_set_format_xar.c
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
 #include <libxml/xmlwriter.h>
 #endif
 #ifdef HAVE_BZLIB_H
-#include <bzlib.h>
+#include <cm_bzlib.h>
 #endif
 #if HAVE_LZMA_H
 #include <lzma.h>

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

Summary of changes:
 Utilities/cmThirdParty.h.in                        |    1 +
 Utilities/{cm_expat.h => cm_bzlib.h}               |   14 +++++++-------
 .../libarchive/archive_read_support_filter_bzip2.c |    2 +-
 .../libarchive/archive_read_support_format_7zip.c  |    2 +-
 .../libarchive/archive_read_support_format_xar.c   |    2 +-
 .../libarchive/archive_write_add_filter_bzip2.c    |    2 +-
 .../libarchive/archive_write_set_format_7zip.c     |    2 +-
 .../libarchive/archive_write_set_format_xar.c      |    2 +-
 8 files changed, 14 insertions(+), 13 deletions(-)
 copy Utilities/{cm_expat.h => cm_bzlib.h} (70%)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list