collabvm/r3
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

remove Judy

Browse source
This commit is contained in:
c9s 2014-05-16 22:05:23 +08:00
parent ad3c06ebb3
commit 8f3ac387f0
5 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -18,10 +18,10 @@ SET(CMAKE_MODULE_PATH
include_directories(. "${PROJECT_SOURCE_DIR}/include" ${INCLUDE_DIRECTORIES} /opt/local/include) include_directories(. "${PROJECT_SOURCE_DIR}/include" ${INCLUDE_DIRECTORIES} /opt/local/include)
link_directories(${LINK_DIRECTORIES} /opt/local/lib) link_directories(${LINK_DIRECTORIES} /opt/local/lib)
find_package(PCRE REQUIRED) find_package(PCRE REQUIRED)
find_package(Judy REQUIRED) # find_package(Judy REQUIRED)
find_package(Jemalloc 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_CFLAGS "-Wall -pipe -g3 -funroll-loops")
# set (CMAKE_CXX_FLAGS "-std=c++0x -arch x86_64 -stdlib=libc++ -g3 -Wall -O0") # set (CMAKE_CXX_FLAGS "-std=c++0x -arch x86_64 -stdlib=libc++ -g3 -Wall -O0")

3
src/CMakeLists.txt
View file

@ -5,7 +5,8 @@ include_directories("${PROJECT_SOURCE_DIR}/include")
set(R3_SRCS node.c str.c list.c token.c edge.c) set(R3_SRCS node.c str.c list.c token.c edge.c)
set(CMAKE_CFLAGS "-Wall -pipe -g3 -funroll-loops") 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 SHARED ${R3_SRCS})
add_library(r3 STATIC ${R3_SRCS}) add_library(r3 STATIC ${R3_SRCS})

2
src/edge.c
View file

@ -16,7 +16,7 @@
#include <pcre.h> #include <pcre.h>
// Judy array // Judy array
#include <Judy.h> // #include <Judy.h>
#include "r3_define.h" #include "r3_define.h"
#include "r3_str.h" #include "r3_str.h"

2
src/node.c
View file

@ -10,7 +10,7 @@
#include <pcre.h> #include <pcre.h>
// Judy array // Judy array
#include <Judy.h> // #include <Judy.h>
#include "r3_define.h" #include "r3_define.h"
#include "r3_str.h" #include "r3_str.h"

4
tests/CMakeLists.txt
View file

@ -2,12 +2,12 @@
# set(TEST_LIBS ${TEST_LIBS} ${CHECK_LIBRARIES} judy libr3) # set(TEST_LIBS ${TEST_LIBS} ${CHECK_LIBRARIES} judy libr3)
find_package(Check REQUIRED) find_package(Check REQUIRED)
find_package(PCRE REQUIRED) find_package(PCRE REQUIRED)
find_package(Judy REQUIRED) # find_package(Judy REQUIRED)
if (NOT CHECK_FOUND) if (NOT CHECK_FOUND)
message(STATUS "Skipping unit tests, Check library not found!") message(STATUS "Skipping unit tests, Check library not found!")
else (NOT CHECK_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(${CHECK_INCLUDE_DIRS})
# include_directories("${PROJECT_SOURCE_DIR}/include/r2") # include_directories("${PROJECT_SOURCE_DIR}/include/r2")