tom/doorlockd-mirror
1
0
Fork 0
mirror of https://github.com/binary-kitchen/doorlockd synced 2024-12-22 10:24:26 +01:00
Code Issues Releases Wiki Activity

Some refactoring

Browse Source
This commit is contained in:
Ralf Ramsauer 2015-09-24 21:59:20 +02:00
parent 9b58de4b5d
commit 36787b91b3
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doorlockd/CMakeLists.txt
View File

@ -79,7 +79,7 @@ add_executable(doorlockd ${DOORLOCKD_SRCS})
target_link_libraries(doorlockd jsoncpp ldap ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
add_executable(doorlock-client ${DOORLOCK_CLIENT_SRCS})
target_link_libraries(doorlock-client jsoncpp)
target_link_libraries(doorlock-client jsoncpp ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
install(TARGETS doorlockd DESTINATION sbin/)
install(FILES img/template.png DESTINATION share/doorlockd/)

12
doorlockd/config.h.in
View File

@ -3,13 +3,13 @@
#cmakedefine USE_COLORIZED_LOGS
#define DOORLOCKD_VERSION_MAJOR "@DOORLOCKD_VERSION_MAJOR@"
#define DOORLOCKD_VERSION_MINOR "@DOORLOCKD_VERSION_MINOR@"
#define DOORLOCKD_VERSION_PATCH "@DOORLOCKD_VERSION_PATCH@"
#define DOORLOCKD_VERSION "@DOORLOCKD_VERSION@"
#define DOORLOCK_VERSION_MAJOR "@DOORLOCK_VERSION_MAJOR@"
#define DOORLOCK_VERSION_MINOR "@DOORLOCK_VERSION_MINOR@"
#define DOORLOCK_VERSION_PATCH "@DOORLOCK_VERSION_PATCH@"
#define DOORLOCK_VERSION "@DOORLOCK_VERSION@"
#define DOORLOCKD_GIT_BRANCH @GIT_BRANCH@
#define DOORLOCKD_GIT_COMMIT_HASH @GIT_COMMIT_HASH@
#define DOORLOCK_GIT_BRANCH @GIT_BRANCH@
#define DOORLOCK_GIT_COMMIT_HASH @GIT_COMMIT_HASH@
#ifdef DEBUG
#define DEFAULT_LOG_LEVEL LogLevel::debug2

4
doorlockd/src/doorlockd.cpp
View File

@ -20,9 +20,9 @@ using boost::asio::ip::tcp;
// Info about doorlockd version
const static std::string version =
"doorlockd-" DOORLOCKD_VERSION;
"doorlockd-" DOORLOCK_VERSION;
const static std::string gitversion =
DOORLOCKD_GIT_BRANCH "-" DOORLOCKD_GIT_COMMIT_HASH;
DOORLOCK_GIT_BRANCH "-" DOORLOCK_GIT_COMMIT_HASH;
// The receive buffer length of the TCP socket
const int constexpr SOCKET_BUFFERLENGTH = 2048;