VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-12-23 10:05:46 -05:00
Code Issues Projects Releases Wiki Activity

Fix ffpmeg/opencv dependencies. Enable C lang on Mac, for external projects

Browse Source
This commit is contained in:
Jon Beniston 2023-09-13 21:58:51 +01:00
parent e83d974443
commit df4c6ca825
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.13.0)
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL") set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
if(APPLE) if(APPLE)
project(sdrangel LANGUAGES CXX OBJCXX) project(sdrangel LANGUAGES C CXX OBJCXX)
else() else()
project(sdrangel) project(sdrangel)
endif() endif()

7
external/CMakeLists.txt vendored
View File

@ -185,9 +185,10 @@ else()
set(USE_PRECOMPILED_LIBS TRUE) set(USE_PRECOMPILED_LIBS TRUE)
endif() endif()
# We don't CACHE the _DEPENDS variables, as the external project is only added when NOT _FOUND # We don't CACHE the _DEPENDS variables, as some external projects are only added when NOT _FOUND
# and not in subsequent configures when _FOUND # and not in subsequent configures when _FOUND (E.g. ffmpeg/opencv aren't added second time
# Use PARENT_SCOPE so they can still be used in other CMakeFiles. # around as it slows down the build and causes some dependencies to always be rebuilt.)
# Use PARENT_SCOPE so they can be used in other CMakeFiles.
macro(set_global NAME VALUE) macro(set_global NAME VALUE)
set(${NAME} ${VALUE}) set(${NAME} ${VALUE})
set(${NAME} ${VALUE} PARENT_SCOPE) set(${NAME} ${VALUE} PARENT_SCOPE)

4
plugins/channelrx/demoddatv/CMakeLists.txt
View File

@ -96,8 +96,8 @@ add_executable(ldpctool
) )
install(TARGETS ldpctool DESTINATION ${INSTALL_BIN_DIR}) install(TARGETS ldpctool DESTINATION ${INSTALL_BIN_DIR})
if(FFMPEG_EXTERNAL) if(DEFINED FFMPEG_DEPENDS)
add_dependencies(${TARGET_NAME} ffmpeg) add_dependencies(${TARGET_NAME} ${FFMPEG_DEPENDS})
endif() endif()
install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_FOLDER}) install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_FOLDER})

2
plugins/channeltx/modatv/CMakeLists.txt
View File

@ -62,7 +62,7 @@ target_link_libraries(${TARGET_NAME}
) )
if(DEFINED OpenCV_DEPENDS) if(DEFINED OpenCV_DEPENDS)
add_dependencies(${TARGET_NAME} opencv) add_dependencies(${TARGET_NAME} ${OpenCV_DEPENDS})
endif() endif()
install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_FOLDER}) install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_FOLDER})

4
plugins/channeltx/moddatv/CMakeLists.txt
View File

@ -87,8 +87,8 @@ target_link_libraries(${TARGET_NAME}
${SWRESAMPLE_LIBRARIES} ${SWRESAMPLE_LIBRARIES}
) )
if(FFMPEG_EXTERNAL) if(DEFINED FFMPEG_DEPENDS)
add_dependencies(${TARGET_NAME} ffmpeg) add_dependencies(${TARGET_NAME} ${FFMPEG_DEPENDS})
endif() endif()
install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_FOLDER}) install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_FOLDER})