From fe38d9268df0dd754698bf5132ba6248c94a4398 Mon Sep 17 00:00:00 2001 From: Casey Langen Date: Tue, 14 Feb 2017 22:16:17 -0800 Subject: [PATCH] Fixed up websocket_remote/CMakeLists.txt to work on macOS (and hopefully Linux) --- CMakeLists.txt | 3 +++ src/contrib/websocket_remote/CMakeLists.txt | 7 +++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 47ae48b33..279b29e14 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -79,6 +79,7 @@ add_subdirectory(src/contrib/oggdecoder) add_subdirectory(src/contrib/nomaddecoder) add_subdirectory(src/contrib/flacdecoder) add_subdirectory(src/contrib/nullout) +add_subdirectory(src/contrib/websocket_remote) add_dependencies(taglibreader taglib) @@ -112,6 +113,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Linux") bin/plugins/libnomaddecoder.so bin/plugins/liboggdecoder.so bin/plugins/libtaglibreader.so + bin/plugins/libwebsocket_remote.so DESTINATION share/musikcube/plugins ) else (CMAKE_SYSTEM_NAME MATCHES "Linux") @@ -125,6 +127,7 @@ else (CMAKE_SYSTEM_NAME MATCHES "Linux") bin/plugins/libnomaddecoder.dylib bin/plugins/liboggdecoder.dylib bin/plugins/libtaglibreader.dylib + bin/plugins/libwebsocket_remote.dylib DESTINATION share/musikcube/plugins ) endif (CMAKE_SYSTEM_NAME MATCHES "Linux") diff --git a/src/contrib/websocket_remote/CMakeLists.txt b/src/contrib/websocket_remote/CMakeLists.txt index 2b84ae8cf..8d673975c 100644 --- a/src/contrib/websocket_remote/CMakeLists.txt +++ b/src/contrib/websocket_remote/CMakeLists.txt @@ -18,9 +18,8 @@ set (BOOST_LINK_LIBS ${Boost_LIBRARIES}) set (websocket_remote_LINK_LIBS ${BOOST_LINK_LIBS}) include_directories ( - "${websocket_remote_SOURCE_DIR}" - "${websocket_remote_SOURCE_DIR}/3rdparty/include" + "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/include" ) -add_library(websocket_remote SHARED ${plugin_SOURCES}) -target_link_libraries(websocket_remote ${websocket_remote_LINK_LIBS}) \ No newline at end of file +add_library(websocket_remote SHARED ${websocket_remote_SOURCES}) +target_link_libraries(websocket_remote ${websocket_remote_LINK_LIBS})