From: Tim Kientzle Date: Wed, 16 Apr 2014 01:56:37 +0000 (-0700) Subject: Merge pull request #77 from biometrics/additional_libs_scope X-Git-Tag: v3.1.900a~299 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=440ae0e9719e33982a844b9199dd184441c86f69;p=thirdparty%2Flibarchive.git Merge pull request #77 from biometrics/additional_libs_scope just link the archive_static with ADDITIONAL_LIBS --- 440ae0e9719e33982a844b9199dd184441c86f69 diff --cc CMakeLists.txt index 4bfb7f362,2cdb9fb48..b55567095 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@@ -1535,15 -1491,6 +1535,9 @@@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_D INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) ADD_DEFINITIONS(-DHAVE_CONFIG_H) +# Handle generation of the libarchive.pc file for pkg-config +INCLUDE(CreatePkgConfigFile) + - # - # 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. #