diff options
| author | dec05eba <dec05eba@protonmail.com> | 2018-10-02 21:14:45 +0200 |
|---|---|---|
| committer | dec05eba <dec05eba@protonmail.com> | 2020-07-06 07:39:33 +0200 |
| commit | d22001283a49ad723da0023039c904dc6db7c5a0 (patch) | |
| tree | 4ec8b61a33b57ad2ccec5cc1309ea1f927620ef2 /CMakeLists.txt | |
| parent | 7a483ac5f0e483dd9dff2a22ee4f0480ab75f039 (diff) | |
Fix bundle for non system libraries
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b4c3ae..285f69d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,8 +3,6 @@ project(sibs) set(CMAKE_CXX_STANDARD 14) -option(BUILD_STATIC "Build sibs statically on linux" OFF) - set(SOURCE_FILES external/xxhash.c backend/ninja/Ninja.cpp @@ -40,26 +38,6 @@ if(WIN32) target_link_libraries(sibs ${CURL_LIBRARIES} ${LibArchive_LIBRARIES} "${CMAKE_CURRENT_SOURCE_DIR}/static/windows/git2.lib") target_compile_options(sibs PRIVATE /Wall) else() - if(BUILD_STATIC AND UNIX AND NOT APPLE AND CMAKE_SIZEOF_VOID_P EQUAL 8) - target_link_libraries(sibs - -static - "${CMAKE_CURRENT_SOURCE_DIR}/static/linux/libarchive.a" - "${CMAKE_CURRENT_SOURCE_DIR}/static/linux/libbz2.a" - "${CMAKE_CURRENT_SOURCE_DIR}/static/linux/libxml2.a" - "${CMAKE_CURRENT_SOURCE_DIR}/static/linux/liblzma.a" - "${CMAKE_CURRENT_SOURCE_DIR}/static/linux/liblz4.a" - "${CMAKE_CURRENT_SOURCE_DIR}/static/linux/libgit2.a" - "${CMAKE_CURRENT_SOURCE_DIR}/static/linux/libcurl.a" - "${CMAKE_CURRENT_SOURCE_DIR}/static/linux/libz.a" - "${CMAKE_CURRENT_SOURCE_DIR}/static/linux/libssh2.a" - "${CMAKE_CURRENT_SOURCE_DIR}/static/linux/libhttp_parser.a" - "${CMAKE_CURRENT_SOURCE_DIR}/static/linux/libssl.a" - "${CMAKE_CURRENT_SOURCE_DIR}/static/linux/libcrypto.a" - -pthread - -ldl - -lm) - else() - target_link_libraries(sibs ${CURL_LIBRARIES} ${LibArchive_LIBRARIES} -lgit2) - endif() + target_link_libraries(sibs ${CURL_LIBRARIES} ${LibArchive_LIBRARIES} -lgit2) target_compile_options(sibs PRIVATE -Wall -Wextra -Werror=return-type -fdiagnostics-show-option -fexceptions) endif() |