diff --git a/CMakeLists.txt b/CMakeLists.txt index cd9f534a2..0ee70f348 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -343,8 +343,10 @@ find_package(FFTW3F REQUIRED) find_package(LibUSB REQUIRED) # used by so many packages find_package(OpenCV OPTIONAL_COMPONENTS core highgui imgproc imgcodecs videoio) # channeltx/modatv find_package(LibSigMF) # SigMF recording files support -find_package(ZLIB) # For DAB -find_package(FAAD) # For DAB +if(NOT WIN32) + find_package(ZLIB) # For DAB + find_package(FAAD) # For DAB +endif() if (LIBSIGMF_FOUND AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU") add_definitions(-DHAS_LIBSIGMF) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index ebe43813f..4af95abb4 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -479,7 +479,7 @@ if (ZLIB_FOUND AND FAAD_FOUND) if (WIN32) install(FILES "${SDRANGEL_BINARY_BIN_DIR}/dab_lib${CMAKE_SHARED_LIBRARY_SUFFIX}" DESTINATION "${INSTALL_LIB_DIR}") elseif (APPLE) - set(DAB_LIBRARIES "${binary_dir}/libapt${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "") + set(DAB_LIBRARIES "${binary_dir}/libdab_lib${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "") install(DIRECTORY "${binary_dir}/" DESTINATION "${INSTALL_LIB_DIR}" FILES_MATCHING PATTERN "libdab_lib*${CMAKE_SHARED_LIBRARY_SUFFIX}") set(MACOS_EXTERNAL_LIBS_FIXUP "${MACOS_EXTERNAL_LIBS_FIXUP};${binary_dir}/")