Kouhei Sutou
null+****@clear*****
Mon Sep 30 21:08:21 JST 2013
Kouhei Sutou 2013-09-30 21:08:21 +0900 (Mon, 30 Sep 2013) New Revision: 8ddb7bc93268be1fc14334bf35190dc421dcb39f https://github.com/groonga/groonga/commit/8ddb7bc93268be1fc14334bf35190dc421dcb39f Message: cmake: remove static build support Modified files: CMakeLists.txt lib/CMakeLists.txt Modified: CMakeLists.txt (+0 -1) =================================================================== --- CMakeLists.txt 2013-09-30 20:29:02 +0900 (24f577d) +++ CMakeLists.txt 2013-09-30 21:08:21 +0900 (40da2bf) @@ -156,7 +156,6 @@ if(UNIX) endif() option(GRN_WITH_NFKC "use NFKC based UTF8 normalization." ON) -option(GRN_WITH_STATIC "build static library." OFF) if(WIN32) ac_check_headers(winsock2.h) Modified: lib/CMakeLists.txt (+4 -5) =================================================================== --- lib/CMakeLists.txt 2013-09-30 20:29:02 +0900 (6d3fb01) +++ lib/CMakeLists.txt 2013-09-30 21:08:21 +0900 (9dba36d) @@ -33,12 +33,11 @@ set_source_files_properties(dat.cpp ${LIBGRNDAT_SOURCES} PROPERTIES COMPILE_FLAGS "${GRN_CXX_COMPILE_FLAGS}") -add_library(libgroonga SHARED ${LIBGROONGA_SOURCES} ${LIBGRNDAT_SOURCES}) +add_library(libgroonga SHARED + ${LIBGROONGA_SOURCES} + ${LIBGRNDAT_SOURCES} + $<TARGET_OBJECTS:mruby>) set_target_properties(libgroonga PROPERTIES OUTPUT_NAME "groonga") -if(GRN_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 ${EXECINFO_LIBS} ${RT_LIBS} -------------- next part -------------- HTML����������������������������...Download