From 28b711a53bcc020e592362a9f1d3be4faadd551d Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Sun, 20 Oct 2013 12:51:54 +0200 Subject: [PATCH] added mruby --- CMakeLists.txt | 20 ++++++++++++++++++++ arangoirb/CMakeLists.txt | 5 ++++- lib/CMakeLists.txt | 12 ++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 193438328c..5423d8b30f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,6 +24,7 @@ add_definitions("-DHAVE_CONFIG_H") set(LIB_ARANGO arango) set(LIB_ARANGO_CLIENT arango_client) set(LIB_ARANGO_FE arango_fe) +set(LIB_ARANGO_MRUBY arango_mruby) set(LIB_ARANGO_V8 arango_v8) set(BIN_ARANGOB arangob) @@ -103,6 +104,25 @@ endif () add_definitions("-DTRI_LIBEV_VERSION=\"${LIBEV_VERSION}\"") +################################################################################ +### @brief MRUBY +################################################################################ + +set(MRUBY_INCLUDE ${PROJECT_SOURCE_DIR}/3rdParty/mruby/include CACHE path "MRUBY include path") +set(MRUBY_LIB_PATH ${PROJECT_SOURCE_DIR}/3rdParty/mruby/build/host/lib CACHE path "MRUBY library path") +set(MRUBY_LIBS mruby CACHE string "MRUBY libraries") +set(MRUBY_VERSION "2013-08-22 (aa099f7f7d1f8c61db936fb7c39a3c734175af16)" CACHE string "MRUBY version") + +if (MRUBY_INCLUDE) + include_directories(${MRUBY_INCLUDE}) +endif () + +if (MRUBY_LIB_PATH) + link_directories(${MRUBY_LIB_PATH}) +endif () + +add_definitions("-DTRI_MRUBY_VERSION=\"${MRUBY_VERSION}\"") + ################################################################################ ### @brief OPENSSL ################################################################################ diff --git a/arangoirb/CMakeLists.txt b/arangoirb/CMakeLists.txt index 5abcee957f..bd3b3d7e02 100644 --- a/arangoirb/CMakeLists.txt +++ b/arangoirb/CMakeLists.txt @@ -6,6 +6,7 @@ include_directories(.) include_directories(${PROJECT_SOURCE_DIR}/lib) +include_directories(${PROJECT_SOURCE_DIR}/arangosh) ## ----------------------------------------------------------------------------- ## --SECTION-- EXECUTABLES @@ -24,9 +25,11 @@ add_executable( target_link_libraries( ${BIN_ARANGOIRB} - ${LIB_ARANGO_V8} + ${LIB_ARANGO_MRUBY} ${LIB_ARANGO_CLIENT} ${LIB_ARANGO} + ${V8_LIBS} # need this for rest::Version + ${MRUBY_LIBS} ${ICU_LIBS} ${ZLIB_LIBS} ${READLINE_LIBS} diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index d952d9c867..ab343e6931 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -187,6 +187,18 @@ add_library( SimpleHttpClient/SimpleHttpResult.cpp ) +################################################################################ +### @brief LIB_ARANGO_MRUBY +################################################################################ + +add_library( + ${LIB_ARANGO_MRUBY} + STATIC + MRuby/MRLoader.cpp + MRuby/MRLineEditor.cpp + MRuby/mr-utils.c +) + ## ----------------------------------------------------------------------------- ## --SECTION-- END-OF-FILE ## -----------------------------------------------------------------------------