diff options
| author | Brad King <brad.king@kitware.com> | 2011-12-20 17:07:39 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2011-12-22 15:38:36 (GMT) |
| commit | 25a5e7cbc1282211da9aff8e982045ec84612f9b (patch) | |
| tree | 4ad7cd200bf9a277f2d478bfedde6f1df8143e1d /Utilities | |
| parent | bbdb75c5ff6dfbfaf87ad3c866e72562fdbf7583 (diff) | |
| download | CMake-25a5e7cbc1282211da9aff8e982045ec84612f9b.zip CMake-25a5e7cbc1282211da9aff8e982045ec84612f9b.tar.gz CMake-25a5e7cbc1282211da9aff8e982045ec84612f9b.tar.bz2 | |
libarchive: Build one static cmlibarchive for CMake
CMake needs only a single static libarchive library and not a shared
one. Call it cmlibarchive to avoid confusion.
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/CMakeLists.txt | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/Utilities/cmlibarchive/libarchive/CMakeLists.txt b/Utilities/cmlibarchive/libarchive/CMakeLists.txt index 7213ea4..7384195 100644 --- a/Utilities/cmlibarchive/libarchive/CMakeLists.txt +++ b/Utilities/cmlibarchive/libarchive/CMakeLists.txt @@ -147,24 +147,6 @@ IF(WIN32 AND NOT CYGWIN) LIST(APPEND libarchive_SOURCES filter_fork_windows.c) ENDIF(WIN32 AND NOT CYGWIN) -# Libarchive is a shared library -ADD_LIBRARY(archive SHARED ${libarchive_SOURCES} ${include_HEADERS}) -TARGET_LINK_LIBRARIES(archive ${ADDITIONAL_LIBS}) -SET_TARGET_PROPERTIES(archive PROPERTIES SOVERSION ${SOVERSION}) - -# archive_static is a static library -ADD_LIBRARY(archive_static STATIC ${libarchive_SOURCES} ${include_HEADERS}) -SET_TARGET_PROPERTIES(archive_static PROPERTIES COMPILE_DEFINITIONS - LIBARCHIVE_STATIC) -# On Posix systems, libarchive.so and libarchive.a can co-exist. -IF(NOT WIN32 OR CYGWIN) - SET_TARGET_PROPERTIES(archive_static PROPERTIES OUTPUT_NAME archive) -ENDIF(NOT WIN32 OR CYGWIN) - -# How to install the libraries -INSTALL(TARGETS archive archive_static - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) -INSTALL_MAN(${libarchive_MANS}) -INSTALL(FILES ${include_HEADERS} DESTINATION include) +# CMake needs just one static "cmlibarchive" library. +ADD_LIBRARY(cmlibarchive STATIC ${libarchive_SOURCES} ${include_HEADERS}) +TARGET_LINK_LIBRARIES(cmlibarchive ${ADDITIONAL_LIBS}) |