]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Merge pull request #77 from biometrics/additional_libs_scope
authorTim Kientzle <kientzle@acm.org>
Wed, 16 Apr 2014 01:56:37 +0000 (18:56 -0700)
committerTim Kientzle <kientzle@acm.org>
Wed, 16 Apr 2014 01:56:37 +0000 (18:56 -0700)
just link the archive_static with ADDITIONAL_LIBS

1  2 
CMakeLists.txt
libarchive/CMakeLists.txt

diff --cc CMakeLists.txt
index 4bfb7f3623c0845874a5cce587af598156c5dd4b,2cdb9fb4858566341fd845b3d0cb2a81916f70e7..b555670953398071f09493104a11f93b636243ed
@@@ -1535,15 -1491,6 +1535,9 @@@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_D
  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")
 +# Handle generation of the libarchive.pc file for pkg-config
 +INCLUDE(CreatePkgConfigFile)
 +
  #
  # Register installation of PDF documents.
  #
Simple merge