mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2024-12-27 21:14:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed up websocket_remote/CMakeLists.txt to work on macOS (and hopefully Linux)

Browse Source
This commit is contained in:
Casey Langen 2017-02-14 22:16:17 -08:00
parent a367a0471e
commit fe38d9268d
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -79,6 +79,7 @@ add_subdirectory(src/contrib/oggdecoder)
add_subdirectory(src/contrib/nomaddecoder) add_subdirectory(src/contrib/nomaddecoder)
add_subdirectory(src/contrib/flacdecoder) add_subdirectory(src/contrib/flacdecoder)
add_subdirectory(src/contrib/nullout) add_subdirectory(src/contrib/nullout)
add_subdirectory(src/contrib/websocket_remote)
add_dependencies(taglibreader taglib) add_dependencies(taglibreader taglib)
@ -112,6 +113,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Linux")
bin/plugins/libnomaddecoder.so bin/plugins/libnomaddecoder.so
bin/plugins/liboggdecoder.so bin/plugins/liboggdecoder.so
bin/plugins/libtaglibreader.so bin/plugins/libtaglibreader.so
bin/plugins/libwebsocket_remote.so
DESTINATION share/musikcube/plugins DESTINATION share/musikcube/plugins
) )
else (CMAKE_SYSTEM_NAME MATCHES "Linux") else (CMAKE_SYSTEM_NAME MATCHES "Linux")
@ -125,6 +127,7 @@ else (CMAKE_SYSTEM_NAME MATCHES "Linux")
bin/plugins/libnomaddecoder.dylib bin/plugins/libnomaddecoder.dylib
bin/plugins/liboggdecoder.dylib bin/plugins/liboggdecoder.dylib
bin/plugins/libtaglibreader.dylib bin/plugins/libtaglibreader.dylib
bin/plugins/libwebsocket_remote.dylib
DESTINATION share/musikcube/plugins DESTINATION share/musikcube/plugins
) )
endif (CMAKE_SYSTEM_NAME MATCHES "Linux") endif (CMAKE_SYSTEM_NAME MATCHES "Linux")

7
src/contrib/websocket_remote/CMakeLists.txt
View File

@ -18,9 +18,8 @@ set (BOOST_LINK_LIBS ${Boost_LIBRARIES})
set (websocket_remote_LINK_LIBS ${BOOST_LINK_LIBS}) set (websocket_remote_LINK_LIBS ${BOOST_LINK_LIBS})
include_directories ( include_directories (
"${websocket_remote_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/include"
"${websocket_remote_SOURCE_DIR}/3rdparty/include"
) )
add_library(websocket_remote SHARED ${plugin_SOURCES}) add_library(websocket_remote SHARED ${websocket_remote_SOURCES})
target_link_libraries(websocket_remote ${websocket_remote_LINK_LIBS}) target_link_libraries(websocket_remote ${websocket_remote_LINK_LIBS})