Skip to content

M
mariadb
Commit e2b895ec authored by Alexander Barkov's avatar Alexander Barkov
Browse files
Options

Merge 10.0-mroonga -> 10.0

parents 1efee037 8e4bf4ec
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
storage/mroonga/CMakeLists.txt
View file @ e2b895ec
...@@ -38,12 +38,12 @@ set(MRN_BUNDLED_GROONGA_DIR ...@@ -38,12 +38,12 @@ set(MRN_BUNDLED_GROONGA_DIR
"${CMAKE_CURRENT_SOURCE_DIR}/${MRN_BUNDLED_GROONGA_RELATIVE_DIR}") "${CMAKE_CURRENT_SOURCE_DIR}/${MRN_BUNDLED_GROONGA_RELATIVE_DIR}")
if(EXISTS "${MRN_BUNDLED_GROONGA_DIR}") if(EXISTS "${MRN_BUNDLED_GROONGA_DIR}")
set(MRN_GROONGA_BUNDLED TRUE) set(MRN_GROONGA_BUNDLED TRUE)
else()
set(MRN_GROONGA_BUNDLED FALSE)
if(MSVC) if(MSVC)
message(STATUS "Bundled Mroonga does not support MSVC yet") message(STATUS "Bundled Mroonga does not support MSVC yet")
return() return()
endif() endif()
else()
set(MRN_GROONGA_BUNDLED FALSE)
endif() endif()
set(MRN_PLUGIN_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}) set(MRN_PLUGIN_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
......
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