summaryrefslogtreecommitdiffstats
path: root/Utilities/cmlibarchive/CMakeLists.txt
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-LibArchive' into update-libarchiveBrad King2018-09-261-9/+40
| | | | | * upstream-LibArchive: LibArchive 2018-09-03 (5fe69dd0)
* Merge branch 'upstream-LibArchive' into update-libarchiveBrad King2017-07-201-110/+299
| | | | | * upstream-LibArchive: LibArchive 2017-07-09 (98a69539)
* libarchive: Remove liblzma from introspection testsBrad King2017-02-271-2/+0
| | | | | | This was added upstream but does not make sense in CMake because we may replace the library with a logical target name that will not work inside a `try_compile`.
* Merge branch 'upstream-LibArchive' into update-libarchiveBrad King2017-02-271-4/+11
| | | | | * upstream-LibArchive: LibArchive 2017-02-25 (d6b1bb9f)
* Merge branch 'upstream-LibArchive' into update-libarchiveBrad King2017-02-201-46/+86
| | | | | * upstream-LibArchive: LibArchive 2017-02-19 (100ee75a)
* libarchive: Restore OpenSSL include directory from upstreamBrad King2016-06-071-0/+1
| | | | | | | | | | In commit v3.6.0-rc1~100^2 (libarchive: Drop early use of crypto library, 2016-05-03) we accidentally dropped the include directory for OpenSSL as well as the library. Without that, it works only accidentally when CHECK_CRYPTO happens to choose the OpenSSL implementation and add the include directory. Reported-by: Bradley Lowekamp <blowekamp@mail.nih.gov>
* libarchive: Drop early use of crypto libraryBrad King2016-05-031-2/+0
| | | | | | | | We already add the crypto library after the ssl library when using OpenSSL. Do not add it to the list of libraries individually or we may end up with the wrong order later. Further investigation will be needed to see how this change can be reconciled with the upstream need for the original line.
* Merge branch 'upstream-LibArchive' into update-libarchiveBrad King2016-05-021-10/+23
| | | | | Resolve conflicts in C code by taking their side. Resolve conflicts in CMake code by integrating the changes.
* Fix spelling typos in comments and documentation (#16037)Felix Geyer2016-03-291-1/+1
| | | | | The Debian package checker tool (lintian) detected several typos in CMake.
* libarchive: Drop use of pthread.h for CMake buildBrad King2015-10-281-0/+2
| | | | CMake does not use threads so we do not need this in our libarchive.
* Merge branch 'libarchive-upstream' into update-libarchiveBrad King2015-10-211-7/+68
| | | | Resolve conflicts by integrating changes from both sides.
* Merge topic 'cmake-cmp0054-warnings'Brad King2014-10-211-4/+4
|\ | | | | | | | | 29c3edb8 Avoid if() quoted auto-dereference
| * Avoid if() quoted auto-dereferenceBen Boeckel2014-10-201-4/+4
| | | | | | | | | | | | | | When testing CMAKE_<LANG>_COMPILER_ID values, do not explicitly dereference or quote the variable. We want if() to auto-dereference the variable and not its value. Also replace MATCHES with STREQUAL where equivalent.
* | Remove borland workarounds.Stephen Kelly2014-10-151-2/+0
|/ | | | | CMake 3.0 is the last release to require to be able to build with Borland.
* libarchive: Avoid depending on if() to dereference a quoted variableBrad King2014-09-111-2/+2
|
* CMake: Enable use of liblzma in libarchive (#14504)Daniel Pfeifer2014-07-291-9/+13
| | | | | Build liblzma as part of CMake or find one on the system. Modify our port of libarchive to use the liblzma configured for use with CMake.
* Merge topic 'update-libarchive'Brad King2014-04-171-0/+1
|\ | | | | | | | | | | | | | | | | | | | | 67f5f0a9 libarchive: Use _snprintf on Windows, not snprintf fcfbb0a9 libarchive: Drop LIBARCHIVE_ADDITIONAL_LIBS, CMake does not need it 61a649d9 libarchive: Update README-CMake.txt for new snapshot 4533560c Merge branch 'libarchive-upstream' into update-libarchive 44d6b82f libarchive: Disable all whitespace checks in third-party code 37f225b7 libarchive 3.1.2-246-ga5a5d28b (reduced) 6ab7c326 libarchive: Avoid left-shift overflow of signed integer
| * libarchive: Drop LIBARCHIVE_ADDITIONAL_LIBS, CMake does not need itBrad King2014-04-151-6/+0
| |
| * Merge branch 'libarchive-upstream' into update-libarchiveBrad King2014-04-151-0/+7
| | | | | | | | | | Resolve conflicts in Utilities/cmlibarchive/CMakeLists.txt as appropriate.
* | libarchive: Skip finding libacl.h when ENABLE_ACL is OFF (#14866)Mike Crowe2014-04-141-1/+5
|/
* libarchive: Drop options not present in reduced versionBrad King2014-04-031-6/+0
| | | | | | Drop ENABLE_TAR and ENABLE_CPIO related options because we do not build these command-line tools. Drop ENABLE_TEST and ENABLE_COVERAGE options because we do not build the tests.
* libarchive: Do not generate a pkg-config fileBrad King2014-04-031-3/+0
| | | | | CMake does not install the headers or libraries so skip the .pc file too.
* Merge branch 'libarchive-upstream' into update-libarchiveBrad King2014-04-031-23/+43
| | | | | | Resolve conflicts in favor of the upstream side where possible. Resolve a logical conflict in archive_windows.h where the upstream port to Watcom was done slightly differently from ours.
* Clang: Add separate "AppleClang" compiler idBrad King2013-10-081-1/+1
| | | | | | | | | | | | Apple distributes their own Clang build with their own version numbers that differ from upstream Clang. Use the __apple_build_version__ symbol to identify the Apple Clang compiler and report the Apple Build Version as the fourth version component in CMAKE_<LANG>_COMPILER_VERSION. Add Compiler/AppleClang-<lang> and Platform/Darwin-AppleClang-<lang> modules that simply include the upstream equivalents. Fix comparisons of CMAKE_<LANG>_COMPILER_ID to Clang in CMake's own source and tests to account for AppleClang.
* Clean up install rules of CMake itself (#14371)Brad King2013-08-261-1/+1
| | | | | | | | | | | Ensure CMAKE_DATA_DIR, CMAKE_DOC_DIR, and CMAKE_MAN_DIR are always relative paths in CMake code, and set defaults accordingly. Use the install() command instead of install_files() and install_targets(). This is more modern and also avoids stripping of the first character from user-specified destinations. While at it, fix the default destinations reported in the bootstrap help.
* libarchive: Backport to CMake 2.8.2Brad King2013-07-311-15/+12
| | | | | | | Avoid requiring CMake 2.8.6 for CMakePushCheckState or CMake 2.8.8 for CMakeExpandImportedTargets. Drop the custom versions of CMake modules CheckCSource(Compiles|Runs) because we do not use the SAFESEH option anyway.
* libarchive: Remove build options not used by CMakeBrad King2013-07-311-122/+0
| | | | | Drop options POSIX_REGEX_LIB and ENABLE_SAFESEH that we do not want for the CMake build of libarchive.
* Merge branch 'libarchive-upstream' into update-libarchiveBrad King2013-07-311-70/+395
| | | | | | | | | | | Conflicts: Utilities/cmlibarchive/CMakeLists.txt Utilities/cmlibarchive/libarchive/archive.h Utilities/cmlibarchive/libarchive/archive_entry.h Utilities/cmlibarchive/libarchive/archive_read_disk_posix.c Utilities/cmlibarchive/libarchive/archive_read_support_format_iso9660.c Utilities/cmlibarchive/libarchive/archive_windows.h Utilities/cmlibarchive/libarchive/archive_write_set_format_iso9660.c
* Require CMake 2.8.2 or higher to build CMakeBrad King2012-04-261-1/+1
| | | | | | | | | Update the requirement specified in the top-level CMakeLists.txt file. Drop the special-case minimum required version of 2.8.0 because the new minimum subsumes it. Revert commit 6c611c6b (libarchive: Restore CMake 2.6.3 as minimum version, 2012-01-05) since our requirement now subsumes libarchive's.
* libarchive: Restore CMake 2.6.3 as minimum versionBrad King2012-01-051-1/+1
| | | | | | Upstream libarchive now requires CMake 2.8 to get the newer add_test functionality. Since we do not build libarchive's tests we do not need the requirement.
* Merge branch 'libarchive-upstream' into update-libarchiveBrad King2012-01-051-8/+5
| | | | | | Conflicts: Utilities/cmlibarchive/CMakeLists.txt Utilities/cmlibarchive/libarchive/archive_windows.c
* libarchive: Suppress PathScale compiler warningsBrad King2012-01-041-0/+2
| | | | We are not developing libarchive so we do not care about warnings.
* libarchive: Include linux/types.h before linux/fiemap.hBrad King2012-01-041-0/+1
| | | | | Some Linux API versions do not perform this inclusion automatically, so types like __u64 needed by the latter are not available.
* libarchive: Define _XOPEN_SOURCE=500 on HP-UXBrad King2012-01-041-0/+4
| | | | | | | The HP-UX <wchar.h> header provides 'mbstate_t' in C89/C90 mode only if _XOPEN_SOURCE is defined to exactly 500. Type 'mbstate_t' was introduced in C89/C90 Normative Amendment 1, aka C94/C95, adding support international character sets. It is part of C99 but not C89/C90.
* libarchive: Cleanup after ZLIB_WINAPI checkBrad King2012-01-031-0/+2
| | | | | Clear CMAKE_REQUIRED_(INCLUDES|LIBRARIES) so that the rest of the checks after this one do not try to link zlib.
* libarchive: Remove hard-coded build configurationBrad King2012-01-031-1/+0
| | | | | Do not set CMAKE_BUILD_TYPE to Debug. Use the configuration specified by the user.
* libarchive: Check for 'struct statvfs' member 'f_iosize'Brad King2011-12-231-0/+6
| | | | | | Configure the result as definition HAVE_STRUCT_STATVFS_F_IOSIZE and use the member only if it exists. At least one platform (IRIX) provides struct statvfs without this member.
* libarchive: Suppress compiler warningsBrad King2011-12-231-0/+8
| | | | We are not developing libarchive so we do not care about warnings.
* libarchive: Fix Windows NT API usage in VS 6Brad King2011-12-231-2/+6
| | | | | | | | VS 6 warns verbosely when WINVER >= 0x0500. Avoid defining WINVER and _WIN32_WINNT to higher than 0x0400 on VS 6. Provide missing API declarations in archive_windows.h when we do not get them from <windows.h>. Provide GetVolumePathNameW because VS 6 does not declare it regardless of the API version.
* libarchive: Clean up configuration within CMake buildBrad King2011-12-231-2/+8
| | | | | Require ZLIB but skip LZMA and XML support. Mark ZLIB and ICONV cache variables advanced.
* libarchive: Install COPYING with CMake documentationBrad King2011-12-231-0/+2
| | | | | Replay commit d39aee48 (Install COPYING with CMake documentation, 2011-06-16) after import of new libarchive snapshot.
* libarchive: Remove -Wall -Werror from build with GNUBrad King2011-12-221-8/+0
| | | | | We are not developing new libarchive features. Furthermore -Werror can break some try_compile cases.
* libarchive: Do not build subdirectories not in reduced snapshotBrad King2011-12-221-15/+0
| | | | | | Remove add_subdirectory() calls for directories not included in the reduced libarchive snapshot. Remove options that configure settings in the missing directories.
* Merge branch 'libarchive-upstream' into update-libarchiveBrad King2011-12-201-0/+1106
| | | | | Add Utilities/cmlibarchive using upstream libarchive 3.0.0-r3950 snapshot.
* libarchive: Remove our copy to make room for new importBrad King2011-12-201-740/+0
|
* libarchive: Install COPYING with CMake documentationBrad King2011-06-201-0/+2
|
* Require at least CMake 2.6.3 to build current CMakeBrad King2011-02-241-1/+1
| | | | Remove some cruft left for supporting builds with CMake 2.4.
* libarchive: Use OpenSSL only if CMAKE_USE_OPENSSL (#11815)Brad King2011-02-081-2/+10
| | | | | | OpenSSL is not part of the Linux Standard Base but its headers and libraries may still be found at build time even though they may not be available at runtime. Use it only if explicitly allowed.
* libarchive: Fix major() check for LSB 4.0 (#11648)Brad King2011-01-121-2/+6
| | | | | | | | | | The LSB header files define major() as a macro but if it is ever called the macro references symbols not available at link time. Improve the test for major() to actually call the macro and try to link. This approach is based on upstream libarchive SVN commit 2866 which fixed libarchive issue 125, submitted in response to CMake issue #11648. Inspired-by: Tim Kientzle <kientzle@freebsd.org>
* Fixes for the OSF operating system build.Bill Hoffman2010-09-081-3/+5
|
generated by cgit v0.12 at 2025-01-10 20:09:42 (GMT)