ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build: Link our libs and executable targets against zm-core-interface

This commit is contained in:
Peter Keresztes Schmidt 2021-02-08 22:36:34 +01:00
parent 44be2ccf6c
commit 00104b020c
2 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/CMakeLists.txt
View File

@ -77,6 +77,10 @@ target_include_directories(zm
PUBLIC PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}) ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(zm
PRIVATE
zm-core-interface)
link_directories(libbcrypt) link_directories(libbcrypt)
add_executable(zmc zmc.cpp) add_executable(zmc zmc.cpp)
@ -87,9 +91,31 @@ add_executable(zms zms.cpp)
include_directories(libbcrypt/include/bcrypt) include_directories(libbcrypt/include/bcrypt)
include_directories(jwt-cpp/include/jwt-cpp) include_directories(jwt-cpp/include/jwt-cpp)
target_link_libraries(zmc zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS} ${CMAKE_DL_LIBS}) target_link_libraries(zmc
target_link_libraries(zmu zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS} ${CMAKE_DL_LIBS} bcrypt) PRIVATE
target_link_libraries(zms zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS} ${CMAKE_DL_LIBS} bcrypt) zm-core-interface
zm
${ZM_EXTRA_LIBS}
${ZM_BIN_LIBS}
${CMAKE_DL_LIBS})
target_link_libraries(zmu
PRIVATE
zm-core-interface
zm
${ZM_EXTRA_LIBS}
${ZM_BIN_LIBS}
${CMAKE_DL_LIBS}
bcrypt)
target_link_libraries(zms
PRIVATE
zm-core-interface
zm
${ZM_EXTRA_LIBS}
${ZM_BIN_LIBS}
${CMAKE_DL_LIBS}
bcrypt)
# Generate man files for the binaries destined for the bin folder # Generate man files for the binaries destined for the bin folder
if(BUILD_MAN) if(BUILD_MAN)

1
tests/CMakeLists.txt
View File

@ -18,6 +18,7 @@ add_executable(tests main.cpp ${TEST_SOURCES})
target_link_libraries(tests target_link_libraries(tests
PRIVATE PRIVATE
zm-core-interface
zm zm
${ZM_BIN_LIBS} ${ZM_BIN_LIBS}
bcrypt bcrypt