[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-491-g169bff4
Brad King
brad.king at kitware.com
Thu Feb 23 07:13:52 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 169bff43f65cb53f8b825b8f2e981c683ac08ea1 (commit)
via ffa6c85bf958b3334c201168b2a6510f809b7cb1 (commit)
via 8e2e2a44b1215552fbe36963a247fa73b7dec9f1 (commit)
via 86b58f2606e771bde2e2a25ff9384fc34cbe891c (commit)
from 6790a78a1199a40bf1de5bbe6762668d7dd266ab (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=169bff43f65cb53f8b825b8f2e981c683ac08ea1
commit 169bff43f65cb53f8b825b8f2e981c683ac08ea1
Merge: 6790a78 ffa6c85
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 23 07:13:51 2017 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 23 07:13:51 2017 -0500
Merge topic 'update-libarchive' into next
ffa6c85b Update CMake pre-cached values for libarchive 3.3.0
8e2e2a44 libarchive: Avoid using isblank
86b58f26 libarchive: Avoid declaration after statement in C code
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ffa6c85bf958b3334c201168b2a6510f809b7cb1
commit ffa6c85bf958b3334c201168b2a6510f809b7cb1
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:13:40 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")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8e2e2a44b1215552fbe36963a247fa73b7dec9f1
commit 8e2e2a44b1215552fbe36963a247fa73b7dec9f1
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:13:40 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=86b58f2606e771bde2e2a25ff9384fc34cbe891c
commit 86b58f2606e771bde2e2a25ff9384fc34cbe891c
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:13:39 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
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list