mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2024-11-19 11:10:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove boost from UNIX build scripts.

Browse Source
This commit is contained in:
casey langen 2022-12-04 13:52:07 -08:00
parent b91aa8770a
commit e31169eb25
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
CMakeLists.txt
View File

@ -52,14 +52,19 @@ include_directories(
"${musikcube_SOURCE_DIR}/src/musikcore" "${musikcube_SOURCE_DIR}/src/musikcore"
"${musikcube_SOURCE_DIR}/src/musikcube" "${musikcube_SOURCE_DIR}/src/musikcube"
"${musikcube_SOURCE_DIR}/src/musikcube/cursespp" "${musikcube_SOURCE_DIR}/src/musikcube/cursespp"
"${musikcube_SOURCE_DIR}/src/3rdparty/include") "${musikcube_SOURCE_DIR}/src/3rdparty/include"
"${musikcube_SOURCE_DIR}/src/3rdparty/asio/asio/include")
link_directories("${musikcube_SOURCE_DIR}/bin/plugins") link_directories("${musikcube_SOURCE_DIR}/bin/plugins")
find_package(Boost 1.55.0 REQUIRED system filesystem thread) # these are used to (1) disable the standalone ASIO from trying to use
include_directories(${Boost_INCLUDE_DIRS}) # boost, and (2) instruct websocketpp to use standalone (not boost) ASIO
message(STATUS "[boost] libs: " ${Boost_LIBRARIES}) add_definitions(
message(STATUS "[boost] includes: " ${Boost_INCLUDE_DIRS}) -DBOOST_DATE_TIME_NO_LIB
-DBOOST_REGEX_NO_LIB
-D_WEBSOCKETPP_CPP11_TYPE_TRAITS_
-D_WEBSOCKETPP_CPP11_RANDOM_DEVICE_
-DASIO_STANDALONE)
if (${BUILD_STANDALONE} MATCHES "true") if (${BUILD_STANDALONE} MATCHES "true")
find_vendor_library(LIBCURL curl) find_vendor_library(LIBCURL curl)
@ -74,7 +79,7 @@ endif()
find_library(LIBZ NAMES z) find_library(LIBZ NAMES z)
set(musikcube_LINK_LIBS ${DEFAULT_OS_SYSTEM_LIBS} ${Boost_LIBRARIES} ${LIBCURL} ${LIBSSL} ${LIBCRYPTO} ${LIBZ}) set(musikcube_LINK_LIBS ${DEFAULT_OS_SYSTEM_LIBS} ${LIBCURL} ${LIBSSL} ${LIBCRYPTO} ${LIBZ})
if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB) if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB) if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)

2
src/plugins/server/CMakeLists.txt
View File

@ -26,4 +26,4 @@ endif()
find_library(LIBZ NAMES z) find_library(LIBZ NAMES z)
message(STATUS "[server] using " ${LIBMICROHTTPD} ", " ${LIBZ}) message(STATUS "[server] using " ${LIBMICROHTTPD} ", " ${LIBZ})
target_link_libraries(server ${Boost_LIBRARIES} ${LIBZ} ${LIBMICROHTTPD} ${EXTRA_LIBS}) target_link_libraries(server ${LIBZ} ${LIBMICROHTTPD} ${EXTRA_LIBS})