Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=3153a32c7e9449c5d68c7661be1e16261d79458e
commit 3153a32c7e9449c5d68c7661be1e16261d79458e Author: Michel Hermier <[email protected]> Date: Sat Dec 7 13:50:25 2013 +0100 cmake: Remove DISABLE_STATIC_BUILD. diff --git a/CMakeLists.txt b/CMakeLists.txt index e251fa1..01bd331 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -141,14 +141,11 @@ CONFIGURE_FILE ( "${PROJECT_SOURCE_DIR}/config.h" ) +ADD_SUBDIRECTORY(etc) ADD_SUBDIRECTORY(lib/libpacman) +ADD_SUBDIRECTORY(src/pacman-g2) ADD_SUBDIRECTORY(src/versort) ADD_SUBDIRECTORY(src/vercmp) -ADD_SUBDIRECTORY(src/pacman-g2) -ADD_SUBDIRECTORY(etc) ADD_SUBDIRECTORY(scripts) -if(NOT DISABLE_STATIC_BUILD) - ADD_SUBDIRECTORY(src/pacman-g2-static) -endif(NOT DISABLE_STATIC_BUILD) ADD_SUBDIRECTORY(pactest) diff --git a/lib/libpacman/CMakeLists.txt b/lib/libpacman/CMakeLists.txt index 6b32250..eaee157 100644 --- a/lib/libpacman/CMakeLists.txt +++ b/lib/libpacman/CMakeLists.txt @@ -62,24 +62,6 @@ else(ENABLE_STATIC) set_target_properties(pacman PROPERTIES SOVERSION 0.${PACMAN_G2_LIB_VERSION}) endif(ENABLE_STATIC) -#static build -if(PACCURL_FOUND AND (NOT DISABLE_STATIC_BUILD)) - SET(CMAKE_FIND_LIBRARY_SUFFIXES .a) - add_library(pacman-static STATIC ${LIBPACMAN_SOURCES}) - set_target_properties(pacman-static PROPERTIES OUTPUT_NAME "pacman") - set_target_properties(pacman-static PROPERTIES LINK_SEARCH_START_STATIC ON) - set_target_properties(pacman-static PROPERTIES LINK_SEARCH_END_STATIC ON) - find_library(LIB_ARCHIVE_STATIC archive) - find_library(LIB_PACCURL_STATIC paccurl) - find_library(LIB_SSL_STATIC ssl) - target_link_libraries(pacman-static ${LIB_ARCHIVE_STATIC} ${LIB_PACCURL_STATIC} ${LIB_SSL_STATIC}) - install(TARGETS pacman-static DESTINATION lib) -else() - message(WARNING "Won't build pacman-g2.static") - set(DISABLE_STATIC_BUILD TRUE CACHE BOOL "Disable static build") -endif(PACCURL_FOUND AND (NOT DISABLE_STATIC_BUILD)) - install(TARGETS pacman DESTINATION lib) install(FILES pacman.h DESTINATION include) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pacman.pc DESTINATION lib/pkgconfig) - _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
