Skip to content

Commit 2355329

Browse files
committed
use cmake to compile; adapat lotus of latest version
1 parent 5f00625 commit 2355329

12 files changed

+4514
-4359
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
server
2+
build/

example/CMakeLists.txt

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
cmake_minimum_required(VERSION 3.10)
2+
3+
project(server C CXX)
4+
5+
add_definitions(-std=c++14)
6+
7+
set(CXX_FLAGS
8+
-g
9+
-DCHECK_PTHREAD_RETURN_VALUE
10+
-D_FILE_OFFSET_BITS=64
11+
-Wall
12+
-Wextra
13+
-Werror
14+
-march=native
15+
-std=c++14
16+
-rdynamic
17+
)
18+
19+
include_directories(../../../zhuichao001/wal)
20+
include_directories(../../../zhuichao001/lotus/)
21+
22+
include_directories(../src)
23+
add_subdirectory(../src raft_lib_dir)
24+
25+
add_executable(server ./main.cpp)
26+
target_link_libraries(server raft pthread protobuf)

example/Makefile

-12
This file was deleted.

example/run_follower.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ if [ $# -lt 1 ]; then
22
echo "usage ./run_follower.sh {nodeid}"
33
exit
44
fi
5-
./server --nodeid $1 -j 9001
5+
./build/server --nodeid $1 -j 9001

example/run_leader.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
./server --nodeid 1
1+
./build/server --nodeid 1

src/CMakeLists.txt

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
cmake_minimum_required(VERSION 3.10)
2+
3+
project(raft C CXX)
4+
5+
set(CXX_FLAGS
6+
-g
7+
-DCHECK_PTHREAD_RETURN_VALUE
8+
-D_FILE_OFFSET_BITS=64
9+
-Wall
10+
-Wextra
11+
-Werror
12+
-Wconversion
13+
-Wno-unused-parameter
14+
-Wold-style-cast
15+
-Woverloaded-virtual
16+
-Wpointer-arith
17+
-Wshadow
18+
-Wwrite-strings
19+
-march=native
20+
-std=c++14
21+
-rdynamic
22+
)
23+
24+
include_directories(../../../zhuichao001/naughty/fio)
25+
add_subdirectory(../../../zhuichao001/naughty/fio fio_lib_dir)
26+
27+
include_directories(../../../zhuichao001/wal)
28+
29+
include_directories(../../../zhuichao001/lotus/)
30+
add_subdirectory(../../../zhuichao001/lotus/lotus lotus_lib_dir)
31+
32+
include_directories(./proto)
33+
add_subdirectory(./proto raftproto_lib_dir)
34+
35+
aux_source_directory(./ DIR_LIB_RAFT_SRCS)
36+
add_library(raft STATIC ${DIR_LIB_RAFT_SRCS})
37+
38+
target_link_libraries(raft PUBLIC raftproto lotus fio)

src/proto/CMakeLists.txt

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
cmake_minimum_required(VERSION 3.10)
2+
3+
project(raftproto C CXX)
4+
5+
set(CXX_FLAGS
6+
-g
7+
-DCHECK_PTHREAD_RETURN_VALUE
8+
-D_FILE_OFFSET_BITS=64
9+
-Wall
10+
-Wextra
11+
-Werror
12+
-Wconversion
13+
-Wno-unused-parameter
14+
-Wold-style-cast
15+
-Woverloaded-virtual
16+
-Wpointer-arith
17+
-Wshadow
18+
-Wwrite-strings
19+
-march=native
20+
-std=c++14
21+
-rdynamic
22+
)
23+
24+
aux_source_directory(. DIR_LIB_RAFTPROTO_SRCS)
25+
add_library(raftproto STATIC ${DIR_LIB_RAFTPROTO_SRCS})

0 commit comments

Comments
 (0)