Skip to content

Commit fc5ca42

Browse files
committed
Merge pull request nekipelov#17 from alexyoung91/master
Updated CMakeLists.txt to allow redisclient to be used as a project dependency within another cmake project
2 parents a93573f + e1bd51b commit fc5ca42

File tree

2 files changed

+29
-29
lines changed

2 files changed

+29
-29
lines changed

CMakeLists.txt

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,23 @@ SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3 -DDEBUG ")
99
SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
1010

1111
SET(SOURCES
12-
src/redisclient/impl/redisvalue.cpp
13-
src/redisclient/impl/redissyncclient.cpp
14-
src/redisclient/impl/redisparser.cpp
15-
src/redisclient/impl/redisclientimpl.cpp
16-
src/redisclient/impl/redisasyncclient.cpp
12+
${CMAKE_CURRENT_SOURCE_DIR}/src/redisclient/impl/redisvalue.cpp
13+
${CMAKE_CURRENT_SOURCE_DIR}/src/redisclient/impl/redissyncclient.cpp
14+
${CMAKE_CURRENT_SOURCE_DIR}/src/redisclient/impl/redisparser.cpp
15+
${CMAKE_CURRENT_SOURCE_DIR}/src/redisclient/impl/redisclientimpl.cpp
16+
${CMAKE_CURRENT_SOURCE_DIR}/src/redisclient/impl/redisasyncclient.cpp
1717
)
1818

1919
SET(HEADERS
20-
src/redisclient/config.h
21-
src/redisclient/version.h
22-
src/redisclient/redisvalue.h
23-
src/redisclient/redissyncclient.h
24-
src/redisclient/redisparser.h
25-
src/redisclient/redisclient.h
26-
src/redisclient/redisbuffer.h
27-
src/redisclient/redisasyncclient.h
28-
src/redisclient/impl/redisclientimpl.h
20+
${CMAKE_CURRENT_SOURCE_DIR}/src/redisclient/config.h
21+
${CMAKE_CURRENT_SOURCE_DIR}/src/redisclient/version.h
22+
${CMAKE_CURRENT_SOURCE_DIR}/src/redisclient/redisvalue.h
23+
${CMAKE_CURRENT_SOURCE_DIR}/src/redisclient/redissyncclient.h
24+
${CMAKE_CURRENT_SOURCE_DIR}/src/redisclient/redisparser.h
25+
${CMAKE_CURRENT_SOURCE_DIR}/src/redisclient/redisclient.h
26+
${CMAKE_CURRENT_SOURCE_DIR}/src/redisclient/redisbuffer.h
27+
${CMAKE_CURRENT_SOURCE_DIR}/src/redisclient/redisasyncclient.h
28+
${CMAKE_CURRENT_SOURCE_DIR}/src/redisclient/impl/redisclientimpl.h
2929
)
3030

3131
INCLUDE_DIRECTORIES(
@@ -48,7 +48,7 @@ TARGET_LINK_LIBRARIES(redisclient
4848
INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src DESTINATION include)
4949

5050
ADD_CUSTOM_TARGET(test)
51-
ADD_CUSTOM_COMMAND(TARGET test
51+
ADD_CUSTOM_COMMAND(TARGET test
5252
POST_BUILD
5353
COMMAND ./parsertest
5454
COMMENT "Run tests"

examples/CMakeLists.txt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@ SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3 -DDEBUG ")
77
SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
88

99
SET(REDISCLIENT_SOURCES
10-
${CMAKE_SOURCE_DIR}/src/redisclient/impl/redisvalue.cpp
11-
${CMAKE_SOURCE_DIR}/src/redisclient/impl/redissyncclient.cpp
12-
${CMAKE_SOURCE_DIR}/src/redisclient/impl/redisparser.cpp
13-
${CMAKE_SOURCE_DIR}/src/redisclient/impl/redisclientimpl.cpp
14-
${CMAKE_SOURCE_DIR}/src/redisclient/impl/redisasyncclient.cpp
15-
${CMAKE_SOURCE_DIR}/src/redisclient/config.h
16-
${CMAKE_SOURCE_DIR}/src/redisclient/version.h
17-
${CMAKE_SOURCE_DIR}/src/redisclient/redisvalue.h
18-
${CMAKE_SOURCE_DIR}/src/redisclient/redissyncclient.h
19-
${CMAKE_SOURCE_DIR}/src/redisclient/redisparser.h
20-
${CMAKE_SOURCE_DIR}/src/redisclient/redisclient.h
21-
${CMAKE_SOURCE_DIR}/src/redisclient/redisbuffer.h
22-
${CMAKE_SOURCE_DIR}/src/redisclient/redisasyncclient.h
23-
${CMAKE_SOURCE_DIR}/src/redisclient/impl/redisclientimpl.h
10+
${CMAKE_CURRENT_SOURCE_DIR}/../src/redisclient/impl/redisvalue.cpp
11+
${CMAKE_CURRENT_SOURCE_DIR}/../src/redisclient/impl/redissyncclient.cpp
12+
${CMAKE_CURRENT_SOURCE_DIR}/../src/redisclient/impl/redisparser.cpp
13+
${CMAKE_CURRENT_SOURCE_DIR}/../src/redisclient/impl/redisclientimpl.cpp
14+
${CMAKE_CURRENT_SOURCE_DIR}/../src/redisclient/impl/redisasyncclient.cpp
15+
${CMAKE_CURRENT_SOURCE_DIR}/../src/redisclient/config.h
16+
${CMAKE_CURRENT_SOURCE_DIR}/../src/redisclient/version.h
17+
${CMAKE_CURRENT_SOURCE_DIR}/../src/redisclient/redisvalue.h
18+
${CMAKE_CURRENT_SOURCE_DIR}/../src/redisclient/redissyncclient.h
19+
${CMAKE_CURRENT_SOURCE_DIR}/../src/redisclient/redisparser.h
20+
${CMAKE_CURRENT_SOURCE_DIR}/../src/redisclient/redisclient.h
21+
${CMAKE_CURRENT_SOURCE_DIR}/../src/redisclient/redisbuffer.h
22+
${CMAKE_CURRENT_SOURCE_DIR}/../src/redisclient/redisasyncclient.h
23+
${CMAKE_CURRENT_SOURCE_DIR}/../src/redisclient/impl/redisclientimpl.h
2424
)
2525

2626
INCLUDE_DIRECTORIES(

0 commit comments

Comments
 (0)