From 7996616853bb4bf60bec2a278772dd75341993b6 Mon Sep 17 00:00:00 2001 From: luoxing Date: Tue, 27 Jun 2017 13:09:23 +0800 Subject: [PATCH 1/3] using cmake --- CMakeLists.txt | 5 +++++ src/CMakeLists.txt | 19 +++++++++++++++++++ src/dict_private.h | 2 +- 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 CMakeLists.txt create mode 100644 src/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 00000000..2056a92b --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,5 @@ + +cmake_minimum_required(VERSION 3.8) +include_directories(src) +include_directories(include) +add_subdirectory(src) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 00000000..8b368f31 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,19 @@ + + + +add_library(dict + dict.c + tr_tree.c + wb_tree.c + hashtable_common.c + tree_common.c + hb_tree.c + pr_tree.c + hashtable.c + skiplist.c + sp_tree.c + tr_tree.c + wb_tree.c + + ) + diff --git a/src/dict_private.h b/src/dict_private.h index 536d9ad8..6548ed2c 100644 --- a/src/dict_private.h +++ b/src/dict_private.h @@ -31,7 +31,7 @@ #include #include -#include "dict.h" +#include /* A feature (or bug) of this macro is that the expression is always evaluated, * regardless of whether NDEBUG is defined or not. This is intentional and From 2ac8c444abff4a834a9433097f0c0a096cdd4d8e Mon Sep 17 00:00:00 2001 From: luo xing Date: Wed, 19 Jul 2017 14:13:59 +0800 Subject: [PATCH 2/3] using 2.8 cmake version --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2056a92b..4172078b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 2.8) include_directories(src) include_directories(include) add_subdirectory(src) From 23ef9c8f0ed94ab0e318d6caa757c4d08b026163 Mon Sep 17 00:00:00 2001 From: luoxing Date: Fri, 27 Oct 2017 19:01:56 +0800 Subject: [PATCH 3/3] mv to mdit --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8b368f31..9c3e0982 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,7 +1,7 @@ -add_library(dict +add_library(mdict dict.c tr_tree.c wb_tree.c