Kouhei Sutou
null+****@clear*****
Wed Mar 11 12:30:30 JST 2015
Kouhei Sutou 2015-03-11 12:30:30 +0900 (Wed, 11 Mar 2015) New Revision: 17185bc5c44cfb891bf088c95687133a239c6a14 https://github.com/groonga/groonga/commit/17185bc5c44cfb891bf088c95687133a239c6a14 Message: cmake: always enable Onigmo TODO: * Supported using system installed Onigmo instead of bundled Onigmo. Modified files: CMakeLists.txt configure.ac Modified: CMakeLists.txt (+5 -14) =================================================================== --- CMakeLists.txt 2015-03-10 23:53:21 +0900 (b915dea) +++ CMakeLists.txt 2015-03-11 12:30:30 +0900 (d910f51) @@ -533,29 +533,20 @@ find_program(RUBY NAMES "ruby2.1" "ruby21" "ruby") option(GRN_WITH_MRUBY "use mruby" OFF) if(GRN_WITH_MRUBY) - set(GRN_WITH_ONIGMO_DEFAULT ON) set(MRUBY_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/vendor/mruby-source/include") set(MRUBY_LIBS mruby) else() - set(GRN_WITH_ONIGMO_DEFAULT OFF) set(MRUBY_INCLUDE_DIRS "") set(MRUBY_LIBS "") endif() -option(GRN_WITH_ONIGMO "use Onigmo" ${GRN_WITH_ONIGMO_DEFAULT}) -if(GRN_WITH_ONIGMO) - set(ONIGMO_INCLUDE_DIRS - "${CMAKE_CURRENT_SOURCE_DIR}/vendor/onigmo-source") - set(ONIGMO_LIBS onigmo) -else() - set(ONIGMO_INCLUDE_DIRS "") - set(ONIGMO_LIBS "") -endif() +# TODO: Support using system Onigmo instead of bundled Onigmo. +set(GRN_WITH_ONIGMO ON) +set(ONIGMO_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/vendor/onigmo-source") +set(ONIGMO_LIBS onigmo) -if(NOT GRN_EMBED) - add_subdirectory(vendor) -endif() +add_subdirectory(vendor) add_subdirectory(lib) if(NOT GRN_EMBED) add_subdirectory(src) Modified: configure.ac (+1 -0) =================================================================== --- configure.ac 2015-03-10 23:53:21 +0900 (1d74bac) +++ configure.ac 2015-03-11 12:30:30 +0900 (08ccb58) @@ -1475,6 +1475,7 @@ AC_ARG_ENABLE(shared-onigmo, [enable_shared_onigmo="no"]) AM_CONDITIONAL(WITH_SHARED_ONIGMO, test "$enable_shared_onigmo" = "yes") +# TODO: Support using system Onigmo instead of bundled Onigmo. AC_DEFINE(GRN_WITH_ONIGMO, [1], [Use Onigmo.]) AC_CONFIG_SUBDIRS([vendor/onigmo]) -------------- next part -------------- HTML����������������������������...Download