Skip to content
This repository was archived by the owner on Apr 6, 2019. It is now read-only.

Use installed tacopie #98

Merged
merged 2 commits into from
Aug 8, 2017
Merged

Use installed tacopie #98

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c00a9b
Use installed tacopie
pfultz2 Aug 7, 2017
21b7498
Add find_library step
pfultz2 Aug 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,10 @@ ENDIF (WIN32)
###
# variables
###
find_path(TACOPIE_INCLUDE_DIR tacopie/tacopie PATHS ${PROJECT_SOURCE_DIR}/tacopie/includes/)
find_library(TACOPIE_LIBRARY tacopie)
set(CPP_REDIS_INCLUDES ${PROJECT_SOURCE_DIR}/includes)
set(DEPS_INCLUDES ${PROJECT_SOURCE_DIR}/deps/include tacopie/includes)
set(DEPS_INCLUDES ${PROJECT_SOURCE_DIR}/deps/include ${TACOPIE_INCLUDE_DIR})
set(DEPS_LIBRARIES ${PROJECT_SOURCE_DIR}/deps/lib)


Expand Down Expand Up @@ -131,11 +133,17 @@ if (WIN32)
ENDIF (WIN32)

IF (WIN32)
target_link_libraries(${PROJECT} ws2_32 tacopie)
target_link_libraries(${PROJECT} ws2_32)
ELSE ()
target_link_libraries(${PROJECT} pthread tacopie)
target_link_libraries(${PROJECT} pthread)
ENDIF (WIN32)

if(TACOPIE_LIBRARY)
target_link_libraries(${PROJECT} ${TACOPIE_LIBRARY})
else()
target_link_libraries(${PROJECT} tacopie)
endif()

# __CPP_REDIS_READ_SIZE
IF (READ_SIZE)
set_target_properties(${PROJECT} PROPERTIES COMPILE_DEFINITIONS "__CPP_REDIS_READ_SIZE=${READ_SIZE}")
Expand Down Expand Up @@ -189,6 +197,6 @@ ENDIF(BUILD_TESTS)
###
# tacopie
###
IF (NOT USE_CUSTOM_TCP_CLIENT)
IF (NOT TACOPIE_LIBRARY AND NOT USE_CUSTOM_TCP_CLIENT)
add_subdirectory(tacopie)
ENDIF (NOT USE_CUSTOM_TCP_CLIENT)
ENDIF (NOT TACOPIE_LIBRARY AND NOT USE_CUSTOM_TCP_CLIENT)