Giacomo Comes
b22dc60178
- adapt SR#1155718 to linphoneqt
* fix boo#1221909
- Update to version 5.2.1.
Changelog:
* Fixed
* URI handlers when no domain are provided like tel:number.
* Empty page on first date in date picker.
* Ephemeral deactivation while restarting it.
* Fix rates on capture audio (SDK).
* Update SDK to 5.3.14.
* Added
* Remove trailing newlines in smart search bar.
- Remove patches fix-no-git.patch, 0002-remove-bc_compute_full_version-usage.patch.
- Add patches fix_cmakelists.patch, fix_ispell_return_type_error.patch.
OBS-URL: https://build.opensuse.org/request/show/1175043
OBS-URL: https://build.opensuse.org/package/show/network:telephony/linphoneqt?expand=0&rev=59
61 lines
3.0 KiB
Diff
61 lines
3.0 KiB
Diff
diff --git a/linphone-app/CMakeLists.txt b/linphone-app/CMakeLists.txt
|
|
index d3e0e7b6..92dce03b 100644
|
|
--- a/linphone-app/CMakeLists.txt
|
|
+++ b/linphone-app/CMakeLists.txt
|
|
@@ -24,14 +24,11 @@ cmake_minimum_required(VERSION 3.22)
|
|
|
|
|
|
#Linphone targets
|
|
-set(LINPHONE_PACKAGES LinphoneCxx Mediastreamer2 Belcard LibLinphone)
|
|
+set(LINPHONE_PACKAGES LinphoneCxx Mediastreamer2 BelCard LibLinphone)
|
|
|
|
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
|
|
|
|
-find_package(BCToolbox)
|
|
-if(NOT BCToolbox_FOUND)
|
|
- find_package(bctoolbox CONFIG REQUIRED)
|
|
-endif()
|
|
+find_package(BCToolbox CONFIG REQUIRED)
|
|
if(NOT LINPHONEAPP_VERSION)
|
|
bc_compute_full_version(LINPHONEAPP_VERSION)
|
|
endif()
|
|
@@ -111,11 +108,12 @@ foreach(PACKAGE ${LINPHONE_PACKAGES})
|
|
endif()
|
|
endforeach()
|
|
|
|
+set(LinphoneCxx_TARGET liblinphone++)
|
|
set(PLUGIN_TARGETS ${LinphoneCxx_TARGET})
|
|
set(APP_TARGETS ${LinphoneCxx_TARGET}
|
|
${BCToolbox_TARGET}#Logger/App
|
|
${Mediastreamer2_TARGET}#MediastreamerUtils
|
|
- ${Belcard_TARGET}#VCard Model
|
|
+ ${BelCard_TARGET}#VCard Model
|
|
${LibLinphone_TARGET})#MediastreamerUtils
|
|
|
|
####################################
|
|
@@ -724,6 +722,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.cmake" "${CMAKE_CURRENT
|
|
# ------------------------------------------------------------------------------
|
|
|
|
include_directories(src/)
|
|
+include_directories(include/)
|
|
include_directories("${LINPHONE_OUTPUT_DIR}/include/OpenGL")
|
|
include_directories("${LINPHONE_OUTPUT_DIR}/include/")
|
|
include_directories("${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/")
|
|
@@ -837,14 +836,9 @@ add_dependencies(${APP_LIBRARY} update_translations ${APP_PLUGIN})
|
|
set(TOOLS_DIR "${CMAKE_BINARY_DIR}/programs")
|
|
set(LINPHONE_BUILDER_SIGNING_IDENTITY ${LINPHONE_BUILDER_SIGNING_IDENTITY})
|
|
|
|
-add_custom_command(TARGET ${APP_PLUGIN} POST_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/")
|
|
-add_custom_command(TARGET ${APP_PLUGIN} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/include/" "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/")
|
|
-add_custom_command(TARGET ${APP_PLUGIN} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${APP_PLUGIN}> "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/")
|
|
-add_custom_command(TARGET ${APP_PLUGIN} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_LINKER_FILE:${APP_PLUGIN}> "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/")
|
|
-#add_custom_command(TARGET ${TARGET_NAME} PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/include/LinphoneApp/*" "${CMAKE_INSTALL_PREFIX}/include/LinphoneApp/")
|
|
-
|
|
#configure_file("${CMAKE_CURRENT_SOURCE_DIR}/include/*" "${CMAKE_INSTALL_PREFIX}/include/LinphoneApp/" COPYONLY)
|
|
-install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
|
|
+install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
|
|
+install(TARGETS ${APP_PLUGIN} DESTINATION "${CMAKE_INSTALL_LIBDIR}")
|
|
|
|
|
|
add_subdirectory(build)
|