mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2024-10-01 20:42:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix normal darwin build

Browse Source
This commit is contained in:
casey langen 2022-02-08 18:57:30 -08:00
parent a5e0265927
commit e3f870efc6
8 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cmake/ConfigureBsdPaths.cmake
View File

@ -17,6 +17,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin" OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR
"${BSD_PATH_PREFIX}/include"
"${BSD_PATH_PREFIX}/opt/openssl/include"
"${BSD_PATH_PREFIX}/opt/ncurses/include")
list(
APPEND
VENDOR_LINK_DIRECTORIES

4
CMakeLists.txt
View File

@ -49,8 +49,8 @@ else()
find_library(LIBCURL NAMES curl)
endif()
find_library(LIBSSL NAMES ssl)
find_library(LIBCRYPTO NAMES crypto)
find_library(LIBSSL NAMES ssl PATHS ${VENDOR_LINK_DIRECTORIES})
find_library(LIBCRYPTO NAMES crypto PATHS ${VENDOR_LINK_DIRECTORIES})
find_library(LIBZ NAMES z)
set(musikcube_LINK_LIBS ${DEFAULT_OS_SYSTEM_LIBS} ${Boost_LIBRARIES} ${LIBCURL} ${LIBSSL} ${LIBCRYPTO} ${LIBZ})

1
src/core_c_demo/CMakeLists.txt
View File

@ -9,4 +9,5 @@ endif()
add_executable(core_c_demo ${CORE_C_DEMO_SRCS})
target_include_directories(core_c_demo BEFORE PRIVATE ${VENDOR_INCLUDE_DIRECTORIES})
target_link_libraries(core_c_demo ${musikcube_LINK_LIBS} musikcore)

5
src/musikcore/CMakeLists.txt
View File

@ -84,10 +84,7 @@ add_library(musikcore SHARED ${CORE_SOURCES})
set_target_properties(musikcore PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${musikcube_SOURCE_DIR}/bin)
target_link_libraries(musikcore ${musikcube_LINK_LIBS})
if (${BUILD_STANDALONE} MATCHES "true")
target_include_directories(musikcore BEFORE PRIVATE ${VENDOR_INCLUDE_DIRECTORIES})
endif()
target_include_directories(musikcore BEFORE PRIVATE ${VENDOR_INCLUDE_DIRECTORIES})
if (ENABLE_PCH MATCHES "true")
message(STATUS "[musikcore] enabling precompiled headers")

16
src/musikcube/CMakeLists.txt
View File

@ -66,8 +66,7 @@ set (CUBE_SRCS
./cursespp/TextInput.cpp
./cursespp/TextLabel.cpp
./cursespp/ToastOverlay.cpp
./cursespp/Window.cpp
)
./cursespp/Window.cpp)
set(musikcube_INSTALL_DIR ${HOMEBREW_PREFIX})
if (NOT DEFINED musikcube_INSTALL_DIR)
@ -79,9 +78,7 @@ configure_file("musikcube.in" "musikcube" @ONLY)
add_executable(musikcube ${CUBE_SRCS})
add_definitions(-DNCURSES_WIDECHAR)
if (${BUILD_STANDALONE} MATCHES "true")
target_include_directories(musikcube BEFORE PRIVATE ${VENDOR_INCLUDE_DIRECTORIES})
endif()
target_include_directories(musikcube BEFORE PRIVATE ${VENDOR_INCLUDE_DIRECTORIES})
# figure out if we have a "w" suffix or not...
if (${NCURSES_DISABLE_LIB_SUFFIXES} MATCHES "true")
@ -94,9 +91,12 @@ else()
set(PANEL_LIBRARY_NAME panelw)
endif()
find_library(LIBNCURSES NAMES ${CURSES_LIBRARY_NAME})
find_library(LIBPANEL NAMES ${PANEL_LIBRARY_NAME})
find_library(LIBTINFO NAMES tinfo)
find_library(LIBNCURSES NAMES ${CURSES_LIBRARY_NAME} PATHS ${VENDOR_LINK_DIRECTORIES})
find_library(LIBPANEL NAMES ${PANEL_LIBRARY_NAME} PATHS ${VENDOR_LINK_DIRECTORIES})
if (NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
find_library(LIBTINFO NAMES tinfo)
endif()
message(STATUS "[musikcube] using libncurses at: " ${LIBNCURSES})
message(STATUS "[musikcube] using libpanel at: " ${LIBPANEL})

3
src/musikcubed/CMakeLists.txt
View File

@ -10,8 +10,9 @@ endif()
configure_file("musikcubed.in" "musikcubed" @ONLY)
add_executable(musikcubed ${DAEMON_SRCS})
target_include_directories(musikcubed BEFORE PRIVATE ${VENDOR_INCLUDE_DIRECTORIES})
if (${BUILD_STANDALONE} MATCHES "true")
target_include_directories(musikcubed BEFORE PRIVATE ${VENDOR_INCLUDE_DIRECTORIES})
find_library(EVLIB NAMES libev.a ev)
else()
find_library(EVLIB NAMES ev)

5
src/plugins/httpdatastream/CMakeLists.txt
View File

@ -2,8 +2,9 @@ set (httpdatastream_SOURCES
httpdatastream_plugin.cpp
HttpDataStream.cpp
HttpDataStreamFactory.cpp
LruDiskCache.cpp
)
LruDiskCache.cpp)
add_library(httpdatastream SHARED ${httpdatastream_SOURCES})
target_include_directories(httpdatastream BEFORE PUBLIC ${Boost_INCLUDE_DIRS})
target_link_libraries(httpdatastream ${musikcube_LINK_LIBS})

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

@ -11,13 +11,13 @@ set (server_SOURCES
add_library(server SHARED ${server_SOURCES})
target_include_directories(server BEFORE PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/include")
target_include_directories(server BEFORE PRIVATE ${VENDOR_INCLUDE_DIRECTORIES})
if (${BUILD_STANDALONE} MATCHES "true")
target_include_directories(server BEFORE PRIVATE ${VENDOR_INCLUDE_DIRECTORIES})
find_library(LIBMICROHTTPD NAMES libmicrohttpd.a PATHS ${VENDOR_LINK_DIRECTORIES} NO_DEFAULT_PATH NO_CACHE)
else()
if (APPLE)
find_library(LIBGNUTLS NAMES gnuatls)
find_library(LIBGNUTLS NAMES gnutls)
set(EXTRA_LIBS "${LIBGNUTLS}")
endif()
find_library(LIBMICROHTTPD NAMES microhttpd)
@ -26,4 +26,4 @@ endif()
find_library(LIBZ NAMES z)
message(STATUS "[server] using " ${LIBMICROHTTPD} ", " ${LIBZ})
target_link_libraries(server ${LIBZ} ${LIBMICROHTTPD} ${EXTRA_LIBS})
target_link_libraries(server ${Boost_LIBRARIES} ${LIBZ} ${LIBMICROHTTPD} ${EXTRA_LIBS})