jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

build/cmake: fix on macOS

Browse Source 
Change-Id: I728827c5515095f355c000d4a9a76f0a1a6eb78b
This commit is contained in:
Adrien Béraud
2023-02-23 11:53:28 -05:00
parent 382dd1254f
commit b256d64959
6 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
CMakeLists.txt
View File

@ -472,14 +472,13 @@ else()
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE BOTH)
list(APPEND CMAKE_PREFIX_PATH ${CONTRIB_PATH})
find_package (jsoncpp REQUIRED)
find_package (yaml-cpp REQUIRED)
find_package (jsoncpp CONFIG REQUIRED)
find_package (yaml-cpp CONFIG REQUIRED)
pkg_search_module (fmt REQUIRED IMPORTED_TARGET fmt)
pkg_search_module (webrtcap REQUIRED IMPORTED_TARGET webrtc-audio-processing)
pkg_search_module (webrtcap IMPORTED_TARGET webrtc-audio-processing)
pkg_search_module (gnutls REQUIRED IMPORTED_TARGET gnutls)
pkg_search_module (opendht REQUIRED IMPORTED_TARGET opendht)
pkg_search_module (git2 REQUIRED IMPORTED_TARGET libgit2)
pkg_search_module (archive REQUIRED IMPORTED_TARGET libarchive)
pkg_search_module (secp256k1 REQUIRED IMPORTED_TARGET libsecp256k1)
pkg_search_module (pjproject REQUIRED IMPORTED_TARGET libpjproject)
pkg_search_module (avformat REQUIRED IMPORTED_TARGET libavformat)
@ -489,14 +488,19 @@ else()
pkg_search_module (swresample REQUIRED IMPORTED_TARGET libswresample)
pkg_search_module (swscale REQUIRED IMPORTED_TARGET libswscale)
pkg_search_module (avutil REQUIRED IMPORTED_TARGET libavutil)
if (JAMI_PLUGIN)
if (APPLE)
pkg_search_module (archive REQUIRED IMPORTED_TARGET minizip)
else()
pkg_search_module (archive REQUIRED IMPORTED_TARGET libarchive)
endif()
endif()
target_link_libraries(${PROJECT_NAME} PRIVATE
PkgConfig::opendht
PkgConfig::pjproject
PkgConfig::git2
PkgConfig::archive
PkgConfig::gnutls
PkgConfig::webrtcap
PkgConfig::avformat
PkgConfig::avdevice
PkgConfig::avfilter
@ -540,6 +544,14 @@ else()
if (JAMI_PUPNP)
target_link_libraries(${PROJECT_NAME} PRIVATE upnp)
endif()
if (JAMI_PLUGIN)
target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::archive)
endif()
if (webrtcap_FOUND)
target_sources(${PROJECT_NAME} PRIVATE ${Source_Files__media__audio__webrtc} )
target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::webrtcap)
target_compile_definitions(${PROJECT_NAME} PRIVATE HAVE_WEBRTC_AP)
endif()
if (JAMI_JNI)
# Build jni binding

2
contrib/src/main.mak
View File

@ -540,8 +540,6 @@ endif
ifdef HAVE_CROSS_COMPILE
echo "set(_CMAKE_TOOLCHAIN_PREFIX $(CROSS_COMPILE))" >> $@
endif
echo "set(CMAKE_C_COMPILER \"$(CC)\")" >> $@
echo "set(CMAKE_CXX_COMPILER \"$(CXX)\")" >> $@
echo "set(CMAKE_FIND_ROOT_PATH $(PREFIX))" >> $@
echo "set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)" >> $@
echo "set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)" >> $@

1
src/CMakeLists.txt
View File

@ -90,6 +90,7 @@ set (Source_Files__media ${Source_Files__media} PARENT_SCOPE)
set (Source_Files__media__audio ${Source_Files__media__audio} PARENT_SCOPE)
set (Source_Files__media__audio__sound ${Source_Files__media__audio__sound} PARENT_SCOPE)
set (Source_Files__media__audio__audio_processing ${Source_Files__media__audio__audio_processing} PARENT_SCOPE)
set (Source_Files__media__audio__webrtc ${Source_Files__media__audio__webrtc} PARENT_SCOPE)
set (Source_Files__media__video ${Source_Files__media__video} PARENT_SCOPE)
if(MSVC)
if(WINDOWS_STORE)

1
src/media/CMakeLists.txt
View File

@ -57,6 +57,7 @@ if(MSVC)
endif()
set (Source_Files__media__audio__sound ${Source_Files__media__audio__sound} PARENT_SCOPE)
set (Source_Files__media__audio__audio_processing ${Source_Files__media__audio__audio_processing} PARENT_SCOPE)
set (Source_Files__media__audio__webrtc ${Source_Files__media__audio__webrtc} PARENT_SCOPE)
set (Source_Files__media__video ${Source_Files__media__video} PARENT_SCOPE)
if(MSVC)

1
src/media/audio/CMakeLists.txt
View File

@ -52,3 +52,4 @@ set (Source_Files__media__audio__sound ${Source_Files__media__audio__sound} PARE
add_subdirectory(audio-processing)
set (Source_Files__media__audio__audio_processing ${Source_Files__media__audio__audio_processing} PARENT_SCOPE)
set (Source_Files__media__audio__webrtc ${Source_Files__media__audio__webrtc} PARENT_SCOPE)

4
src/media/audio/audio-processing/CMakeLists.txt
View File

@ -7,8 +7,12 @@ list (APPEND Source_Files__media__audio__audio_processing
"${CMAKE_CURRENT_SOURCE_DIR}/null_audio_processor.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/speex.h"
"${CMAKE_CURRENT_SOURCE_DIR}/speex.cpp"
)
list (APPEND Source_Files__media__audio__webrtc
"${CMAKE_CURRENT_SOURCE_DIR}/webrtc.h"
"${CMAKE_CURRENT_SOURCE_DIR}/webrtc.cpp"
)
set (Source_Files__media__audio__audio_processing ${Source_Files__media__audio__audio_processing} PARENT_SCOPE)
set (Source_Files__media__audio__webrtc ${Source_Files__media__audio__webrtc} PARENT_SCOPE)