From 2c498e286e51e4a9677c087fb1e5ca5016809b75 Mon Sep 17 00:00:00 2001 From: King_DuckZ Date: Thu, 14 Jul 2016 16:49:09 +0100 Subject: [PATCH] Buildfix --- .gitmodules | 3 +++ CMakeLists.txt | 5 ++++- lib/better-enums | 1 + src/command.hpp | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) create mode 160000 lib/better-enums diff --git a/.gitmodules b/.gitmodules index c81cd1a..5264eb7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "lib/duckhandy"] path = lib/duckhandy url = ../duckhandy.git +[submodule "lib/better-enums"] + path = lib/better-enums + url = https://github.com/aantron/better-enums.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 72095d5..6bdd4d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,6 +9,8 @@ find_package(CryptoPP 5.6) find_package(libev 4.0 REQUIRED) find_package(Boost 1.53.0 REQUIRED) +add_shared_git_project("lib/duckhandy") + add_library(${PROJECT_NAME} SHARED src/command.cpp src/scan_iterator.cpp @@ -29,7 +31,7 @@ target_include_directories(${PROJECT_NAME} SYSTEM PRIVATE ${Boost_INCLUDE_DIRS} ) target_include_directories(${PROJECT_NAME} - PUBLIC ${CMAKE_SOURCE_DIR}/include + PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ) @@ -37,6 +39,7 @@ target_link_libraries(${PROJECT_NAME} PRIVATE ${HIREDIS_LIBRARIES} PRIVATE ${LIBEV_LIBRARIES} PRIVATE ${Boost_LIBRARIES} + PUBLIC duckhandy ) configure_file( diff --git a/lib/better-enums b/lib/better-enums new file mode 160000 index 0000000..f520b39 --- /dev/null +++ b/lib/better-enums @@ -0,0 +1 @@ +Subproject commit f520b397e3098720af1dd32d49ec3021d1df5bb3 diff --git a/src/command.hpp b/src/command.hpp index 58583cd..7231f2d 100644 --- a/src/command.hpp +++ b/src/command.hpp @@ -29,6 +29,7 @@ #include #include #include +#include #include #include