From: Tim Kientzle Date: Sat, 12 Apr 2014 16:45:07 +0000 (-0700) Subject: Merge pull request #75 from biometrics/additional_libs_scope X-Git-Tag: v3.1.900a~305 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50482fdfc4284e3fe92687b6dd0af9e269fb5194;p=thirdparty%2Flibarchive.git Merge pull request #75 from biometrics/additional_libs_scope Expose ADDITIONAL_LIBS --- 50482fdfc4284e3fe92687b6dd0af9e269fb5194 diff --cc CMakeLists.txt index b55567095,1010b4f06..607ce2e9b --- a/CMakeLists.txt +++ b/CMakeLists.txt @@@ -1535,9 -1491,12 +1535,15 @@@ 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} PARENT_SCOPE) + # # Register installation of PDF documents. #