[Groonga-commit] groonga/groonga at 9f3ff20 [master] cmake mruby: follow mruby related change

Back to archive index

Kouhei Sutou null+****@clear*****
Tue Apr 10 12:45:26 JST 2018


Kouhei Sutou	2018-04-10 12:45:26 +0900 (Tue, 10 Apr 2018)

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

  Message:
    cmake mruby: follow mruby related change

  Modified files:
    vendor/mruby/CMakeLists.txt

  Modified: vendor/mruby/CMakeLists.txt (+2 -7)
===================================================================
--- vendor/mruby/CMakeLists.txt    2018-04-10 12:29:05 +0900 (826ea6e4e)
+++ vendor/mruby/CMakeLists.txt    2018-04-10 12:45:26 +0900 (e9232f858)
@@ -1,4 +1,4 @@
-# Copyright(C) 2013-2016 Brazil
+# Copyright(C) 2013-2018 Brazil
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -20,6 +20,7 @@ if(GRN_WITH_MRUBY)
     "${MRUBY_SOURCE_DIR}/include"
     "${MRUBY_SOURCE_DIR}/src"
     "${MRUBY_SOURCE_DIR}/mrbgems/mruby-compiler/core"
+    "${MRUBY_SOURCE_DIR}/mrbgems/mruby-io/include"
     "${CMAKE_CURRENT_SOURCE_DIR}/../onigmo-source"
   )
 
@@ -35,9 +36,6 @@ if(GRN_WITH_MRUBY)
     set(MRUBY_LEGAL_FILE "${CMAKE_CURRENT_SOURCE_DIR}/LEGAL")
     string(REGEX REPLACE "([^;]+)" "${CMAKE_CURRENT_SOURCE_DIR}/\\1"
       MRUBY_BUILT_SOURCES "${MRUBY_BUILT_SOURCES}")
-    include_directories(
-      "${CMAKE_CURRENT_SOURCE_DIR}/mruby-io/include"
-      )
   else()
     set(mruby_build_timestamp
       "${CMAKE_CURRENT_BINARY_DIR}/mruby_build.timestamp")
@@ -61,9 +59,6 @@ if(GRN_WITH_MRUBY)
     set(MRUBY_LEGAL_FILE "${CMAKE_CURRENT_BINARY_DIR}/LEGAL")
     string(REGEX REPLACE "([^;]+)" "${CMAKE_CURRENT_BINARY_DIR}/\\1"
       MRUBY_BUILT_SOURCES "${MRUBY_BUILT_SOURCES}")
-    include_directories(
-      "${CMAKE_CURRENT_BINARY_DIR}/mruby-io/include"
-      )
   endif()
   file(WRITE
     "${CMAKE_CURRENT_BINARY_DIR}/mruby-file-stat/src/config.h"
-------------- next part --------------
HTML����������������������������...
URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20180410/411ccf18/attachment-0001.htm 



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