From e3f870efc6370bd2d930c9b53e7addff9997240b Mon Sep 17 00:00:00 2001 From: casey langen Date: Tue, 8 Feb 2022 18:57:30 -0800 Subject: [PATCH] Fix normal darwin build --- .cmake/ConfigureBsdPaths.cmake | 1 + CMakeLists.txt | 4 ++-- src/core_c_demo/CMakeLists.txt | 1 + src/musikcore/CMakeLists.txt | 5 +---- src/musikcube/CMakeLists.txt | 16 ++++++++-------- src/musikcubed/CMakeLists.txt | 3 ++- src/plugins/httpdatastream/CMakeLists.txt | 5 +++-- src/plugins/server/CMakeLists.txt | 6 +++--- 8 files changed, 21 insertions(+), 20 deletions(-) diff --git a/.cmake/ConfigureBsdPaths.cmake b/.cmake/ConfigureBsdPaths.cmake index a09107786..362ad5088 100644 --- a/.cmake/ConfigureBsdPaths.cmake +++ b/.cmake/ConfigureBsdPaths.cmake @@ -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 diff --git a/CMakeLists.txt b/CMakeLists.txt index c2dedd123..023046221 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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}) diff --git a/src/core_c_demo/CMakeLists.txt b/src/core_c_demo/CMakeLists.txt index 3191ed615..cdf98259f 100644 --- a/src/core_c_demo/CMakeLists.txt +++ b/src/core_c_demo/CMakeLists.txt @@ -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) diff --git a/src/musikcore/CMakeLists.txt b/src/musikcore/CMakeLists.txt index a70db632e..ec6c02a5c 100644 --- a/src/musikcore/CMakeLists.txt +++ b/src/musikcore/CMakeLists.txt @@ -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") diff --git a/src/musikcube/CMakeLists.txt b/src/musikcube/CMakeLists.txt index dbb201c56..1bc2f5cb2 100644 --- a/src/musikcube/CMakeLists.txt +++ b/src/musikcube/CMakeLists.txt @@ -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}) diff --git a/src/musikcubed/CMakeLists.txt b/src/musikcubed/CMakeLists.txt index c38fc2837..2a4fbfab7 100644 --- a/src/musikcubed/CMakeLists.txt +++ b/src/musikcubed/CMakeLists.txt @@ -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) diff --git a/src/plugins/httpdatastream/CMakeLists.txt b/src/plugins/httpdatastream/CMakeLists.txt index 9a9a6b786..6009d90cd 100644 --- a/src/plugins/httpdatastream/CMakeLists.txt +++ b/src/plugins/httpdatastream/CMakeLists.txt @@ -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}) diff --git a/src/plugins/server/CMakeLists.txt b/src/plugins/server/CMakeLists.txt index bef8937fa..5bd3f19dc 100644 --- a/src/plugins/server/CMakeLists.txt +++ b/src/plugins/server/CMakeLists.txt @@ -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})