HAYASHI Kentaro
null+****@clear*****
Fri Oct 5 19:37:58 JST 2012
HAYASHI Kentaro 2012-10-05 19:37:58 +0900 (Fri, 05 Oct 2012) New Revision: 3a8a2b035069467b861930979806c14ad7391f9e https://github.com/groonga/groonga/commit/3a8a2b035069467b861930979806c14ad7391f9e Log: cmake: change to build static library as optional Modified files: CMakeLists.txt lib/CMakeLists.txt Modified: CMakeLists.txt (+1 -0) =================================================================== --- CMakeLists.txt 2012-10-05 19:26:08 +0900 (79291cc) +++ CMakeLists.txt 2012-10-05 19:37:58 +0900 (ab45ffc) @@ -131,6 +131,7 @@ if(WIN32) endif() option(WITH_NFKC "use NFKC based UTF8 normalization." ON) +option(WITH_STATIC "build static library." OFF) if(WIN32) ac_check_headers(winsock2.h) Modified: lib/CMakeLists.txt (+7 -3) =================================================================== --- lib/CMakeLists.txt 2012-10-05 19:26:08 +0900 (040cd37) +++ lib/CMakeLists.txt 2012-10-05 19:37:58 +0900 (483e233) @@ -27,9 +27,11 @@ string(REGEX REPLACE "([^;]+)" "dat/\\1" LIBGRNDAT_SOURCES "${LIBGRNDAT_SOURCES}") add_library(libgroonga SHARED ${LIBGROONGA_SOURCES} ${LIBGRNDAT_SOURCES}) -add_library(libgroonga_static STATIC ${LIBGROONGA_SOURCES} ${LIBGRNDAT_SOURCES}) set_target_properties(libgroonga PROPERTIES OUTPUT_NAME "groonga") -set_target_properties(libgroonga_static PROPERTIES OUTPUT_NAME "groonga") +if(WITH_STATIC) + add_library(libgroonga_static STATIC ${LIBGROONGA_SOURCES} ${LIBGRNDAT_SOURCES}) + set_target_properties(libgroonga_static PROPERTIES OUTPUT_NAME "groonga") +endif() target_link_libraries(libgroonga ${PTHREAD_LIBS} ${Z_LIBS} @@ -43,4 +45,6 @@ else() set(LIBGROONGA_INSTALL_DIR "${LIB_DIR}") endif() install(TARGETS libgroonga DESTINATION "${LIBGROONGA_INSTALL_DIR}") -install(TARGETS libgroonga_static DESTINATION "${LIBGROONGA_INSTALL_DIR}") +if(WITH_STATIC) + install(TARGETS libgroonga_static DESTINATION "${LIBGROONGA_INSTALL_DIR}") +endif() -------------- next part -------------- HTML����������������������������... Download