From 4aea14d30ac780ddc0b655cf9971080ff14e453f Mon Sep 17 00:00:00 2001 From: casey langen Date: Mon, 7 Feb 2022 17:36:43 -0800 Subject: [PATCH] Remove unused libraries from most plugins. --- CMakeLists.txt | 2 +- src/musikcore/CMakeLists.txt | 2 +- src/plugins/alsaout/CMakeLists.txt | 4 ++-- src/plugins/coreaudioout/CMakeLists.txt | 2 +- src/plugins/gmedecoder/CMakeLists.txt | 2 +- src/plugins/httpdatastream/CMakeLists.txt | 2 +- src/plugins/libopenmptdecoder/CMakeLists.txt | 4 ++-- src/plugins/macosmediakeys/CMakeLists.txt | 2 +- src/plugins/mpris/CMakeLists.txt | 2 +- src/plugins/nullout/CMakeLists.txt | 2 +- src/plugins/pipewireout/CMakeLists.txt | 2 +- src/plugins/pulseout/CMakeLists.txt | 2 +- src/plugins/sndioout/CMakeLists.txt | 2 +- src/plugins/supereqdsp/CMakeLists.txt | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c3324a243..a25142921 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,7 +63,7 @@ if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB) endif() endif() -message(STATUS "[build] link libraries are: ${musikcube_LINK_LIBS}") +message(STATUS "[build] musikcube_LINK_LIBS: ${musikcube_LINK_LIBS}") add_subdirectory(src/musikcore) add_subdirectory(src/core_c_demo) diff --git a/src/musikcore/CMakeLists.txt b/src/musikcore/CMakeLists.txt index 876ffa408..757979b29 100644 --- a/src/musikcore/CMakeLists.txt +++ b/src/musikcore/CMakeLists.txt @@ -86,7 +86,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}) +target_link_libraries(musikcore) if (ENABLE_PCH MATCHES "true") message(STATUS "[musikcore] enabling precompiled headers") diff --git a/src/plugins/alsaout/CMakeLists.txt b/src/plugins/alsaout/CMakeLists.txt index b67842f4f..6f6bda335 100755 --- a/src/plugins/alsaout/CMakeLists.txt +++ b/src/plugins/alsaout/CMakeLists.txt @@ -5,6 +5,6 @@ set (alsaout_SOURCES ensure_library_exists(asound) -add_library(alsaout SHARED ${alsaout_SOURCES} ) -target_link_libraries(alsaout ${musikcube_LINK_LIBS} asound) +add_library(alsaout SHARED ${alsaout_SOURCES}) +target_link_libraries(alsaout asound) diff --git a/src/plugins/coreaudioout/CMakeLists.txt b/src/plugins/coreaudioout/CMakeLists.txt index 3bdfe960f..53f47d88c 100644 --- a/src/plugins/coreaudioout/CMakeLists.txt +++ b/src/plugins/coreaudioout/CMakeLists.txt @@ -14,4 +14,4 @@ IF(APPLE) ENDIF (APPLE) add_library(coreaudioout SHARED ${coreaudioout_SOURCES}) -target_link_libraries(coreaudioout ${musikcube_LINK_LIBS} ${FRAMEWORK_LIBS}) +target_link_libraries(coreaudioout ${FRAMEWORK_LIBS}) diff --git a/src/plugins/gmedecoder/CMakeLists.txt b/src/plugins/gmedecoder/CMakeLists.txt index 508efde8e..fe5de8fc5 100644 --- a/src/plugins/gmedecoder/CMakeLists.txt +++ b/src/plugins/gmedecoder/CMakeLists.txt @@ -129,4 +129,4 @@ set (gmedecoder_SOURCES add_definitions(-DHAVE_STDINT_H) include_directories("${CMAKE_CURRENT_SOURCE_DIR}/gme") add_library(gmedecoder SHARED ${gmedecoder_SOURCES}) -target_link_libraries(gmedecoder ${musikcube_LINK_LIBS}) +target_link_libraries(gmedecoder) diff --git a/src/plugins/httpdatastream/CMakeLists.txt b/src/plugins/httpdatastream/CMakeLists.txt index 9a9a6b786..bad06db88 100644 --- a/src/plugins/httpdatastream/CMakeLists.txt +++ b/src/plugins/httpdatastream/CMakeLists.txt @@ -6,4 +6,4 @@ set (httpdatastream_SOURCES ) add_library(httpdatastream SHARED ${httpdatastream_SOURCES}) -target_link_libraries(httpdatastream ${musikcube_LINK_LIBS}) +target_link_libraries(httpdatastream) diff --git a/src/plugins/libopenmptdecoder/CMakeLists.txt b/src/plugins/libopenmptdecoder/CMakeLists.txt index f765e05c7..5e272251c 100644 --- a/src/plugins/libopenmptdecoder/CMakeLists.txt +++ b/src/plugins/libopenmptdecoder/CMakeLists.txt @@ -19,7 +19,7 @@ if (${LINK_STATICALLY} MATCHES "true") message(STATUS "[libopenmptdecoder] using ${OPENMPTLIB}") message(STATUS "[libopenmptdecoder] using ${MPG123LIB}") message(STATUS "[libopenmptdecoder] using ${ZLIB}") - target_link_libraries(openmptdecoder ${musikcube_LINK_LIBS} ${OPENMPTLIB} ${MPG123LIB} ${ZLIB}) + target_link_libraries(openmptdecoder ${OPENMPTLIB} ${MPG123LIB} ${ZLIB}) else() - target_link_libraries(openmptdecoder ${musikcube_LINK_LIBS} openmpt) + target_link_libraries(openmptdecoder openmpt) endif() diff --git a/src/plugins/macosmediakeys/CMakeLists.txt b/src/plugins/macosmediakeys/CMakeLists.txt index 8bdae5541..3a60aa384 100644 --- a/src/plugins/macosmediakeys/CMakeLists.txt +++ b/src/plugins/macosmediakeys/CMakeLists.txt @@ -9,4 +9,4 @@ FIND_LIBRARY(CARBON_LIBRARY Carbon) MARK_AS_ADVANCED (APP_KIT_LIBRARY CARBON_LIBRARY) add_library(macosmediakeys SHARED ${macosmediakeys_SOURCES}) -target_link_libraries(macosmediakeys ${musikcube_LINK_LIBS} ${APP_KIT_LIBRARY} ${CARBON_LIBRARY}) +target_link_libraries(macosmediakeys ${APP_KIT_LIBRARY} ${CARBON_LIBRARY}) diff --git a/src/plugins/mpris/CMakeLists.txt b/src/plugins/mpris/CMakeLists.txt index add3b9c31..fdee62d2d 100644 --- a/src/plugins/mpris/CMakeLists.txt +++ b/src/plugins/mpris/CMakeLists.txt @@ -6,4 +6,4 @@ find_package(PkgConfig) pkg_check_modules (SYSTEMD REQUIRED libsystemd) add_library(mpris SHARED ${mpris_SOURCES}) -target_link_libraries(mpris ${musikcube_LINK_LIBS} systemd) +target_link_libraries(mpris systemd) diff --git a/src/plugins/nullout/CMakeLists.txt b/src/plugins/nullout/CMakeLists.txt index 9b0cf9e42..17273cc6c 100644 --- a/src/plugins/nullout/CMakeLists.txt +++ b/src/plugins/nullout/CMakeLists.txt @@ -4,4 +4,4 @@ set (nullout_SOURCES ) add_library(nullout SHARED ${nullout_SOURCES}) -target_link_libraries(nullout ${musikcube_LINK_LIBS}) +target_link_libraries(nullout) diff --git a/src/plugins/pipewireout/CMakeLists.txt b/src/plugins/pipewireout/CMakeLists.txt index 233adab24..57280d556 100644 --- a/src/plugins/pipewireout/CMakeLists.txt +++ b/src/plugins/pipewireout/CMakeLists.txt @@ -11,4 +11,4 @@ find_package(PkgConfig) pkg_check_modules(PIPEWIRE REQUIRED IMPORTED_TARGET libpipewire-0.3) add_library(pipewireout SHARED ${pipewireout_SOURCES}) -target_link_libraries(pipewireout ${musikcube_LINK_LIBS} PkgConfig::PIPEWIRE) +target_link_libraries(pipewireout PkgConfig::PIPEWIRE) diff --git a/src/plugins/pulseout/CMakeLists.txt b/src/plugins/pulseout/CMakeLists.txt index 026e64d43..e13baa15b 100755 --- a/src/plugins/pulseout/CMakeLists.txt +++ b/src/plugins/pulseout/CMakeLists.txt @@ -7,4 +7,4 @@ set (pulseout_SOURCES ensure_library_exists(pulse) add_library(pulseout SHARED ${pulseout_SOURCES}) -target_link_libraries(pulseout ${musikcube_LINK_LIBS} pulse) +target_link_libraries(pulseout pulse) diff --git a/src/plugins/sndioout/CMakeLists.txt b/src/plugins/sndioout/CMakeLists.txt index bfd3b3551..3e2d68c7b 100644 --- a/src/plugins/sndioout/CMakeLists.txt +++ b/src/plugins/sndioout/CMakeLists.txt @@ -6,4 +6,4 @@ set (sndioout_SOURCES ensure_library_exists(sndio) add_library(sndioout SHARED ${sndioout_SOURCES}) -target_link_libraries(sndioout ${musikcube_LINK_LIBS} sndio) +target_link_libraries(sndioout sndio) diff --git a/src/plugins/supereqdsp/CMakeLists.txt b/src/plugins/supereqdsp/CMakeLists.txt index 5e8e6a4ab..cd6b31d39 100644 --- a/src/plugins/supereqdsp/CMakeLists.txt +++ b/src/plugins/supereqdsp/CMakeLists.txt @@ -6,4 +6,4 @@ set (nullout_SOURCES ) add_library(supereqdsp SHARED ${nullout_SOURCES}) -target_link_libraries(supereqdsp ${musikcube_LINK_LIBS}) +target_link_libraries(supereqdsp)