[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-497-gf0e2f9e
Brad King
brad.king at kitware.com
Thu Feb 23 07:15:30 EST 2017
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 f0e2f9e063e08ab02a15d1ffbd3252984eec0845 (commit)
via d49176e91e4fb4ae31be1011c1029ca07d2cf494 (commit)
via ce8f117fe2c10f1ebd56cb8adec0dcde1fc62457 (commit)
via e0f725f821f251165c17a7580c2000342ac505a2 (commit)
via ae4861ec2214cb025f8bf2426376a4aca9809d73 (commit)
via fecb70dd34b5ba244263e72c42f90701775e132f (commit)
from 169bff43f65cb53f8b825b8f2e981c683ac08ea1 (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=f0e2f9e063e08ab02a15d1ffbd3252984eec0845
commit f0e2f9e063e08ab02a15d1ffbd3252984eec0845
Merge: 169bff4 d49176e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 23 07:15:29 2017 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 23 07:15:29 2017 -0500
Merge topic 'update-libarchive' into next
d49176e9 libarchive: Avoid using isblank
ce8f117f libarchive: Avoid declaration after statement in C code
e0f725f8 libarchive: Fix use of ssize_t in archive_entry.h
ae4861ec libarchive: Define __LA_DEPRECATED consistently
fecb70dd Update CMake pre-cached values for libarchive 3.3.0
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d49176e91e4fb4ae31be1011c1029ca07d2cf494
commit d49176e91e4fb4ae31be1011c1029ca07d2cf494
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 23 06:57:26 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 23 07:15:21 2017 -0500
libarchive: Avoid using isblank
It is not available on VS 2012 and below. Use our own impl instead.
diff --git a/Utilities/cmlibarchive/libarchive/archive_read_support_format_warc.c b/Utilities/cmlibarchive/libarchive/archive_read_support_format_warc.c
index 5e22438..c3e86c0 100644
--- a/Utilities/cmlibarchive/libarchive/archive_read_support_format_warc.c
+++ b/Utilities/cmlibarchive/libarchive/archive_read_support_format_warc.c
@@ -531,6 +531,10 @@ time_from_tm(struct tm *t)
#endif
}
+static int la_isblank(int c) {
+ return c == ' ' || c == '\t';
+}
+
static time_t
xstrpisotime(const char *s, char **endptr)
{
@@ -543,7 +547,7 @@ xstrpisotime(const char *s, char **endptr)
/* as a courtesy to our callers, and since this is a non-standard
* routine, we skip leading whitespace */
- while (isblank((unsigned char)*s))
+ while (la_isblank((unsigned char)*s))
++s;
/* read year */
@@ -619,7 +623,7 @@ _warc_rdver(const char *buf, size_t bsz)
if (memcmp(buf + 3U + end, "\r\n", 2U) != 0)
ver = 0U;
} else if (ver < 1200U) {
- if (!isblank(*(buf + 3U + end)))
+ if (!la_isblank(*(buf + 3U + end)))
ver = 0U;
}
}
@@ -643,7 +647,7 @@ _warc_rdtyp(const char *buf, size_t bsz)
}
/* overread whitespace */
- while (val < eol && isblank((unsigned char)*val))
+ while (val < eol && la_isblank((unsigned char)*val))
++val;
if (val + 8U == eol) {
@@ -673,7 +677,7 @@ _warc_rduri(const char *buf, size_t bsz)
return res;
}
- while (val < eol && isblank((unsigned char)*val))
+ while (val < eol && la_isblank((unsigned char)*val))
++val;
/* overread URL designators */
@@ -731,7 +735,7 @@ _warc_rdlen(const char *buf, size_t bsz)
}
/* skip leading whitespace */
- while (val < eol && isblank(*val))
+ while (val < eol && la_isblank(*val))
val++;
/* there must be at least one digit */
if (!isdigit(*val))
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ce8f117fe2c10f1ebd56cb8adec0dcde1fc62457
commit ce8f117fe2c10f1ebd56cb8adec0dcde1fc62457
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 23 06:50:21 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 23 07:15:21 2017 -0500
libarchive: Avoid declaration after statement in C code
diff --git a/Utilities/cmlibarchive/libarchive/archive_write_set_format_iso9660.c b/Utilities/cmlibarchive/libarchive/archive_write_set_format_iso9660.c
index eb98491..4adf68e 100644
--- a/Utilities/cmlibarchive/libarchive/archive_write_set_format_iso9660.c
+++ b/Utilities/cmlibarchive/libarchive/archive_write_set_format_iso9660.c
@@ -4074,8 +4074,10 @@ write_information_block(struct archive_write *a)
memset(info.s, 0, info_size);
opt = 0;
#if defined(HAVE__CTIME64_S)
- __time64_t iso9660_birth_time_tmp = (__time64_t) iso9660->birth_time; //time_t may be shorter than 64 bits
- _ctime64_s(buf, sizeof(buf), &(iso9660_birth_time_tmp));
+ {
+ __time64_t iso9660_birth_time_tmp = (__time64_t) iso9660->birth_time; //time_t may be shorter than 64 bits
+ _ctime64_s(buf, sizeof(buf), &(iso9660_birth_time_tmp));
+ }
#elif defined(HAVE_CTIME_R)
ctime_r(&(iso9660->birth_time), buf);
#else
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e0f725f821f251165c17a7580c2000342ac505a2
commit e0f725f821f251165c17a7580c2000342ac505a2
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 20 09:08:29 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 23 07:15:21 2017 -0500
libarchive: Fix use of ssize_t in archive_entry.h
This type is not available on Windows compilers so for clients including
this header we need to use `la_ssize_t` instead as we do in `archive.h`.
diff --git a/Utilities/cmlibarchive/libarchive/archive_entry.h b/Utilities/cmlibarchive/libarchive/archive_entry.h
index fe86ee3..c331117 100644
--- a/Utilities/cmlibarchive/libarchive/archive_entry.h
+++ b/Utilities/cmlibarchive/libarchive/archive_entry.h
@@ -66,6 +66,27 @@ typedef int64_t la_int64_t;
# endif
#endif
+/* The la_ssize_t should match the type used in 'struct stat' */
+#if !defined(__LA_SSIZE_T_DEFINED)
+/* Older code relied on the __LA_SSIZE_T macro; after 4.0 we'll switch to the typedef exclusively. */
+# if ARCHIVE_VERSION_NUMBER < 4000000
+#define __LA_SSIZE_T la_ssize_t
+# endif
+#define __LA_SSIZE_T_DEFINED
+# if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__WATCOMC__)
+# if defined(_SSIZE_T_DEFINED) || defined(_SSIZE_T_)
+typedef ssize_t la_ssize_t;
+# elif defined(_WIN64)
+typedef __int64 la_ssize_t;
+# else
+typedef long la_ssize_t;
+# endif
+# else
+# include <unistd.h> /* ssize_t */
+typedef ssize_t la_ssize_t;
+# endif
+#endif
+
/* Get a suitable definition for mode_t */
#if ARCHIVE_VERSION_NUMBER >= 3999000
/* Switch to plain 'int' for libarchive 4.0. It's less broken than 'mode_t' */
@@ -523,9 +544,9 @@ __LA_DECL int archive_entry_acl_next_w(struct archive_entry *, int /* want_type
#define ARCHIVE_ENTRY_ACL_STYLE_COMPACT 0x00000010
__LA_DECL wchar_t *archive_entry_acl_to_text_w(struct archive_entry *,
- ssize_t * /* len */, int /* flags */);
+ la_ssize_t * /* len */, int /* flags */);
__LA_DECL char *archive_entry_acl_to_text(struct archive_entry *,
- ssize_t * /* len */, int /* flags */);
+ la_ssize_t * /* len */, int /* flags */);
__LA_DECL int archive_entry_acl_from_text_w(struct archive_entry *,
const wchar_t * /* wtext */, int /* type */);
__LA_DECL int archive_entry_acl_from_text(struct archive_entry *,
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae4861ec2214cb025f8bf2426376a4aca9809d73
commit ae4861ec2214cb025f8bf2426376a4aca9809d73
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 20 08:10:33 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 23 07:15:20 2017 -0500
libarchive: Define __LA_DEPRECATED consistently
Upstream libarchive now defines this macro in two places with the same
logic in both. However, CMake's bundled copy disables this macro, so
we need to update the new location of its definition to be consistent.
diff --git a/Utilities/cmlibarchive/libarchive/archive_entry.h b/Utilities/cmlibarchive/libarchive/archive_entry.h
index 9427413..fe86ee3 100644
--- a/Utilities/cmlibarchive/libarchive/archive_entry.h
+++ b/Utilities/cmlibarchive/libarchive/archive_entry.h
@@ -105,11 +105,8 @@ typedef int64_t la_int64_t;
# define __LA_DECL
#endif
-#if defined(__GNUC__) && __GNUC__ >= 3 && __GNUC_MINOR__ >= 1
-# define __LA_DEPRECATED __attribute__((deprecated))
-#else
-# define __LA_DEPRECATED
-#endif
+/* CMake uses some deprecated APIs to build with old libarchive versions. */
+#define __LA_DEPRECATED
#ifdef __cplusplus
extern "C" {
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fecb70dd34b5ba244263e72c42f90701775e132f
commit fecb70dd34b5ba244263e72c42f90701775e132f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 20 09:10:11 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 23 07:15:19 2017 -0500
Update CMake pre-cached values for libarchive 3.3.0
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bec81a3..e613224 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -421,14 +421,15 @@ macro (CMAKE_BUILD_UTILITIES)
if(NOT LIBLZMA_FOUND)
message(FATAL_ERROR "CMAKE_USE_SYSTEM_LIBLZMA is ON but LibLZMA is not found!")
endif()
- set(LZMA_INCLUDE_DIR ${LIBLZMA_INCLUDE_DIRS})
- set(LZMA_LIBRARY ${LIBLZMA_LIBRARIES})
else()
add_subdirectory(Utilities/cmliblzma)
CMAKE_SET_TARGET_FOLDER(cmliblzma "Utilities/3rdParty")
- set(LZMA_INCLUDE_DIR
+ set(LIBLZMA_HAS_AUTO_DECODER 1)
+ set(LIBLZMA_HAS_EASY_ENCODER 1)
+ set(LIBLZMA_HAS_LZMA_PRESET 1)
+ set(LIBLZMA_INCLUDE_DIR
"${CMAKE_CURRENT_SOURCE_DIR}/Utilities/cmliblzma/liblzma/api")
- set(LZMA_LIBRARY cmliblzma)
+ set(LIBLZMA_LIBRARY cmliblzma)
endif()
endif()
@@ -449,13 +450,14 @@ macro (CMAKE_BUILD_UTILITIES)
add_definitions(-DLIBARCHIVE_STATIC)
set(ENABLE_NETTLE OFF CACHE INTERNAL "Enable use of Nettle")
set(ENABLE_OPENSSL ${CMAKE_USE_OPENSSL} CACHE INTERNAL "Enable use of OpenSSL")
- set(ENABLE_LZMA ON CACHE INTERNAL "Enable the use of the system found LZMA library if found")
- set(ENABLE_ZLIB ON CACHE INTERNAL "Enable the use of the system found ZLIB library if found")
- set(ENABLE_BZip2 ON CACHE INTERNAL "Enable the use of the system found BZip2 library if found")
- set(ENABLE_LIBXML2 OFF CACHE INTERNAL "Enable the use of the system found libxml2 library if found")
- set(ENABLE_EXPAT ON CACHE INTERNAL "Enable the use of the system found EXPAT library if found")
- set(ENABLE_PCREPOSIX OFF CACHE INTERNAL "Enable the use of the system found PCREPOSIX library if found")
- set(ENABLE_LibGCC OFF CACHE INTERNAL "Enable the use of the system found LibGCC library if found")
+ set(ENABLE_LZMA ON CACHE INTERNAL "Enable the use of the system LZMA library if found")
+ set(ENABLE_LZO OFF CACHE INTERNAL "Enable the use of the system LZO library if found")
+ set(ENABLE_ZLIB ON CACHE INTERNAL "Enable the use of the system ZLIB library if found")
+ set(ENABLE_BZip2 ON CACHE INTERNAL "Enable the use of the system BZip2 library if found")
+ set(ENABLE_LIBXML2 OFF CACHE INTERNAL "Enable the use of the system libxml2 library if found")
+ set(ENABLE_EXPAT ON CACHE INTERNAL "Enable the use of the system EXPAT library if found")
+ set(ENABLE_PCREPOSIX OFF CACHE INTERNAL "Enable the use of the system PCREPOSIX library if found")
+ set(ENABLE_LibGCC OFF CACHE INTERNAL "Enable the use of the system LibGCC library if found")
set(ENABLE_XATTR OFF CACHE INTERNAL "Enable extended attribute support")
set(ENABLE_ACL OFF CACHE INTERNAL "Enable ACL support")
set(ENABLE_ICONV OFF CACHE INTERNAL "Enable iconv support")
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list