[Groonga-commit] groonga/groonga at 9a694fd [master] cmake: support CMAKE_BUILD_TYPE set build

Back to archive index

Kouhei Sutou null+****@clear*****
Sun Oct 18 12:58:57 JST 2015


Kouhei Sutou	2015-10-18 12:58:57 +0900 (Sun, 18 Oct 2015)

  New Revision: 9a694fd6b2b062640995951a440c6cd680f08801
  https://github.com/groonga/groonga/commit/9a694fd6b2b062640995951a440c6cd680f08801

  Message:
    cmake: support CMAKE_BUILD_TYPE set build

  Modified files:
    vendor/mecab/CMakeLists.txt

  Modified: vendor/mecab/CMakeLists.txt (+6 -1)
===================================================================
--- vendor/mecab/CMakeLists.txt    2015-10-18 12:45:06 +0900 (09b4164)
+++ vendor/mecab/CMakeLists.txt    2015-10-18 12:58:57 +0900 (da06ae0)
@@ -180,9 +180,14 @@ if(GRN_WITH_BUNDLED_MECAB)
     "${CMAKE_CURRENT_BINARY_DIR}/char.bin"
     "${CMAKE_CURRENT_BINARY_DIR}/sys.dic"
     "${CMAKE_CURRENT_BINARY_DIR}/unk.dic")
+  if("${CMAKE_BUILD_TYPE}" STREQUAL "None")
+    set(MECAB_DICT_INDEX_PATH "mecab-dict-index${CMAKE_EXECUTABLE_SUFFIX}")
+  else()
+    set(MECAB_DICT_INDEX_PATH "${CMAKE_BUILD_TYPE}/mecab-dict-index${CMAKE_EXECUTABLE_SUFFIX}")
+  endif()
   add_custom_command(OUTPUT ${MECAB_NAIST_JDIC_BUILD_DATA}
     COMMAND
-    "${CMAKE_CURRENT_BINARY_DIR}/mecab-dict-index${CMAKE_EXECUTABLE_SUFFIX}"
+    "${MECAB_DICT_INDEX_PATH}"
     "--dicdir" "${MECAB_NAIST_JDIC_SOURCE_DIR}"
     "--outdir" "${CMAKE_CURRENT_BINARY_DIR}"
     "--dictionary-charset" "EUC-JP"
-------------- next part --------------
HTML����������������������������...
Download 



More information about the Groonga-commit mailing list
Back to archive index