Skip to content

M
MariaDB
Commit bb1ce607 authored by Sergei Golubchik's avatar Sergei Golubchik
Browse files
Options

mroonga/groonga: CMakeLists.txt 

* use the same HAVE_C/CXX_ variables for compiler flag tests as the rest of
  the server and tokudb - to use cached results
* plugin's name should be "mroonga" not "ha_mroonga"
* don't use set_property(TARGET plugin_name ...), it aborts cmake when a plugin
  id disabled, because the target doesn't exists in that case

result: mroonga can now be disabled from cmake command line
parent c417da24
Show whitespace changes
Inline Side-by-side
Showing with 22 additions and 45 deletions
storage/mroonga/CMakeLists.txt
View file @ bb1ce607
...@@ -41,7 +41,7 @@ else() ...@@ -41,7 +41,7 @@ else()
endif() endif()
if(MRN_BUNDLED) if(MRN_BUNDLED)
if(WITHOUT_HA_MROONGA OR WITHOUT_HA_MROONGA_STORAGE_ENGINE) if(WITHOUT_MROONGA OR WITHOUT_MROONGA_STORAGE_ENGINE)
return() return()
endif() endif()
endif() endif()
...@@ -98,21 +98,15 @@ set(MRN_C_COMPILE_FLAGS "") ...@@ -98,21 +98,15 @@ set(MRN_C_COMPILE_FLAGS "")
set(MRN_CXX_COMPILE_FLAGS "") set(MRN_CXX_COMPILE_FLAGS "")
macro(mrn_check_cflag flag) macro(mrn_check_cflag flag)
string(REGEX REPLACE "[-=]" "_" temporary_variable_name ${flag}) check_c_compiler_flag(${flag} "HAVE_C_${flag}")
string(TOUPPER "${temporary_variable_name}" temporary_variable_name) if(HAVE_C_${flag})
set(temporary_variable_name "CFLAG${temporary_variable_name}")
check_c_compiler_flag(${flag} ${temporary_variable_name})
if(${temporary_variable_name})
set(MRN_C_COMPILE_FLAGS "${MRN_C_COMPILE_FLAGS} ${flag}") set(MRN_C_COMPILE_FLAGS "${MRN_C_COMPILE_FLAGS} ${flag}")
endif() endif()
endmacro() endmacro()
macro(mrn_check_cxxflag flag) macro(mrn_check_cxxflag flag)
string(REGEX REPLACE "[-=]" "_" temporary_variable_name ${flag}) check_cxx_compiler_flag(${flag} "HAVE_CXX_${flag}")
string(TOUPPER "${temporary_variable_name}" temporary_variable_name) if(HAVE_CXX_${flag})
set(temporary_variable_name "CXXFLAG${temporary_variable_name}")
check_cxx_compiler_flag(${flag} ${temporary_variable_name})
if(${temporary_variable_name})
set(MRN_CXX_COMPILE_FLAGS "${MRN_CXX_COMPILE_FLAGS} ${flag}") set(MRN_CXX_COMPILE_FLAGS "${MRN_CXX_COMPILE_FLAGS} ${flag}")
endif() endif()
endmacro() endmacro()
...@@ -246,27 +240,19 @@ link_directories( ...@@ -246,27 +240,19 @@ link_directories(
if(MRN_BUNDLED) if(MRN_BUNDLED)
if(GROONGA_NORMALIZER_MYSQL_FOUND AND MRN_GROONGA_BUNDLED) if(GROONGA_NORMALIZER_MYSQL_FOUND AND MRN_GROONGA_BUNDLED)
mysql_add_plugin(ha_mroonga mysql_add_plugin(mroonga
"${MROONGA_SOURCES};${MRN_UDF_SOURCES};${MRN_GRN_NORMALIZER_MYSQL_SOURCES};${LIBMRN_NEED_MYSQL_SOURCES};${LIBMRN_NO_MYSQL_SOURCES}" "${MROONGA_SOURCES};${MRN_UDF_SOURCES};${MRN_GRN_NORMALIZER_MYSQL_SOURCES};${LIBMRN_NEED_MYSQL_SOURCES};${LIBMRN_NO_MYSQL_SOURCES}"
STORAGE_ENGINE MODULE_ONLY STORAGE_ENGINE MODULE_ONLY
LINK_LIBRARIES ${GROONGA_LIBRARIES} LINK_LIBRARIES ${GROONGA_LIBRARIES}
MODULE_OUTPUT_NAME "ha_mroonga") MODULE_OUTPUT_NAME "ha_mroonga")
else() else()
mysql_add_plugin(ha_mroonga mysql_add_plugin(mroonga
"${MROONGA_SOURCES};${MRN_UDF_SOURCES};${LIBMRN_NEED_MYSQL_SOURCES};${LIBMRN_NO_MYSQL_SOURCES}" "${MROONGA_SOURCES};${MRN_UDF_SOURCES};${LIBMRN_NEED_MYSQL_SOURCES};${LIBMRN_NO_MYSQL_SOURCES}"
STORAGE_ENGINE MODULE_ONLY STORAGE_ENGINE MODULE_ONLY
LINK_LIBRARIES ${GROONGA_LIBRARIES} LINK_LIBRARIES ${GROONGA_LIBRARIES}
MODULE_OUTPUT_NAME "ha_mroonga") MODULE_OUTPUT_NAME "ha_mroonga")
endif() endif()
set(EXPANDED_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_LIBDIR}") else()
list(FIND
CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
"${EXPANDED_INSTALL_LIBDIR}"
EXPANDED_INSTALL_LIBDIR_INDEX_IN_IMPLICIT_LINK_DIRECTORIES)
if(EXPANDED_INSTALL_LIBDIR_INDEX_IN_IMPLICIT_LINK_DIRECTORIES EQUAL -1)
set_property(TARGET ha_mroonga APPEND PROPERTY
INSTALL_RPATH "${EXPANDED_INSTALL_LIBDIR}")
endif()
else() else()
add_library(ha_mroonga MODULE add_library(ha_mroonga MODULE
${MROONGA_SOURCES} ${MROONGA_SOURCES}
...@@ -279,32 +265,32 @@ else() ...@@ -279,32 +265,32 @@ else()
option(WITH_DEBUG "Enable debug options" OFF) option(WITH_DEBUG "Enable debug options" OFF)
if(WITH_DEBUG) if(WITH_DEBUG)
set_property(TARGET ha_mroonga APPEND PROPERTY set_property(TARGET mroonga APPEND PROPERTY
COMPILE_DEFINITIONS "SAFE_MUTEX") COMPILE_DEFINITIONS "SAFE_MUTEX")
if(CMAKE_COMPILER_IS_GNUCXX) if(CMAKE_COMPILER_IS_GNUCXX)
set(MRN_C_COMPILE_FLAGS "${MRN_C_COMPILE_FLAGS} -g3 -O0") set(MRN_C_COMPILE_FLAGS "${MRN_C_COMPILE_FLAGS} -g3 -O0")
set(MRN_CXX_COMPILE_FLAGS "${MRN_CXX_COMPILE_FLAGS} -g3 -O0") set(MRN_CXX_COMPILE_FLAGS "${MRN_CXX_COMPILE_FLAGS} -g3 -O0")
endif() endif()
else() else()
set_property(TARGET ha_mroonga APPEND PROPERTY set_property(TARGET mroonga APPEND PROPERTY
COMPILE_DEFINITIONS "DBUG_OFF") COMPILE_DEFINITIONS "DBUG_OFF")
endif() endif()
option(WITH_DEBUG_FULL "Enable full debug options" OFF) option(WITH_DEBUG_FULL "Enable full debug options" OFF)
if(WITH_DEBUG_FULL) if(WITH_DEBUG_FULL)
set_property(TARGET ha_mroonga APPEND PROPERTY set_property(TARGET mroonga APPEND PROPERTY
COMPILE_DEFINITIONS "SAFE_MUTEX" "SAFEMALLOC") COMPILE_DEFINITIONS "SAFE_MUTEX" "SAFEMALLOC")
endif() endif()
option(DISABLE_FAST_MUTEXES "Force disabling fast mutex" OFF) option(DISABLE_FAST_MUTEXES "Force disabling fast mutex" OFF)
if(DISABLE_FAST_MUTEXES) if(DISABLE_FAST_MUTEXES)
set_property(TARGET ha_mroonga APPEND PROPERTY set_property(TARGET mroonga APPEND PROPERTY
COMPILE_DEFINITIONS "FORCE_FAST_MUTEX_DISABLED=1") COMPILE_DEFINITIONS "FORCE_FAST_MUTEX_DISABLED=1")
endif() endif()
option(WITH_FAST_MUTEXES "Enable fast mutex" OFF) option(WITH_FAST_MUTEXES "Enable fast mutex" OFF)
if(WITH_FAST_MUTEXES) if(WITH_FAST_MUTEXES)
set_property(TARGET ha_mroonga APPEND PROPERTY set_property(TARGET mroonga APPEND PROPERTY
COMPILE_DEFINITIONS "MY_PTHREAD_FASTMUTEX") COMPILE_DEFINITIONS "MY_PTHREAD_FASTMUTEX")
endif() endif()
...@@ -327,7 +313,7 @@ else() ...@@ -327,7 +313,7 @@ else()
COMPILE_FLAGS "${MRN_C_COMPILE_FLAGS}") COMPILE_FLAGS "${MRN_C_COMPILE_FLAGS}")
set_source_files_properties(${LIBMRN_NO_MYSQL_SOURCES} PROPERTIES set_source_files_properties(${LIBMRN_NO_MYSQL_SOURCES} PROPERTIES
COMPILE_FLAGS "${MRN_C_COMPILE_FLAGS}") COMPILE_FLAGS "${MRN_C_COMPILE_FLAGS}")
set_property(TARGET ha_mroonga APPEND PROPERTY set_property(TARGET mroonga APPEND PROPERTY
COMPILE_DEFINITIONS "MYSQL_DYNAMIC_PLUGIN") COMPILE_DEFINITIONS "MYSQL_DYNAMIC_PLUGIN")
set_target_properties(ha_mroonga PROPERTIES set_target_properties(ha_mroonga PROPERTIES
PREFIX "" PREFIX ""
...@@ -338,21 +324,18 @@ endif() ...@@ -338,21 +324,18 @@ endif()
if(GROONGA_NORMALIZER_MYSQL_FOUND) if(GROONGA_NORMALIZER_MYSQL_FOUND)
set(WITH_GROONGA_NORMALIZER_MYSQL 1) set(WITH_GROONGA_NORMALIZER_MYSQL 1)
set_property(TARGET ha_mroonga APPEND PROPERTY ADD_DEFINITIONS(-DWITH_GROONGA_NORMALIZER_MYSQL=1)
COMPILE_DEFINITIONS "WITH_GROONGA_NORMALIZER_MYSQL=1")
if(MRN_GROONGA_BUNDLED) if(MRN_GROONGA_BUNDLED)
set_property(TARGET ha_mroonga APPEND PROPERTY ADD_DEFINITIONS(-DGROONGA_NORMALIZER_MYSQL_PLUGIN_IS_BUNDLED_STATIC=1)
COMPILE_DEFINITIONS "GROONGA_NORMALIZER_MYSQL_PLUGIN_IS_BUNDLED_STATIC=1")
else() else()
set(GROONGA_NORMALIZER_MYSQL_PLUGIN_NAME \"normalizers/mysql\") set(GROONGA_NORMALIZER_MYSQL_PLUGIN_NAME \"normalizers/mysql\")
set_property(TARGET ha_mroonga APPEND PROPERTY set_property(TARGET mroonga APPEND PROPERTY
COMPILE_DEFINITIONS "GROONGA_NORMALIZER_MYSQL_PLUGIN_NAME=\"normalizers/mysql\"") COMPILE_DEFINITIONS "GROONGA_NORMALIZER_MYSQL_PLUGIN_NAME=\"normalizers/mysql\"")
endif() endif()
endif() endif()
set(MRN_DEFAULT_PARSER "TokenBigram" CACHE STRING "The default fulltext parser") set(MRN_DEFAULT_PARSER "TokenBigram" CACHE STRING "The default fulltext parser")
set_property(TARGET ha_mroonga APPEND PROPERTY ADD_DEFINITIONS(-DMRN_PARSER_DEFAULT="${MRN_DEFAULT_PARSER}")
COMPILE_DEFINITIONS "MRN_PARSER_DEFAULT=\"${MRN_DEFAULT_PARSER}\"")
configure_file( configure_file(
"${PROJECT_SOURCE_DIR}/mrn_version.h.in" "${PROJECT_SOURCE_DIR}/mrn_version.h.in"
......
storage/mroonga/vendor/groonga/CMakeLists.txt
View file @ bb1ce607
...@@ -97,21 +97,15 @@ set(GRN_RUBY_SCRIPTS_DIR ...@@ -97,21 +97,15 @@ set(GRN_RUBY_SCRIPTS_DIR
"${CMAKE_INSTALL_PREFIX}/${GRN_RELATIVE_RUBY_SCRIPTS_DIR}") "${CMAKE_INSTALL_PREFIX}/${GRN_RELATIVE_RUBY_SCRIPTS_DIR}")
macro(check_cflag flag) macro(check_cflag flag)
string(REGEX REPLACE "[-=]" "_" temporary_variable_name ${flag}) check_c_compiler_flag(${flag} "HAVE_C_${flag}")
string(TOUPPER "${temporary_variable_name}" temporary_variable_name) if(HAVE_C_${flag})
set(temporary_variable_name "CFLAG${temporary_variable_name}")
check_c_compiler_flag(${flag} ${temporary_variable_name})
if(${temporary_variable_name})
set(GRN_C_COMPILE_FLAGS "${GRN_C_COMPILE_FLAGS} ${flag}") set(GRN_C_COMPILE_FLAGS "${GRN_C_COMPILE_FLAGS} ${flag}")
endif() endif()
endmacro() endmacro()
macro(check_cxxflag flag) macro(check_cxxflag flag)
string(REGEX REPLACE "[-=]" "_" temporary_variable_name ${flag}) check_cxx_compiler_flag(${flag} "HAVE_CXX_${flag}")
string(TOUPPER "${temporary_variable_name}" temporary_variable_name) if(HAVE_CXX_${flag})
set(temporary_variable_name "CXXFLAG${temporary_variable_name}")
check_cxx_compiler_flag(${flag} ${temporary_variable_name})
if(${temporary_variable_name})
set(GRN_CXX_COMPILE_FLAGS "${GRN_CXX_COMPILE_FLAGS} ${flag}") set(GRN_CXX_COMPILE_FLAGS "${GRN_CXX_COMPILE_FLAGS} ${flag}")
endif() endif()
endmacro() endmacro()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7