kapitan/IXWebSocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

try to fix windows link

Browse Source
This commit is contained in:
Benjamin Sergeant 2020-04-17 16:51:45 -07:00
parent 68ee57a6a7
commit 8db688b818
2 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
test/CMakeLists.txt
View File

@ -82,24 +82,20 @@ if (MAC)
add_sanitizers(ixwebsocket_unittest) add_sanitizers(ixwebsocket_unittest)
endif() endif()
if (APPLE AND USE_TLS)
target_link_libraries(ixwebsocket_unittest "-framework foundation" "-framework security")
endif()
if (JSONCPP_FOUND) if (JSONCPP_FOUND)
target_include_directories(ixwebsocket_unittest PUBLIC ${JSONCPP_INCLUDE_DIRS}) target_include_directories(ixwebsocket_unittest PRIVATE ${JSONCPP_INCLUDE_DIRS})
target_link_libraries(ixwebsocket_unittest ${JSONCPP_LIBRARIES}) target_link_libraries(ixwebsocket_unittest PRIVATE ${JSONCPP_LIBRARIES})
endif() endif()
# library with the most dependencies come first # library with the most dependencies come first
target_link_libraries(ixwebsocket_unittest ixbots) target_link_libraries(ixwebsocket_unittest PRIVATE ixbots)
target_link_libraries(ixwebsocket_unittest ixsnake) target_link_libraries(ixwebsocket_unittest PRIVATE ixsnake)
target_link_libraries(ixwebsocket_unittest ixcobra) target_link_libraries(ixwebsocket_unittest PRIVATE ixcobra)
target_link_libraries(ixwebsocket_unittest ixsentry) target_link_libraries(ixwebsocket_unittest PRIVATE ixsentry)
target_link_libraries(ixwebsocket_unittest ixwebsocket) target_link_libraries(ixwebsocket_unittest PRIVATE ixwebsocket)
target_link_libraries(ixwebsocket_unittest ixcrypto) target_link_libraries(ixwebsocket_unittest PRIVATE ixcrypto)
target_link_libraries(ixwebsocket_unittest ixcore) target_link_libraries(ixwebsocket_unittest PRIVATE ixcore)
target_link_libraries(ixwebsocket_unittest spdlog) target_link_libraries(ixwebsocket_unittest PRIVATE spdlog)
install(TARGETS ixwebsocket_unittest DESTINATION bin) install(TARGETS ixwebsocket_unittest DESTINATION bin)

20
ws/CMakeLists.txt
View File

@ -60,19 +60,19 @@ add_executable(ws
ws.cpp) ws.cpp)
# library with the most dependencies come first # library with the most dependencies come first
target_link_libraries(ws ixbots) target_link_libraries(ws PRIVATE ixbots)
target_link_libraries(ws ixsnake) target_link_libraries(ws PRIVATE ixsnake)
target_link_libraries(ws ixcobra) target_link_libraries(ws PRIVATE ixcobra)
target_link_libraries(ws ixsentry) target_link_libraries(ws PRIVATE ixsentry)
target_link_libraries(ws ixwebsocket) target_link_libraries(ws PRIVATE ixwebsocket)
target_link_libraries(ws ixcrypto) target_link_libraries(ws PRIVATE ixcrypto)
target_link_libraries(ws ixcore) target_link_libraries(ws PRIVATE ixcore)
target_link_libraries(ws spdlog) target_link_libraries(ws PRIVATE spdlog)
if (JSONCPP_FOUND) if (JSONCPP_FOUND)
target_include_directories(ws PUBLIC ${JSONCPP_INCLUDE_DIRS}) target_include_directories(ws PRIVATE ${JSONCPP_INCLUDE_DIRS})
target_link_libraries(ws ${JSONCPP_LIBRARIES}) target_link_libraries(ws PRIVATE ${JSONCPP_LIBRARIES})
endif() endif()
install(TARGETS ws RUNTIME DESTINATION bin) install(TARGETS ws RUNTIME DESTINATION bin)