summaryrefslogtreecommitdiffstats
path: root/Utilities/cmlibarchive/build
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2024-09-17 14:16:29 (GMT)
committerBrad King <brad.king@kitware.com>2024-09-17 17:03:03 (GMT)
commitfe3f0d469fc7e1390b36333811dd335b1efa249d (patch)
treec8909b8d6afb892f1a05261e96add876841e8c42 /Utilities/cmlibarchive/build
parentdfbb1f2f0deddd1dda2578ceaca860901b0f133d (diff)
parent9539a0df9c8a1e7641fedb1b76e1166771eb2f9c (diff)
downloadCMake-fe3f0d469fc7e1390b36333811dd335b1efa249d.zip
CMake-fe3f0d469fc7e1390b36333811dd335b1efa249d.tar.gz
CMake-fe3f0d469fc7e1390b36333811dd335b1efa249d.tar.bz2
Merge branch 'upstream-LibArchive' into update-libarchive
* upstream-LibArchive: LibArchive 2024-09-13 (12ecf841)
Diffstat (limited to 'Utilities/cmlibarchive/build')
-rw-r--r--Utilities/cmlibarchive/build/cmake/FindPCRE2POSIX.cmake34
-rw-r--r--Utilities/cmlibarchive/build/cmake/config.h.in20
-rwxr-xr-xUtilities/cmlibarchive/build/utils/gen_archive_string_composition_h.sh3
-rw-r--r--Utilities/cmlibarchive/build/version2
4 files changed, 49 insertions, 10 deletions
diff --git a/Utilities/cmlibarchive/build/cmake/FindPCRE2POSIX.cmake b/Utilities/cmlibarchive/build/cmake/FindPCRE2POSIX.cmake
new file mode 100644
index 0000000..76bb7a4
--- /dev/null
+++ b/Utilities/cmlibarchive/build/cmake/FindPCRE2POSIX.cmake
@@ -0,0 +1,34 @@
+# - Find pcre2posix
+# Find the native PCRE2-8 and PCRE2-POSIX include and libraries
+#
+# PCRE2_INCLUDE_DIR - where to find pcre2posix.h, etc.
+# PCRE2POSIX_LIBRARIES - List of libraries when using libpcre2-posix.
+# PCRE2_LIBRARIES - List of libraries when using libpcre2-8.
+# PCRE2POSIX_FOUND - True if libpcre2-posix found.
+# PCRE2_FOUND - True if libpcre2-8 found.
+
+IF (PCRE2_INCLUDE_DIR)
+ # Already in cache, be silent
+ SET(PCRE2_FIND_QUIETLY TRUE)
+ENDIF (PCRE2_INCLUDE_DIR)
+
+FIND_PATH(PCRE2_INCLUDE_DIR pcre2posix.h)
+FIND_LIBRARY(PCRE2POSIX_LIBRARY NAMES pcre2-posix libpcre2-posix pcre2-posix-static)
+FIND_LIBRARY(PCRE2_LIBRARY NAMES pcre2-8 libpcre2-8 pcre2-8-static)
+
+# handle the QUIETLY and REQUIRED arguments and set PCRE2POSIX_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCRE2POSIX DEFAULT_MSG PCRE2POSIX_LIBRARY PCRE2_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCRE2 DEFAULT_MSG PCRE2_LIBRARY)
+
+IF(PCRE2POSIX_FOUND)
+ SET(PCRE2POSIX_LIBRARIES ${PCRE2POSIX_LIBRARY})
+ SET(HAVE_LIBPCRE2POSIX 1)
+ SET(HAVE_PCRE2POSIX_H 1)
+ENDIF(PCRE2POSIX_FOUND)
+
+IF(PCRE2_FOUND)
+ SET(PCRE2_LIBRARIES ${PCRE2_LIBRARY})
+ SET(HAVE_LIBPCRE2 1)
+ENDIF(PCRE2_FOUND)
diff --git a/Utilities/cmlibarchive/build/cmake/config.h.in b/Utilities/cmlibarchive/build/cmake/config.h.in
index 493c388..c3b153d 100644
--- a/Utilities/cmlibarchive/build/cmake/config.h.in
+++ b/Utilities/cmlibarchive/build/cmake/config.h.in
@@ -537,6 +537,12 @@
/* Define to 1 if you have the `pcreposix' library (-lpcreposix). */
#cmakedefine HAVE_LIBPCREPOSIX 1
+/* Define to 1 if you have the `pcre2-8' library (-lpcre2-8). */
+#cmakedefine HAVE_LIBPCRE2 1
+
+/* Define to 1 if you have the `pcreposix' library (-lpcre2posix). */
+#cmakedefine HAVE_LIBPCRE2POSIX 1
+
/* Define to 1 if you have the `xml2' library (-lxml2). */
#cmakedefine HAVE_LIBXML2 1
@@ -552,9 +558,8 @@
/* Define to 1 if you have the `zstd' library (-lzstd). */
#cmakedefine HAVE_LIBZSTD 1
-/* Define to 1 if you have the `zstd' library (-lzstd) with compression
- support. */
-#cmakedefine HAVE_LIBZSTD_COMPRESSOR 1
+/* Define to 1 if you have the ZSTD_compressStream function. */
+#cmakedefine HAVE_ZSTD_compressStream 1
/* Define to 1 if you have the <limits.h> header file. */
#cmakedefine HAVE_LIMITS_H 1
@@ -710,6 +715,9 @@
/* Define to 1 if you have the <pcreposix.h> header file. */
#cmakedefine HAVE_PCREPOSIX_H 1
+/* Define to 1 if you have the <pcre2posix.h> header file. */
+#cmakedefine HAVE_PCRE2POSIX_H 1
+
/* Define to 1 if you have the `pipe' function. */
#cmakedefine HAVE_PIPE 1
@@ -867,6 +875,9 @@
/* Define to 1 if you have the `symlink' function. */
#cmakedefine HAVE_SYMLINK 1
+/* Define to 1 if you have the `sysconf' function. */
+#cmakedefine HAVE_SYSCONF 1
+
/* Define to 1 if you have the <sys/acl.h> header file. */
#cmakedefine HAVE_SYS_ACL_H 1
@@ -902,9 +913,6 @@
/* Define to 1 if you have the <sys/poll.h> header file. */
#cmakedefine HAVE_SYS_POLL_H 1
-/* Define to 1 if you have the <sys/queue.h> header file. */
-#cmakedefine HAVE_SYS_QUEUE_H 1
-
/* Define to 1 if you have the <sys/richacl.h> header file. */
#cmakedefine HAVE_SYS_RICHACL_H 1
diff --git a/Utilities/cmlibarchive/build/utils/gen_archive_string_composition_h.sh b/Utilities/cmlibarchive/build/utils/gen_archive_string_composition_h.sh
index 558e9c0..93012fe 100755
--- a/Utilities/cmlibarchive/build/utils/gen_archive_string_composition_h.sh
+++ b/Utilities/cmlibarchive/build/utils/gen_archive_string_composition_h.sh
@@ -39,9 +39,6 @@ cat > ${outfile} <<CR_END
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * \$FreeBSD\$
- *
*/
/*
diff --git a/Utilities/cmlibarchive/build/version b/Utilities/cmlibarchive/build/version
index 414ae6d..49ac2b5 100644
--- a/Utilities/cmlibarchive/build/version
+++ b/Utilities/cmlibarchive/build/version
@@ -1 +1 @@
-3007002
+3007005