diff --git a/CMakeLists.txt b/CMakeLists.txt
index 24a019e1feb8734ab385e0eedaee366478a1cf04..21fd2fde81290be8e3654b000ec646bf6a42a4a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,7 +91,7 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
add_definitions("-DDEBUG")
endif()
-set(LINPHONE_LIBS_FOR_TOOLS linphone)
+set(LINPHONE_LIBS_FOR_TOOLS liblinphone)
if(WIN32 AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
list(APPEND LINPHONE_LIBS_FOR_TOOLS "Ws2_32" "Iphlpapi" "user32")
endif()
diff --git a/cmake/FindBelleSIP.cmake b/cmake/FindBelleSIP.cmake
index 2d7a21964905c0882d430629c2f353dc1583d819..42a3e07c9c68b830738e67213605d2d0f9b92e67 100644
--- a/cmake/FindBelleSIP.cmake
+++ b/cmake/FindBelleSIP.cmake
@@ -27,11 +27,11 @@
# BELLESIP_LIBRARIES - The library needed to use bellesip
# BELLESIP_TARGETNAME - The target name for the bellesip library
-if(TARGET bellesip)
+if(TARGET belle-sip)
- set(BELLESIP_LIBRARIES bellesip)
- set(BELLESIP_TARGETNAME bellesip)
- get_target_property(BELLESIP_INCLUDE_DIRS bellesip INTERFACE_INCLUDE_DIRECTORIES)
+ set(BELLESIP_LIBRARIES belle-sip)
+ set(BELLESIP_TARGETNAME belle-sip)
+ get_target_property(BELLESIP_INCLUDE_DIRS belle-sip INTERFACE_INCLUDE_DIRECTORIES)
include(FindPackageHandleStandardArgs)
diff --git a/cmake/FindMediastreamer2.cmake b/cmake/FindMediastreamer2.cmake
index 60ed381ecfc4ff985e19904496c4c7a30f691d18..64ac8f284e744ac9ae8877452a96cdb2511fa184 100644
--- a/cmake/FindMediastreamer2.cmake
+++ b/cmake/FindMediastreamer2.cmake
@@ -27,12 +27,12 @@
# MEDIASTREAMER2_LIBRARIES - The library needed to use mediasteamer2
# MEDIASTREAMER2_PLUGINS_LOCATION - The location of the mediastreamer2 plugins
-if(TARGET mediastreamer)
+if(TARGET mediastreamer2)
- set(MEDIASTREAMER2_LIBRARIES mediastreamer)
- get_target_property(MEDIASTREAMER2_INCLUDE_DIRS mediastreamer INTERFACE_INCLUDE_DIRECTORIES)
+ set(MEDIASTREAMER2_LIBRARIES mediastreamer2)
+ get_target_property(MEDIASTREAMER2_INCLUDE_DIRS mediastreamer2 INTERFACE_INCLUDE_DIRECTORIES)
define_property(TARGET PROPERTY "MS2_PLUGINS" BRIEF_DOCS "Stores the location of mediastreamer2 plugins" FULL_DOCS "Stores the location of mediastreamer2 plugins")
- get_target_property(MEDIASTREAMER2_PLUGINS_LOCATION mediastreamer MS2_PLUGINS)
+ get_target_property(MEDIASTREAMER2_PLUGINS_LOCATION mediastreamer2 MS2_PLUGINS)
include(FindPackageHandleStandardArgs)
diff --git a/console/CMakeLists.txt b/console/CMakeLists.txt
index 4a608820395048ce35c7f68744da1998ea03ad73..b7ee75db4159df4831f561f2d1131e2f5d286ef9 100644
--- a/console/CMakeLists.txt
+++ b/console/CMakeLists.txt
@@ -38,7 +38,7 @@ if(MSVC)
endif()
add_executable(linphonec ${LINPHONEC_SOURCE_FILES})
-target_link_libraries(linphonec ${LINPHONE_LIBS_FOR_TOOLS} bctoolbox ortp mediastreamer ${XSD_LIBRARIES})
+target_link_libraries(linphonec ${LINPHONE_LIBS_FOR_TOOLS} bctoolbox ortp mediastreamer2 ${XSD_LIBRARIES})
set_target_properties(linphonec PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}")
set_target_properties(linphonec PROPERTIES LINKER_LANGUAGE CXX)
@@ -48,7 +48,7 @@ endif()
if(WIN32)
add_executable(linphoned WIN32 ${LINPHONEC_SOURCE_FILES})
- target_link_libraries(linphoned ${LINPHONE_LIBS_FOR_TOOLS} bctoolbox ortp mediastreamer ${XSD_LIBRARIES})
+ target_link_libraries(linphoned ${LINPHONE_LIBS_FOR_TOOLS} bctoolbox ortp mediastreamer2 ${XSD_LIBRARIES})
if(INTL_FOUND)
target_link_libraries(linphoned ${INTL_LIBRARIES})
endif()
diff --git a/coreapi/CMakeLists.txt b/coreapi/CMakeLists.txt
index 4ae759ad2dfe39bac999f7ec0b37fa055ff57eee..b1ea74b3d4edad85cbc8c52583f24bab9e78323c 100644
--- a/coreapi/CMakeLists.txt
+++ b/coreapi/CMakeLists.txt
@@ -131,26 +131,26 @@ bc_apply_compile_flags(LINPHONE_SOURCE_FILES_CXX STRICT_OPTIONS_CPP STRICT_OPTIO
bc_apply_compile_flags(LINPHONE_SOURCE_FILES_OBJC STRICT_OPTIONS_CPP STRICT_OPTIONS_OBJC)
-add_library(linphone-coreapi OBJECT
+add_library(liblinphone-coreapi OBJECT
${LINPHONE_PRIVATE_HEADER_FILES} ${LINPHONE_SOURCE_FILES_C} ${LINPHONE_SOURCE_FILES_CXX} ${LINPHONE_SOURCE_FILES_OBJC}
)
-target_include_directories(linphone-coreapi PRIVATE
+target_include_directories(liblinphone-coreapi PRIVATE
${LINPHONE_INCLUDE_DIRS}
$<TARGET_PROPERTY:${BELLESIP_TARGETNAME},INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:belr,INTERFACE_INCLUDE_DIRECTORIES>
- $<TARGET_PROPERTY:mediastreamer,INTERFACE_INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:mediastreamer2,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:ortp,INTERFACE_INCLUDE_DIRECTORIES>
)
if(BELCARD_FOUND)
- target_include_directories(linphone-coreapi PRIVATE $<TARGET_PROPERTY:belcard,INTERFACE_INCLUDE_DIRECTORIES>)
+ target_include_directories(liblinphone-coreapi PRIVATE $<TARGET_PROPERTY:belcard,INTERFACE_INCLUDE_DIRECTORIES>)
endif()
-add_dependencies(linphone-coreapi liblinphone-git-version)
+add_dependencies(liblinphone-coreapi liblinphone-git-version)
if(ENABLE_JAVA_WRAPPER)
- add_dependencies(linphone-coreapi linphonej)
+ add_dependencies(liblinphone-coreapi linphonej)
endif()
if(BUILD_SHARED_LIBS)
- set_target_properties(linphone-coreapi PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
+ set_target_properties(liblinphone-coreapi PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
endif()
diff --git a/coreapi/help/doc/doxygen/CMakeLists.txt b/coreapi/help/doc/doxygen/CMakeLists.txt
index c0d2f9c752d62aa9a71cd72b268e05c5b8754368..fc46bf0a8ae66032dfc2dace2cc5a77496fffecb 100644
--- a/coreapi/help/doc/doxygen/CMakeLists.txt
+++ b/coreapi/help/doc/doxygen/CMakeLists.txt
@@ -55,7 +55,7 @@ if(ENABLE_DOC OR ENABLE_CXX_WRAPPER OR ENABLE_CSHARP_WRAPPER OR ENABLE_JAVA_WRAP
COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
DEPENDS ${DOC_INPUT_FILES}
)
- add_custom_target(linphone-doc ALL DEPENDS "${XML_DIR}/index.xml" "${C_HTML_DIR}/index.html")
+ add_custom_target(liblinphone-doc ALL DEPENDS "${XML_DIR}/index.xml" "${C_HTML_DIR}/index.html")
if(ENABLE_DOC)
install(DIRECTORY "${C_HTML_DIR}"
DESTINATION "${CMAKE_INSTALL_DATADIR}/doc/liblinphone-${LINPHONE_VERSION}")
diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
index d6cb199c60bfa7975d7ec7baaae398a1877cf106..419b4cf6476b54d5c4ca3839ee04f0b3276a1e34 100644
--- a/daemon/CMakeLists.txt
+++ b/daemon/CMakeLists.txt
@@ -126,7 +126,7 @@ bc_apply_compile_flags(DAEMON_PIPETEST_SOURCE_FILES STRICT_OPTIONS_CPP STRICT_OP
bc_apply_compile_flags(DAEMON_SOURCE_FILES_OBJC STRICT_OPTIONS_CPP STRICT_OPTIONS_OBJC)
add_executable(linphone-daemon ${DAEMON_SOURCE_FILES} ${DAEMON_SOURCE_FILES_OBJC})
target_include_directories(linphone-daemon PRIVATE ${CMAKE_CURRENT_LIST_DIR} ${LINPHONE_INCLUDE_DIRS})
-target_link_libraries(linphone-daemon ${LINPHONE_LIBS_FOR_TOOLS} mediastreamer ortp bctoolbox bellesip ${XSD_LIBRARIES})
+target_link_libraries(linphone-daemon ${LINPHONE_LIBS_FOR_TOOLS} mediastreamer2 ortp bctoolbox belle-sip ${XSD_LIBRARIES})
set_target_properties(linphone-daemon PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}")
set_target_properties(linphone-daemon PROPERTIES LINKER_LANGUAGE CXX)
if(APPLE)
@@ -134,7 +134,7 @@ if(APPLE)
endif()
add_executable(linphone-daemon-pipetest ${DAEMON_PIPETEST_SOURCE_FILES})
-target_link_libraries(linphone-daemon-pipetest ${LINPHONE_LIBS_FOR_TOOLS} ortp mediastreamer)
+target_link_libraries(linphone-daemon-pipetest ${LINPHONE_LIBS_FOR_TOOLS} ortp mediastreamer2)
set_target_properties(linphone-daemon-pipetest PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}")
set_target_properties(linphone-daemon-pipetest PROPERTIES LINKER_LANGUAGE CXX)
diff --git a/plugins/example/CMakeLists.txt b/plugins/example/CMakeLists.txt
index 7e42aaa7d60055ea52efceb6cb1acbb529b9eed6..95f16813528be80becc0b45e9bda44a6a85ca194 100644
--- a/plugins/example/CMakeLists.txt
+++ b/plugins/example/CMakeLists.txt
@@ -99,7 +99,7 @@ if(ENABLE_SHARED)
PRIVATE ${INCLUDE_DIRS}
)
- target_link_libraries(exampleplugin PRIVATE linphone mediastreamer ${LIBS})
+ target_link_libraries(exampleplugin PRIVATE linphone mediastreamer2 ${LIBS})
set_target_properties(exampleplugin PROPERTIES LINKER_LANGUAGE CXX)
if(APPLE)
if(IOS)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3b70a8cf242702af161fb87095afa660d0976c67..5e6d0f2f440f199276f4a025b850b9d77c67abf5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -28,7 +28,7 @@ set(LINK_LIBS
)
set(PUBLIC_LINK_LIBS
ortp
- mediastreamer
+ mediastreamer2
)
#APPLE_LIBS is mandatory for apple compilation
@@ -683,54 +683,54 @@ if(BUILD_SHARED_LIBS)
set_source_files_properties(${SWIFT_MODULE_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION Modules)
endif()
-add_library(linphone ${LINPHONE_RESOURCES} ${SWIFT_MODULE_FILES} ${LINPHONE_HEADER_FILES}
+add_library(liblinphone ${LINPHONE_RESOURCES} ${SWIFT_MODULE_FILES} ${LINPHONE_HEADER_FILES}
${LINPHONE_CXX_OBJECTS_PRIVATE_HEADER_FILES} ${LINPHONE_CXX_OBJECTS_SOURCE_FILES} ${LINPHONE_OBJC_SOURCE_FILES}
- $<TARGET_OBJECTS:linphone-coreapi>
+ $<TARGET_OBJECTS:liblinphone-coreapi>
)
if(APPLE)
- set_target_properties(linphone PROPERTIES OUTPUT_NAME linphone)
+ set_target_properties(liblinphone PROPERTIES OUTPUT_NAME linphone)
else()
- set_target_properties(linphone PROPERTIES OUTPUT_NAME liblinphone)
+ set_target_properties(liblinphone PROPERTIES OUTPUT_NAME liblinphone)
endif()
-set_target_properties(linphone PROPERTIES PREFIX "")
-set_target_properties(linphone PROPERTIES LINKER_LANGUAGE CXX)
+set_target_properties(liblinphone PROPERTIES PREFIX "")
+set_target_properties(liblinphone PROPERTIES LINKER_LANGUAGE CXX)
if(NOT ANDROID)
# Do not version shared library on Android
- set_target_properties(linphone PROPERTIES SOVERSION ${LINPHONE_SO_VERSION})
+ set_target_properties(liblinphone PROPERTIES SOVERSION ${LINPHONE_SO_VERSION})
endif()
-target_include_directories(linphone PUBLIC
+target_include_directories(liblinphone PUBLIC
$<INSTALL_INTERFACE:include/>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/coreapi/>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/>
PRIVATE ${LINPHONE_INCLUDE_DIRS} ${LINPHONE_CXX_OBJECTS_INCLUDE_DIRS}
)
-target_link_libraries(linphone
+target_link_libraries(liblinphone
PUBLIC ${PUBLIC_LINK_LIBS}
PRIVATE ${LINK_LIBS}
)
if(ENABLE_FLEXIAPI)
- target_link_libraries(linphone PUBLIC ${JSONCPP_LIBRARIES})
+ target_link_libraries(liblinphone PUBLIC ${JSONCPP_LIBRARIES})
endif()
if(APPLE)
- target_link_libraries(linphone PUBLIC ${APPLE_LIBS})
+ target_link_libraries(liblinphone PUBLIC ${APPLE_LIBS})
endif()
if(ICONV_FOUND)
if(APPLE)
# Prevent conflict between the system iconv.h header and the one from macports.
- target_compile_options(linphone PRIVATE "-include" "${ICONV_INCLUDE_DIRS}/iconv.h")
+ target_compile_options(liblinphone PRIVATE "-include" "${ICONV_INCLUDE_DIRS}/iconv.h")
else()
- target_include_directories(linphone PRIVATE ${ICONV_INCLUDE_DIRS})
+ target_include_directories(liblinphone PRIVATE ${ICONV_INCLUDE_DIRS})
endif()
endif()
if(BUILD_SHARED_LIBS)
if(MSVC)
- set_target_properties(linphone PROPERTIES PDB_NAME liblinphone)
+ set_target_properties(liblinphone PROPERTIES PDB_NAME liblinphone)
endif()
- target_compile_definitions(linphone PRIVATE "-DLINPHONE_EXPORTS")
+ target_compile_definitions(liblinphone PRIVATE "-DLINPHONE_EXPORTS")
if(APPLE)
if(IOS)
set(MIN_OS ${LINPHONE_IOS_DEPLOYMENT_TARGET})
@@ -743,7 +743,7 @@ if(BUILD_SHARED_LIBS)
set_source_files_properties(${LINPHONE_ENUMS_HEADER_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION "Headers/enums")
set_source_files_properties(${LINPHONE_UTILS_HEADER_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION "Headers/utils")
list(GET LINPHONE_ROOT_HEADER_FILES 0 one_header_file)
- set_target_properties(linphone PROPERTIES
+ set_target_properties(liblinphone PROPERTIES
FRAMEWORK TRUE
MACOSX_FRAMEWORK_IDENTIFIER org.linphone.linphone
MACOSX_FRAMEWORK_INFO_PLIST "${PROJECT_SOURCE_DIR}/build/osx/Info.plist.in"
@@ -755,18 +755,18 @@ if(BUILD_SHARED_LIBS)
if(WIN32)
# Export Xerces and Soci symbols.
if(ENABLE_DB_STORAGE)
- target_compile_definitions(linphone PRIVATE "-DDLL_EXPORT" "-DSOCI_DLL")
+ target_compile_definitions(liblinphone PRIVATE "-DDLL_EXPORT" "-DSOCI_DLL")
endif()
elseif(ANDROID)
if (SUPPORT_FOUND)
- target_link_libraries(linphone PUBLIC "log" ${SUPPORT_LIBRARIES} ${CPUFEATURES_LIBRARIES})
+ target_link_libraries(liblinphone PUBLIC "log" ${SUPPORT_LIBRARIES} ${CPUFEATURES_LIBRARIES})
else()
- target_link_libraries(linphone PUBLIC "log" ${CPUFEATURES_LIBRARIES})
+ target_link_libraries(liblinphone PUBLIC "log" ${CPUFEATURES_LIBRARIES})
endif()
endif()
if(MSVC)
if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
- install(FILES $<TARGET_PDB_FILE:linphone>
+ install(FILES $<TARGET_PDB_FILE:liblinphone>
DESTINATION ${CMAKE_INSTALL_BINDIR}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
)
@@ -774,7 +774,7 @@ if(BUILD_SHARED_LIBS)
endif()
endif()
-install(TARGETS linphone EXPORT ${EXPORT_TARGETS_NAME}Targets
+install(TARGETS liblinphone EXPORT ${EXPORT_TARGETS_NAME}Targets
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
diff --git a/tester/CMakeLists.txt b/tester/CMakeLists.txt
index 7abf7cf6f0176a0ef77820cb5f01382e928999b8..340fc27f1c015e476f8cbd38569b57580c881cda 100644
--- a/tester/CMakeLists.txt
+++ b/tester/CMakeLists.txt
@@ -25,7 +25,7 @@ set(OTHER_LIBS_FOR_TESTER
bctoolbox
bctoolbox-tester
ortp
- mediastreamer
+ mediastreamer2
${BELLESIP_TARGETNAME}
belr
${XML2_LIBRARIES} ${XSD_LIBRARIES}
@@ -62,7 +62,7 @@ if(TURBOJPEG_FOUND)
endif()
if(ENABLE_CXX_WRAPPER)
- list(APPEND OTHER_LIBS_FOR_TESTER linphone++)
+ list(APPEND OTHER_LIBS_FOR_TESTER liblinphone++)
endif()
set(SOUND_FILES
@@ -489,24 +489,24 @@ endif()
if(NOT ANDROID)
if(NOT IOS AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
- add_executable(liblinphone_tester ${HEADER_FILES} ${SOURCE_FILES_C} ${SOURCE_FILES_CXX} ${SOURCE_FILES_OBJC})
- set_target_properties(liblinphone_tester PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}")
- set_target_properties(liblinphone_tester PROPERTIES LINKER_LANGUAGE CXX)
- set_target_properties(liblinphone_tester PROPERTIES C_STANDARD 99)
- target_include_directories(liblinphone_tester PRIVATE ${LINPHONE_INCLUDE_DIRS} ${SOCI_INCLUDE_DIRS})
- target_link_libraries(liblinphone_tester ${LINPHONE_LIBS_FOR_TOOLS} ${OTHER_LIBS_FOR_TESTER})
+ add_executable(liblinphone-tester ${HEADER_FILES} ${SOURCE_FILES_C} ${SOURCE_FILES_CXX} ${SOURCE_FILES_OBJC})
+ set_target_properties(liblinphone-tester PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}")
+ set_target_properties(liblinphone-tester PROPERTIES LINKER_LANGUAGE CXX)
+ set_target_properties(liblinphone-tester PROPERTIES C_STANDARD 99)
+ target_include_directories(liblinphone-tester PRIVATE ${LINPHONE_INCLUDE_DIRS} ${SOCI_INCLUDE_DIRS})
+ target_link_libraries(liblinphone-tester ${LINPHONE_LIBS_FOR_TOOLS} ${OTHER_LIBS_FOR_TESTER})
if(APPLE)
- target_link_libraries(liblinphone_tester "-framework AppKit")
+ target_link_libraries(liblinphone-tester "-framework AppKit")
endif()
if(MSVC)
if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
- install(FILES $<TARGET_PDB_FILE:liblinphone_tester>
+ install(FILES $<TARGET_PDB_FILE:liblinphone-tester>
DESTINATION ${CMAKE_INSTALL_BINDIR}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
)
endif()
endif()
- install(TARGETS liblinphone_tester
+ install(TARGETS liblinphone-tester
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -516,14 +516,14 @@ if(NOT ANDROID)
configure_file("${PROJECT_SOURCE_DIR}/build/osx/Info.plist.in" "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/Info.plist")
endif()
- add_executable(groupchat_benchmark ${GROUP_CHAT_BENCHMARK_HEADERS} ${GROUP_CHAT_BENCHMARK_SOURCE_C} ${GROUP_CHAT_BENCHMARK_SOURCE_CXX})
- set_target_properties(groupchat_benchmark PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}")
- set_target_properties(groupchat_benchmark PROPERTIES LINKER_LANGUAGE CXX)
- set_target_properties(groupchat_benchmark PROPERTIES C_STANDARD 99)
- target_include_directories(groupchat_benchmark PRIVATE ${LINPHONE_INCLUDE_DIRS} ${SOCI_INCLUDE_DIRS})
- target_link_libraries(groupchat_benchmark ${LINPHONE_LIBS_FOR_TOOLS} ${OTHER_LIBS_FOR_TESTER})
+ add_executable(liblinphone-groupchat-benchmark ${GROUP_CHAT_BENCHMARK_HEADERS} ${GROUP_CHAT_BENCHMARK_SOURCE_C} ${GROUP_CHAT_BENCHMARK_SOURCE_CXX})
+ set_target_properties(liblinphone-groupchat-benchmark PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}")
+ set_target_properties(liblinphone-groupchat-benchmark PROPERTIES LINKER_LANGUAGE CXX)
+ set_target_properties(liblinphone-groupchat-benchmark PROPERTIES C_STANDARD 99)
+ target_include_directories(liblinphone-groupchat-benchmark PRIVATE ${LINPHONE_INCLUDE_DIRS} ${SOCI_INCLUDE_DIRS})
+ target_link_libraries(liblinphone-groupchat-benchmark ${LINPHONE_LIBS_FOR_TOOLS} ${OTHER_LIBS_FOR_TESTER})
- install(TARGETS groupchat_benchmark
+ install(TARGETS liblinphone-groupchat-benchmark
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -531,14 +531,14 @@ if(NOT ANDROID)
)
endif()
- install(FILES ${CERTIFICATE_ALT_FILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/liblinphone_tester/certificates/altname")
- install(FILES ${CERTIFICATE_CLIENT_FILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/liblinphone_tester/certificates/client")
- install(FILES ${CERTIFICATE_CN_FILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/liblinphone_tester/certificates/cn")
- install(FILES ${DB_FILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/liblinphone_tester/db")
- install(FILES ${IMAGE_FILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/liblinphone_tester/images")
- install(FILES ${OTHER_FILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/liblinphone_tester")
- install(FILES ${RC_FILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/liblinphone_tester/rcfiles")
- install(FILES ${SIPP_FILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/liblinphone_tester/sipp")
- install(FILES ${SOUND_FILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/liblinphone_tester/sounds")
- install(FILES ${VCARD_FILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/liblinphone_tester/vcards")
+ install(FILES ${CERTIFICATE_ALT_FILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/liblinphone-tester/certificates/altname")
+ install(FILES ${CERTIFICATE_CLIENT_FILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/liblinphone-tester/certificates/client")
+ install(FILES ${CERTIFICATE_CN_FILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/liblinphone-tester/certificates/cn")
+ install(FILES ${DB_FILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/liblinphone-tester/db")
+ install(FILES ${IMAGE_FILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/liblinphone-tester/images")
+ install(FILES ${OTHER_FILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/liblinphone-tester")
+ install(FILES ${RC_FILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/liblinphone-tester/rcfiles")
+ install(FILES ${SIPP_FILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/liblinphone-tester/sipp")
+ install(FILES ${SOUND_FILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/liblinphone-tester/sounds")
+ install(FILES ${VCARD_FILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/liblinphone-tester/vcards")
endif()
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index a5cc49dd8d692799327e9ac1e702587efd8d01e8..81ee4164d1db620d419c879186875f1c457c6ba8 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -28,46 +28,46 @@ endif()
set(LP_AUTO_ANSWER_SOURCE_FILES auto_answer.c)
bc_apply_compile_flags(LP_AUTO_ANSWER_SOURCE_FILES STRICT_OPTIONS_CPP STRICT_OPTIONS_C)
-add_executable(lp-auto-answer ${USE_BUNDLE} ${LP_AUTO_ANSWER_SOURCE_FILES})
-target_link_libraries(lp-auto-answer ${LINPHONE_LIBS_FOR_TOOLS} mediastreamer ortp bctoolbox ${XSD_LIBRARIES})
-set_target_properties(lp-auto-answer PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}")
-set_target_properties(lp-auto-answer PROPERTIES LINKER_LANGUAGE CXX)
+add_executable(liblinphone-auto-answer ${USE_BUNDLE} ${LP_AUTO_ANSWER_SOURCE_FILES})
+target_link_libraries(liblinphone-auto-answer ${LINPHONE_LIBS_FOR_TOOLS} mediastreamer2 ortp bctoolbox ${XSD_LIBRARIES})
+set_target_properties(liblinphone-auto-answer PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}")
+set_target_properties(liblinphone-auto-answer PROPERTIES LINKER_LANGUAGE CXX)
set(LP_SENDMSG_SOURCE_FILES lpsendmsg.c)
bc_apply_compile_flags(LP_SENDMSG_SOURCE_FILES STRICT_OPTIONS_CPP STRICT_OPTIONS_C)
-add_executable(lp-sendmsg ${USE_BUNDLE} ${LP_SENDMSG_SOURCE_FILES})
-target_link_libraries(lp-sendmsg ${LINPHONE_LIBS_FOR_TOOLS} ortp mediastreamer ${XSD_LIBRARIES})
-set_target_properties(lp-sendmsg PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}")
-set_target_properties(lp-sendmsg PROPERTIES LINKER_LANGUAGE CXX)
+add_executable(liblinphone-sendmsg ${USE_BUNDLE} ${LP_SENDMSG_SOURCE_FILES})
+target_link_libraries(liblinphone-sendmsg ${LINPHONE_LIBS_FOR_TOOLS} ortp mediastreamer2 ${XSD_LIBRARIES})
+set_target_properties(liblinphone-sendmsg PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}")
+set_target_properties(liblinphone-sendmsg PROPERTIES LINKER_LANGUAGE CXX)
if(ENABLE_XML2)
set(LP_LPC2XML_TEST_SOURCE_FILES lpc2xml_test.c)
bc_apply_compile_flags(LP_LPC2XML_TEST_SOURCE_FILES STRICT_OPTIONS_CPP STRICT_OPTIONS_C)
- add_executable(lpc2xml_test ${USE_BUNDLE} ${LP_LPC2XML_TEST_SOURCE_FILES})
- target_link_libraries(lpc2xml_test ${LINPHONE_LIBS_FOR_TOOLS} ortp mediastreamer ${XSD_LIBRARIES})
- set_target_properties(lpc2xml_test PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}")
- set_target_properties(lpc2xml_test PROPERTIES LINKER_LANGUAGE CXX)
+ add_executable(liblinphone-lpc2xml-test ${USE_BUNDLE} ${LP_LPC2XML_TEST_SOURCE_FILES})
+ target_link_libraries(liblinphone-lpc2xml-test ${LINPHONE_LIBS_FOR_TOOLS} ortp mediastreamer2 ${XSD_LIBRARIES})
+ set_target_properties(liblinphone-lpc2xml-test PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}")
+ set_target_properties(liblinphone-lpc2xml-test PROPERTIES LINKER_LANGUAGE CXX)
set(LP_XML2LPC_TEST_SOURCE_FILES xml2lpc_test.c)
bc_apply_compile_flags(LP_XML2LPC_TEST_SOURCE_FILES STRICT_OPTIONS_CPP STRICT_OPTIONS_C)
- add_executable(xml2lpc_test ${USE_BUNDLE} ${LP_XML2LPC_TEST_SOURCE_FILES})
- target_link_libraries(xml2lpc_test ${LINPHONE_LIBS_FOR_TOOLS} ortp mediastreamer ${XSD_LIBRARIES})
- set_target_properties(xml2lpc_test PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}")
- set_target_properties(xml2lpc_test PROPERTIES LINKER_LANGUAGE CXX)
+ add_executable(liblinphone-xml2lpc-test ${USE_BUNDLE} ${LP_XML2LPC_TEST_SOURCE_FILES})
+ target_link_libraries(liblinphone-xml2lpc-test ${LINPHONE_LIBS_FOR_TOOLS} ortp mediastreamer2 ${XSD_LIBRARIES})
+ set_target_properties(liblinphone-xml2lpc-test PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}")
+ set_target_properties(liblinphone-xml2lpc-test PROPERTIES LINKER_LANGUAGE CXX)
- set(LINPHONE_XMLTOOLS lpc2xml_test xml2lpc_test)
+ set(LINPHONE_XMLTOOLS liblinphone-lpc2xml-test liblinphone-xml2lpc-test)
endif()
set(LP_TEST_ECC_SOURCE_FILES test_ecc.c)
bc_apply_compile_flags(LP_TEST_ECC_SOURCE_FILES STRICT_OPTIONS_CPP STRICT_OPTIONS_C)
-add_executable(lp-test-ecc ${USE_BUNDLE} ${LP_TEST_ECC_SOURCE_FILES})
-target_link_libraries(lp-test-ecc ${LINPHONE_LIBS_FOR_TOOLS} ortp mediastreamer bctoolbox ${XSD_LIBRARIES})
-set_target_properties(lp-test-ecc PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}")
-set_target_properties(lp-test-ecc PROPERTIES LINKER_LANGUAGE CXX)
+add_executable(liblinphone-test-ecc ${USE_BUNDLE} ${LP_TEST_ECC_SOURCE_FILES})
+target_link_libraries(liblinphone-test-ecc ${LINPHONE_LIBS_FOR_TOOLS} ortp mediastreamer2 bctoolbox ${XSD_LIBRARIES})
+set_target_properties(liblinphone-test-ecc PROPERTIES LINK_FLAGS "${LINPHONE_LDFLAGS}")
+set_target_properties(liblinphone-test-ecc PROPERTIES LINKER_LANGUAGE CXX)
if (NOT IOS)
- install(TARGETS lp-auto-answer lp-sendmsg lp-test-ecc ${LINPHONE_XMLTOOLS}
+ install(TARGETS liblinphone-auto-answer liblinphone-sendmsg liblinphone-test-ecc ${LINPHONE_XMLTOOLS}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
diff --git a/wrappers/cpp/CMakeLists.txt b/wrappers/cpp/CMakeLists.txt
index ee59710627c81f4a0617d164ddb40a63a2784522..a635163dbf8929b2d0380d0060ee2e12f6bc1cdd 100644
--- a/wrappers/cpp/CMakeLists.txt
+++ b/wrappers/cpp/CMakeLists.txt
@@ -35,38 +35,38 @@ add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/include/linphone++/linpho
enums_header.mustache
main_header.mustache
${PROJECT_BINARY_DIR}/coreapi/help/doc/doxygen/xml/index.xml
- linphone-doc
+ liblinphone-doc
)
-add_custom_target(linphone-cxx-wrapper ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/include/linphone++/linphone.hh" "${CMAKE_CURRENT_BINARY_DIR}/src/linphone++.cc")
+add_custom_target(liblinphone-cxx-wrapper ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/include/linphone++/linphone.hh" "${CMAKE_CURRENT_BINARY_DIR}/src/linphone++.cc")
-add_library(linphone++
+add_library(liblinphone++
object.cc
tools.cc
${CMAKE_CURRENT_BINARY_DIR}/src/linphone++.cc
)
-add_dependencies(linphone++ linphone-cxx-wrapper)
+add_dependencies(liblinphone++ liblinphone-cxx-wrapper)
if(APPLE)
- set_target_properties(linphone++ PROPERTIES OUTPUT_NAME linphone++)
+ set_target_properties(liblinphone++ PROPERTIES OUTPUT_NAME linphone++)
else()
- set_target_properties(linphone++ PROPERTIES OUTPUT_NAME liblinphone++)
+ set_target_properties(liblinphone++ PROPERTIES OUTPUT_NAME liblinphone++)
endif()
-set_target_properties(linphone++ PROPERTIES PREFIX "")
+set_target_properties(liblinphone++ PROPERTIES PREFIX "")
if(MSVC)
- set_target_properties(linphone++ PROPERTIES PDB_NAME liblinphone++)
+ set_target_properties(liblinphone++ PROPERTIES PDB_NAME liblinphone++)
endif()
-target_compile_definitions(linphone++ PRIVATE "-DLINPHONECXX_EXPORTS")
-target_link_libraries(linphone++
- PRIVATE bctoolbox bellesip linphone
+target_compile_definitions(liblinphone++ PRIVATE "-DLINPHONECXX_EXPORTS")
+target_link_libraries(liblinphone++
+ PRIVATE bctoolbox belle-sip liblinphone
)
-set_target_properties(linphone++ PROPERTIES
+set_target_properties(liblinphone++ PROPERTIES
FRAMEWORK TRUE
MACOSX_FRAMEWORK_IDENTIFIER org.linphone.linphonecpp
MACOSX_FRAMEWORK_INFO_PLIST "${PROJECT_SOURCE_DIR}/build/osx/Info.plist.in"
)
-target_include_directories(linphone++
+target_include_directories(liblinphone++
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
@@ -75,9 +75,9 @@ target_include_directories(linphone++
PRIVATE
${PROJECT_BINARY_DIR}/include
)
-set_target_properties(linphone++ PROPERTIES SOVERSION ${LINPHONE_SO_VERSION})
+set_target_properties(liblinphone++ PROPERTIES SOVERSION ${LINPHONE_SO_VERSION})
-install(TARGETS linphone++ EXPORT LinphoneCxxTargets
+install(TARGETS liblinphone++ EXPORT LinphoneCxxTargets
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -134,7 +134,7 @@ if(ENABLE_DOC OR ENABLE_CXX_WRAPPER)
COMMAND ${CMAKE_COMMAND} -E make_directory ${CPP_HTML_DIR}
COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
DEPENDS ${DOC_INPUT_FILES}
- linphone-cxx-wrapper
+ liblinphone-cxx-wrapper
)
add_custom_target(linphone-cpp-html-doc ALL DEPENDS "${CPP_HTML_DIR}/index.html")
if(ENABLE_DOC)
diff --git a/wrappers/cpp/LinphoneCxxConfig.cmake.in b/wrappers/cpp/LinphoneCxxConfig.cmake.in
index dd4cc3d5ce00e6f66d28f08311995b92f9e57e0f..15204140c1336424c982bb26165707cbf25e05ee 100644
--- a/wrappers/cpp/LinphoneCxxConfig.cmake.in
+++ b/wrappers/cpp/LinphoneCxxConfig.cmake.in
@@ -34,9 +34,9 @@ include("${CMAKE_CURRENT_LIST_DIR}/LinphoneCxxTargets.cmake")
set(LINPHONECXX_LDFLAGS "")
set(LINPHONECXX_CPPFLAGS "")
-set(LINPHONECXX_LIBRARIES linphone++)
+set(LINPHONECXX_LIBRARIES liblinphone++)
-#get_target_property(LINPHONECXX_INCLUDE_DIRS linphone++ INTERFACE_INCLUDE_DIRECTORIES)
+#get_target_property(LINPHONECXX_INCLUDE_DIRS liblinphone++ INTERFACE_INCLUDE_DIRECTORIES)
#list(INSERT LINPHONECXX_INCLUDE_DIRS 0 "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
set(LINPHONECXX_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@")
list(REMOVE_DUPLICATES LINPHONECXX_INCLUDE_DIRS)
diff --git a/wrappers/csharp/CMakeLists.txt b/wrappers/csharp/CMakeLists.txt
index a58b360326619715337a5c859b6a9f7bb5cccd6f..af4a3b96715dfec940f5e26946e4a48e86eb089d 100644
--- a/wrappers/csharp/CMakeLists.txt
+++ b/wrappers/csharp/CMakeLists.txt
@@ -30,10 +30,10 @@ add_custom_command(OUTPUT LinphoneWrapper.cs
genwrapper.py
wrapper_impl.mustache
${PROJECT_BINARY_DIR}/coreapi/help/doc/doxygen/xml/index.xml
- linphone-doc
+ liblinphone-doc
)
-add_custom_target(linphonecs ALL DEPENDS LinphoneWrapper.cs)
+add_custom_target(liblinphone-csharp ALL DEPENDS LinphoneWrapper.cs)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/LinphoneWrapper.cs"
DESTINATION "${CMAKE_INSTALL_DATADIR}/linphonecs/"
@@ -75,9 +75,9 @@ if(ENABLE_DOC OR ENABLE_CSHARP_WRAPPER)
)
add_custom_target(
- linphonecs-doc-site
+ liblinphone-csharp-doc-site
ALL
- DEPENDS linphonecs "docfx_project/_site/index.html"
+ DEPENDS liblinphone-csharp "docfx_project/_site/index.html"
)
install(
diff --git a/wrappers/java/CMakeLists.txt b/wrappers/java/CMakeLists.txt
index 9791064a7b4b72995afdc743b21d6eca5fc17150..d7a70551b75c9c6fb42b999622b5af7e3110ec63 100644
--- a/wrappers/java/CMakeLists.txt
+++ b/wrappers/java/CMakeLists.txt
@@ -41,7 +41,7 @@ add_custom_command(OUTPUT "${jni_sources}"
jni.mustache
overview.mustache
proguard.mustache
- linphone-doc
+ liblinphone-doc
COMMENT "Generating java wrapper"
)
diff --git a/wrappers/swift/CMakeLists.txt b/wrappers/swift/CMakeLists.txt
index 7b69a908b24c0a3905e6efb638daef3b1b962d32..efeacf1fecea5f2fc79314e2564e6ca1385c01d0 100644
--- a/wrappers/swift/CMakeLists.txt
+++ b/wrappers/swift/CMakeLists.txt
@@ -43,7 +43,7 @@ add_custom_command(OUTPUT LinphoneWrapper.swift
${PROJECT_BINARY_DIR}/coreapi/help/doc/doxygen/xml/index.xml
genwrapper.py
wrapper_impl.mustache
- linphone-doc
+ liblinphone-doc
)
# When ENABLE_SWIFT_WRAPPER=YES and ENABLE_SWIFT_WRAPPER_COMPILATION=NO, we use the swift file directly, which is recommended.