From: Josh Klontz <Joshua.Klontz@noblis.org>
Date: Tue, 15 Apr 2014 20:53:41 +0000 (-0400)
Subject: just link the archive_static with ADDITIONAL_LIBS
X-Git-Tag: v3.1.900a~299^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2052d4c8a521f3af8cc7fed6359911af55bc8786;p=thirdparty%2Flibarchive.git

just link the archive_static with ADDITIONAL_LIBS
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d75db8fba..2cdb9fb48 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1491,12 +1491,6 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/build/cmake/config.h.in
 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.
 #
diff --git a/libarchive/CMakeLists.txt b/libarchive/CMakeLists.txt
index ecb0409bd..c146cec13 100644
--- a/libarchive/CMakeLists.txt
+++ b/libarchive/CMakeLists.txt
@@ -175,6 +175,7 @@ SET_TARGET_PROPERTIES(archive PROPERTIES SOVERSION ${SOVERSION})
 
 # archive_static is a static library
 ADD_LIBRARY(archive_static STATIC ${libarchive_SOURCES} ${include_HEADERS})
+TARGET_LINK_LIBRARIES(archive_static ${ADDITIONAL_LIBS})
 SET_TARGET_PROPERTIES(archive_static PROPERTIES COMPILE_DEFINITIONS
   LIBARCHIVE_STATIC)
 # On Posix systems, libarchive.so and libarchive.a can co-exist.