diff options
| author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2021-01-12 23:38:11 +0100 |
|---|---|---|
| committer | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2021-01-22 20:24:28 +0100 |
| commit | d8e631fb22e1d78f06d6bb393cbd9d0645ed902c (patch) | |
| tree | 61b4e8027d88449ee4dfeb4af7a7a9d7fde0dee1 | |
| parent | 9e1d4fbc759dd3f0d8d11df2efc968c64b688a96 (diff) | |
CMake: Fix dependencies detection
| -rw-r--r-- | CMakeLists.txt | 15 | ||||
| -rw-r--r-- | cmake/modules/FindRubberband.cmake | 2 |
2 files changed, 7 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 973393298a..160be64e8d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2068,9 +2068,7 @@ target_compile_definitions(mixxx-lib PUBLIC __SNDFILE__) if(SndFile_SUPPORTS_SET_COMPRESSION_LEVEL) target_compile_definitions(mixxx-lib PUBLIC SFC_SUPPORTS_SET_COMPRESSION_LEVEL) endif() - -#libsndfile is always build statically, so we don't check for STATIC_DEPS -if(WIN32) +if(WIN32 AND STATIC_DEPS) find_package(G72X REQUIRED) target_link_libraries(mixxx-lib PUBLIC G72X::G72X) endif() @@ -2406,8 +2404,7 @@ if(OPUS) target_compile_definitions(mixxx-lib PUBLIC __OPUS__) target_include_directories(mixxx-lib SYSTEM PUBLIC ${Opus_INCLUDE_DIRS}) target_link_libraries(mixxx-lib PUBLIC ${Opus_LIBRARIES}) - # Opus is always built statically so we don't check STATIC_DEPS - if(WIN32) + if(WIN32 AND STATIC_DEPS) find_package(Celt) if(NOT Celt_FOUND) message(FATAL_ERROR "Opus support with static dependencies requires the celt library.") @@ -2506,12 +2503,12 @@ if(HID) target_include_directories(mixxx-hidapi SYSTEM PUBLIC lib/hidapi/hidapi) if(WIN32) target_sources(mixxx-hidapi PRIVATE lib/hidapi/windows/hid.c) + find_library(Setupapi_LIBRARY Setupapi REQUIRED) + target_link_libraries(mixxx-hidapi PUBLIC ${Setupapi_LIBRARY}) elseif(APPLE) target_sources(mixxx-hidapi PRIVATE lib/hidapi/mac/hid.c) - find_library(APPKIT_LIBRARY AppKit REQUIRED) - target_link_libraries(mixxx-lib PUBLIC - ${APPKIT_LIBRARY} - ) + find_library(AppKit_LIBRARY AppKit REQUIRED) + target_link_libraries(mixxx-hidapi PUBLIC ${AppKit_LIBRARY}) elseif(UNIX) if(NOT LibUSB_FOUND) message(FATAL_ERROR "USB HID controller support on Unix with statically linked libhidapi-libusb requires libusb 1.0 and its development headers.") diff --git a/cmake/modules/FindRubberband.cmake b/cmake/modules/FindRubberband.cmake index 4f4046ea62..3634ce7906 100644 --- a/cmake/modules/FindRubberband.cmake +++ b/cmake/modules/FindRubberband.cmake @@ -55,7 +55,7 @@ find_path(Rubberband_INCLUDE_DIR mark_as_advanced(Rubberband_INCLUDE_DIR) find_library(Rubberband_LIBRARY - NAMES rubberband + NAMES rubberband rubberband-library rubberband-dll PATHS ${PC_Rubberband_LIBRARY_DIRS} DOC "Rubberband library" ) |