From 8f3ac387f07160c0e09ce2e61a5cc12e3adfc211 Mon Sep 17 00:00:00 2001 From: c9s Date: Fri, 16 May 2014 22:05:23 +0800 Subject: [PATCH] remove Judy --- CMakeLists.txt | 4 ++-- src/CMakeLists.txt | 3 ++- src/edge.c | 2 +- src/node.c | 2 +- tests/CMakeLists.txt | 4 ++-- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d9d48f..cc0935b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,10 +18,10 @@ SET(CMAKE_MODULE_PATH include_directories(. "${PROJECT_SOURCE_DIR}/include" ${INCLUDE_DIRECTORIES} /opt/local/include) link_directories(${LINK_DIRECTORIES} /opt/local/lib) find_package(PCRE REQUIRED) -find_package(Judy REQUIRED) +# find_package(Judy REQUIRED) find_package(Jemalloc REQUIRED) -set(LIBS ${LIBS} ${PCRE_LIBRARIES} ${Judy_LIBRARIES} ${Jemalloc_LIBRARIES} r3) +set(LIBS ${LIBS} ${PCRE_LIBRARIES} ${Jemalloc_LIBRARIES} r3) set (CMAKE_CFLAGS "-Wall -pipe -g3 -funroll-loops") # set (CMAKE_CXX_FLAGS "-std=c++0x -arch x86_64 -stdlib=libc++ -g3 -Wall -O0") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4ba77b4..02bbdda 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -5,7 +5,8 @@ include_directories("${PROJECT_SOURCE_DIR}/include") set(R3_SRCS node.c str.c list.c token.c edge.c) set(CMAKE_CFLAGS "-Wall -pipe -g3 -funroll-loops") -set(LIBS ${LIBS} ${PCRE_LIBRARIES} ${Judy_LIBRARIES} ${Jemalloc_LIBRARIES} r3) +# set(LIBS ${LIBS} ${PCRE_LIBRARIES} ${Judy_LIBRARIES} ${Jemalloc_LIBRARIES} r3) +set(LIBS ${LIBS} ${PCRE_LIBRARIES} ${Jemalloc_LIBRARIES} r3) # add_library(r3 SHARED ${R3_SRCS}) add_library(r3 STATIC ${R3_SRCS}) diff --git a/src/edge.c b/src/edge.c index 1489cb7..a1b4e72 100644 --- a/src/edge.c +++ b/src/edge.c @@ -16,7 +16,7 @@ #include // Judy array -#include +// #include #include "r3_define.h" #include "r3_str.h" diff --git a/src/node.c b/src/node.c index 79cd952..02caa39 100644 --- a/src/node.c +++ b/src/node.c @@ -10,7 +10,7 @@ #include // Judy array -#include +// #include #include "r3_define.h" #include "r3_str.h" diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index a94e572..7d8e226 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -2,12 +2,12 @@ # set(TEST_LIBS ${TEST_LIBS} ${CHECK_LIBRARIES} judy libr3) find_package(Check REQUIRED) find_package(PCRE REQUIRED) -find_package(Judy REQUIRED) +# find_package(Judy REQUIRED) if (NOT CHECK_FOUND) message(STATUS "Skipping unit tests, Check library not found!") else (NOT CHECK_FOUND) - set(TEST_LIBS ${LIBS} ${CHECK_LIBRARIES} ${PCRE_LIBRARIES} ${Judy_LIBRARIES} r3) + set(TEST_LIBS ${LIBS} ${CHECK_LIBRARIES} ${PCRE_LIBRARIES} r3) include_directories(${CHECK_INCLUDE_DIRS}) # include_directories("${PROJECT_SOURCE_DIR}/include/r2")