On Windows, building a client against a static libarchive

requires LIBARCHIVE_STATIC be defined.

SVN-Revision: 1653

diff --git a/cpio/CMakeLists.txt b/cpio/CMakeLists.txt
index 84934ad0cb65ad71115c634c977cedec6c6a1a62..3cafb7d7c30b037169b92edbb84bc86cdee2baff 100644 (file)
--- a/cpio/CMakeLists.txt
+++ b/cpio/CMakeLists.txt
@@ -35,6 +35,8 @@ IF(ENABLE_CPIO)
     TARGET_LINK_LIBRARIES(bsdcpio archive ${ADDITIONAL_LIBS})
   ELSE(ENABLE_CPIO_SHARED)
     TARGET_LINK_LIBRARIES(bsdcpio archive_static ${ADDITIONAL_LIBS})
+    SET_TARGET_PROPERTIES(bsdcpio PROPERTIES COMPILE_DEFINITIONS
+                                 LIBARCHIVE_STATIC)
   ENDIF(ENABLE_CPIO_SHARED)
   # On Windows, DLL must end up in same dir with EXEs
   IF(WIN32 AND NOT CYGWIN)

diff --git a/tar/CMakeLists.txt b/tar/CMakeLists.txt
index f6a0d0ec7bac87c30b87044242144c8e410d8fb8..d700223349e7da7177caf5fab12473f6b7642f75 100644 (file)
--- a/tar/CMakeLists.txt
+++ b/tar/CMakeLists.txt
@@ -42,6 +42,8 @@ IF (ENABLE_TAR)
     TARGET_LINK_LIBRARIES(bsdtar archive ${ADDITIONAL_LIBS})
   ELSE(ENABLE_TAR_SHARED)
     TARGET_LINK_LIBRARIES(bsdtar archive_static ${ADDITIONAL_LIBS})
+    SET_TARGET_PROPERTIES(bsdtar PROPERTIES COMPILE_DEFINITIONS
+                                LIBARCHIVE_STATIC)
   ENDIF(ENABLE_TAR_SHARED)
   # On Windows, DLL must end up in same dir with EXEs
   IF(WIN32 AND NOT CYGWIN)