diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 1c0021a5..70599804 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -82,20 +82,24 @@ if (MAC) add_sanitizers(ixwebsocket_unittest) endif() +if (APPLE AND USE_TLS) + target_link_libraries(ixwebsocket_unittest "-framework foundation" "-framework security") +endif() + if (JSONCPP_FOUND) - target_include_directories(ixwebsocket_unittest PRIVATE ${JSONCPP_INCLUDE_DIRS}) - target_link_libraries(ixwebsocket_unittest PRIVATE ${JSONCPP_LIBRARIES}) + target_include_directories(ixwebsocket_unittest PUBLIC ${JSONCPP_INCLUDE_DIRS}) + target_link_libraries(ixwebsocket_unittest ${JSONCPP_LIBRARIES}) endif() # library with the most dependencies come first -target_link_libraries(ixwebsocket_unittest PRIVATE ixbots) -target_link_libraries(ixwebsocket_unittest PRIVATE ixsnake) -target_link_libraries(ixwebsocket_unittest PRIVATE ixcobra) -target_link_libraries(ixwebsocket_unittest PRIVATE ixsentry) -target_link_libraries(ixwebsocket_unittest PRIVATE ixwebsocket) -target_link_libraries(ixwebsocket_unittest PRIVATE ixcrypto) -target_link_libraries(ixwebsocket_unittest PRIVATE ixcore) +target_link_libraries(ixwebsocket_unittest ixbots) +target_link_libraries(ixwebsocket_unittest ixsnake) +target_link_libraries(ixwebsocket_unittest ixcobra) +target_link_libraries(ixwebsocket_unittest ixsentry) +target_link_libraries(ixwebsocket_unittest ixwebsocket) +target_link_libraries(ixwebsocket_unittest ixcrypto) +target_link_libraries(ixwebsocket_unittest ixcore) -target_link_libraries(ixwebsocket_unittest PRIVATE spdlog) +target_link_libraries(ixwebsocket_unittest spdlog) install(TARGETS ixwebsocket_unittest DESTINATION bin) diff --git a/ws/CMakeLists.txt b/ws/CMakeLists.txt index d3c2b8f5..c9803ce1 100644 --- a/ws/CMakeLists.txt +++ b/ws/CMakeLists.txt @@ -60,19 +60,19 @@ add_executable(ws ws.cpp) # library with the most dependencies come first -target_link_libraries(ws PRIVATE ixbots) -target_link_libraries(ws PRIVATE ixsnake) -target_link_libraries(ws PRIVATE ixcobra) -target_link_libraries(ws PRIVATE ixsentry) -target_link_libraries(ws PRIVATE ixwebsocket) -target_link_libraries(ws PRIVATE ixcrypto) -target_link_libraries(ws PRIVATE ixcore) +target_link_libraries(ws ixbots) +target_link_libraries(ws ixsnake) +target_link_libraries(ws ixcobra) +target_link_libraries(ws ixsentry) +target_link_libraries(ws ixwebsocket) +target_link_libraries(ws ixcrypto) +target_link_libraries(ws ixcore) -target_link_libraries(ws PRIVATE spdlog) +target_link_libraries(ws spdlog) if (JSONCPP_FOUND) - target_include_directories(ws PRIVATE ${JSONCPP_INCLUDE_DIRS}) - target_link_libraries(ws PRIVATE ${JSONCPP_LIBRARIES}) + target_include_directories(ws PUBLIC ${JSONCPP_INCLUDE_DIRS}) + target_link_libraries(ws ${JSONCPP_LIBRARIES}) endif() install(TARGETS ws RUNTIME DESTINATION bin)