VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-09-28 15:56:33 -04:00
Code Issues Projects Releases Wiki Activity

Removed cm256cc dependency and therefore remote plugins for Mac OS

Browse Source
This commit is contained in:
f4exb 2020-03-28 18:50:22 +01:00
parent fda24fed6d
commit 409d2ddf9a
2 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -362,7 +362,9 @@ if(ENABLE_EXTERNAL_LIBRARIES)
add_subdirectory(external) add_subdirectory(external)
else() else()
find_package(Codec2) find_package(Codec2)
find_package(CM256cc) if (NOT APPLE)
find_package(CM256cc)
endif()
find_package(LibMbe) find_package(LibMbe)
find_package(SerialDV REQUIRED) find_package(SerialDV REQUIRED)
find_package(LibDSDcc) find_package(LibDSDcc)

58
external/CMakeLists.txt vendored
View File

@ -161,34 +161,36 @@ if(NOT WIN32)
endif() endif()
# needs boost # needs boost
ExternalProject_Add(cm256cc if(NOT APPLE)
GIT_REPOSITORY https://github.com/f4exb/cm256cc.git ExternalProject_Add(cm256cc
GIT_TAG ${CM256CC_TAG} GIT_REPOSITORY https://github.com/f4exb/cm256cc.git
PREFIX "${EXTERNAL_BUILD_LIBRARIES}/cm256cc" GIT_TAG ${CM256CC_TAG}
CMAKE_ARGS ${DEFAULT_OUTPUT_DIRECTORIES} PREFIX "${EXTERNAL_BUILD_LIBRARIES}/cm256cc"
-DBUILD_TOOLS=OFF CMAKE_ARGS ${DEFAULT_OUTPUT_DIRECTORIES}
-DBOOST_ROOT="${BOOST_ROOT}" -DBUILD_TOOLS=OFF
-DBoost_INCLUDE_DIR=${Boost_INCLUDE_DIRS} -DBOOST_ROOT="${BOOST_ROOT}"
-DBoost_INCLUDE_DIRS=${Boost_INCLUDE_DIRS} -DBoost_INCLUDE_DIR=${Boost_INCLUDE_DIRS}
-DENABLE_DISTRIBUTION=ON -DBoost_INCLUDE_DIRS=${Boost_INCLUDE_DIRS}
INSTALL_COMMAND "" -DENABLE_DISTRIBUTION=ON
TEST_COMMAND "" INSTALL_COMMAND ""
) TEST_COMMAND ""
ExternalProject_Get_Property(cm256cc source_dir binary_dir) )
set(CM256CC_FOUND ON CACHE INTERNAL "") ExternalProject_Get_Property(cm256cc source_dir binary_dir)
# we need cm256cc/library.h set(CM256CC_FOUND ON CACHE INTERNAL "")
set(CM256CC_INCLUDE_DIR "${EXTERNAL_BUILD_LIBRARIES}/cm256cc/src" CACHE INTERNAL "") # we need cm256cc/library.h
if(WIN32) set(CM256CC_INCLUDE_DIR "${EXTERNAL_BUILD_LIBRARIES}/cm256cc/src" CACHE INTERNAL "")
set(CM256CC_LIBRARIES "${SDRANGEL_BINARY_LIB_DIR}/cm256cc.lib" CACHE INTERNAL "") if(WIN32)
install(FILES "${SDRANGEL_BINARY_BIN_DIR}/cm256cc${CMAKE_SHARED_LIBRARY_SUFFIX}" DESTINATION "${INSTALL_LIB_DIR}") set(CM256CC_LIBRARIES "${SDRANGEL_BINARY_LIB_DIR}/cm256cc.lib" CACHE INTERNAL "")
elseif(LINUX) install(FILES "${SDRANGEL_BINARY_BIN_DIR}/cm256cc${CMAKE_SHARED_LIBRARY_SUFFIX}" DESTINATION "${INSTALL_LIB_DIR}")
set(CM256CC_LIBRARIES "${EXTERNAL_BUILD_LIBRARIES}/lib/libcm256cc${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "") elseif(LINUX)
elseif(APPLE) set(CM256CC_LIBRARIES "${EXTERNAL_BUILD_LIBRARIES}/lib/libcm256cc${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "")
set(CM256CC_LIBRARIES "${binary_dir}/libcm256cc${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "") elseif(APPLE) # kept in case of relaxation of APPLE exclusion
install(DIRECTORY "${binary_dir}/" DESTINATION "${INSTALL_LIB_DIR}" set(CM256CC_LIBRARIES "${binary_dir}/libcm256cc${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "")
FILES_MATCHING PATTERN "libcm256cc*${CMAKE_SHARED_LIBRARY_SUFFIX}") install(DIRECTORY "${binary_dir}/" DESTINATION "${INSTALL_LIB_DIR}"
set(MACOS_EXTERNAL_LIBS_FIXUP "${MACOS_EXTERNAL_LIBS_FIXUP};${binary_dir}") FILES_MATCHING PATTERN "libcm256cc*${CMAKE_SHARED_LIBRARY_SUFFIX}")
endif() set(MACOS_EXTERNAL_LIBS_FIXUP "${MACOS_EXTERNAL_LIBS_FIXUP};${binary_dir}")
endif()
endif() # NOT APPLE
set(USE_MBELIB OFF) set(USE_MBELIB OFF)
ExternalProject_Add(mbelib ExternalProject_Add(mbelib