Merge 10.0-mroonga -> 10.0

e2b895ec · Alexander Barkov · 1efee037 · 8e4bf4ec · e2b895ec
Commit e2b895ec authored Oct 10, 2014 by Alexander Barkov
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

storage/mroonga/CMakeLists.txt storage/mroonga/CMakeLists.txt +2 -2

No files found.
--- a/storage/mroonga/CMakeLists.txt
+++ b/storage/mroonga/CMakeLists.txt
@@ -38,12 +38,12 @@ set(MRN_BUNDLED_GROONGA_DIR
  "${CMAKE_CURRENT_SOURCE_DIR}/${MRN_BUNDLED_GROONGA_RELATIVE_DIR}")
 if(EXISTS "${MRN_BUNDLED_GROONGA_DIR}")
  set(MRN_GROONGA_BUNDLED TRUE)
-else()
-  set(MRN_GROONGA_BUNDLED FALSE)
  if(MSVC)
    message(STATUS "Bundled Mroonga does not support MSVC yet")
    return()
  endif()
+else()
+  set(MRN_GROONGA_BUNDLED FALSE)
 endif()

 set(MRN_PLUGIN_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})