From 99510e132890526d71fb065f09c2bd9c3658b179 Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Mon, 16 Nov 2009 01:26:09 -0500 Subject: [PATCH] On Windows, building a client against a static libarchive requires LIBARCHIVE_STATIC be defined. SVN-Revision: 1653 --- cpio/CMakeLists.txt | 2 ++ tar/CMakeLists.txt | 2 ++ 2 files changed, 4 insertions(+) diff --git a/cpio/CMakeLists.txt b/cpio/CMakeLists.txt index 84934ad0c..3cafb7d7c 100644 --- 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 f6a0d0ec7..d70022334 100644 --- 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) -- 2.47.3