From 796a19397ee4a6abdf26c06b2297c47cc5ff0a2c Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Thu, 23 Jan 2014 18:10:40 +0100 Subject: [PATCH] removed skip lists --- GNUmakefile | 54 ++++++++++++++++++++++++++++++++++++++++ UnitTests/CMakeLists.txt | 2 +- arangod/CMakeLists.txt | 4 --- 3 files changed, 55 insertions(+), 5 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 7b0bfa5cdb..a520f108fe 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -252,6 +252,60 @@ pack-winXX-cmake: cd Build$(BITS) && cpack -G NSIS +################################################################################ +### @brief cmake build +################################################################################ + +.PHONY: cmake-setpup + +cmake-setup: + test -d Build || mkdir Build + + cd Build && cmake \ + -D "CMAKE_INSTALL_PREFIX=${prefix}" \ + -D "ETCDIR=${sysconfdir}" \ + -D "VARDIR=${localstatedir}" \ + \ + -D ARANGODB_VERSION=${VERSION} \ + -D USE_MRUBY=${tr_MRUBY} \ + \ + -D ICU_INCLUDE= \ + -D ICU_LIB_PATH= \ + -D ICU_LIBS= \ + -D ICU_VERSION= \ + \ + -D LIBEV_INCLUDE= \ + -D LIBEV_LIB_PATH= \ + -D LIBEV_LIBS= \ + -D LIBEV_VERSION= \ + \ + -D MRUBY_INCLUDE= \ + -D MRUBY_LIB_PATH= \ + -D MRUBY_LIBS= \ + -D MRUBY_VERSION= \ + \ + -D OPENSSL_INCLUDE= \ + -D OPENSSL_LIB_PATH= \ + -D OPENSSL_LIBS= \ + -D OPENSSL_VERSION= \ + \ + -D READLINE_INCLUDE= \ + -D READLINE_LIB_PATH= \ + -D READLINE_LIBS= \ + -D READLINE_VERSION= \ + \ + -D V8_INCLUDE= \ + -D V8_LIB_PATH= \ + -D V8_LIBS= \ + -D V8_VERSION= \ + \ + -D ZLIB_INCLUDE= \ + -D ZLIB_LIB_PATH= \ + -D ZLIB_LIBS= \ + -D ZLIB_VERSION= \ + \ + .. + ## ----------------------------------------------------------------------------- ## --SECTION-- END-OF-FILE ## ----------------------------------------------------------------------------- diff --git a/UnitTests/CMakeLists.txt b/UnitTests/CMakeLists.txt index 7d863ef7e1..8caadb5c47 100644 --- a/UnitTests/CMakeLists.txt +++ b/UnitTests/CMakeLists.txt @@ -97,7 +97,7 @@ endif () ## --SECTION-- TESTS ## ----------------------------------------------------------------------------- -include(${PROJECT_SOURCE_DIR}/UnitTests/CTestLists.txt) +# include(${PROJECT_SOURCE_DIR}/UnitTests/CTestLists.txt) ## ----------------------------------------------------------------------------- ## --SECTION-- END-OF-FILE diff --git a/arangod/CMakeLists.txt b/arangod/CMakeLists.txt index a32b134183..4924436dd7 100644 --- a/arangod/CMakeLists.txt +++ b/arangod/CMakeLists.txt @@ -98,10 +98,7 @@ add_executable( RestServer/ArangoServer.cpp RestServer/VocbaseContext.cpp RestServer/arango.cpp - SkipLists/skiplist.c SkipLists/skiplistIndex.c - SkipListsEx/skiplistEx.c - SkipListsEx/skiplistExIndex.c Utils/DocumentHelper.cpp V8Server/ApplicationV8.cpp V8Server/v8-actions.cpp @@ -118,7 +115,6 @@ add_executable( VocBase/general-cursor.c VocBase/headers.c VocBase/index.c - VocBase/index-garbage-collector.c VocBase/key-generator.c VocBase/marker.c VocBase/primary-collection.c