diff options
| author | Brad King <brad.king@kitware.com> | 2014-04-15 20:34:50 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-04-15 20:34:50 (GMT) |
| commit | 4533560c23adf29a03d57b5c5678048795ed6134 (patch) | |
| tree | ae53680c085c37e68c2fc101306acdd40fecb780 /Utilities/cmlibarchive/CMakeLists.txt | |
| parent | 44d6b82f4351dc3941fd9794ad8f3909148c0314 (diff) | |
| parent | 37f225b72c8e4c440025a98f68eda9914f7ba5f7 (diff) | |
| download | CMake-4533560c23adf29a03d57b5c5678048795ed6134.zip CMake-4533560c23adf29a03d57b5c5678048795ed6134.tar.gz CMake-4533560c23adf29a03d57b5c5678048795ed6134.tar.bz2 | |
Merge branch 'libarchive-upstream' into update-libarchive
Resolve conflicts in Utilities/cmlibarchive/CMakeLists.txt as
appropriate.
Diffstat (limited to 'Utilities/cmlibarchive/CMakeLists.txt')
| -rw-r--r-- | Utilities/cmlibarchive/CMakeLists.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt index e493966..77010c5 100644 --- a/Utilities/cmlibarchive/CMakeLists.txt +++ b/Utilities/cmlibarchive/CMakeLists.txt @@ -28,6 +28,7 @@ STRING(REGEX REPLACE "[0]*([^0]*[0-9])$" "\\1" _trimmed_revision ${_revision}) SET(VERSION "${_major}.${_trimmed_minor}.${_trimmed_revision}${_quality}") SET(BSDCPIO_VERSION_STRING "${VERSION}") SET(BSDTAR_VERSION_STRING "${VERSION}") +SET(BSDCAT_VERSION_STRING "${VERSION}") SET(LIBARCHIVE_VERSION_NUMBER "${_version_number}") SET(LIBARCHIVE_VERSION_STRING "${VERSION}") @@ -1291,6 +1292,12 @@ INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) ADD_DEFINITIONS(-DHAVE_CONFIG_H) # +# Expose ADDITIONAL_LIBS for projects using libarchive as a subdirectory +# and linking against archive_static. +# +set(LIBARCHIVE_ADDITIONAL_LIBS ${ADDITIONAL_LIBS} CACHE INTERNAL "libarchive dependencies") + +# # Register installation of PDF documents. # IF(WIN32 AND NOT CYGWIN) |