mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-05-07 14:44:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Deploy OpenLDAP dependencies

Browse source
This commit is contained in:
Julien Wadel 2021-04-30 15:27:41 +00:00
parent f51a7b7493
commit 7415ac3420
4 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -110,6 +110,8 @@ option(ENABLE_DAEMON "Enable the linphone daemon interface." NO)
option(ENABLE_CONSOLE_UI "Turn on or off compilation of console interface." NO)
if(WIN32 OR APPLE)
else()
option(ENABLE_V4L "Ability to capture and display video using libv4l2 or libv4l." YES)
@ -132,6 +134,7 @@ list(APPEND APP_OPTIONS "-DENABLE_BUILD_EXAMPLES=${ENABLE_BUILD_EXAMPLES}")
list(APPEND APP_OPTIONS "-DENABLE_DAEMON=${ENABLE_DAEMON}")
list(APPEND APP_OPTIONS "-DENABLE_CONSOLE_UI=${ENABLE_CONSOLE_UI}")
list(APPEND APP_OPTIONS "-DENABLE_VIDEO=${ENABLE_VIDEO}")
if(ENABLE_V4L)
list(APPEND APP_OPTIONS "-DENABLE_V4L=${ENABLE_V4L}")

5
linphone-app/CMakeLists.txt
View file

@ -510,8 +510,9 @@ target_link_libraries(${TARGET_NAME} ${LIBRARIES})
target_link_libraries(${TARGET_NAME} ${APP_PLUGIN})
if(WIN32)
find_library(LDAP_LIBRARIES NAMES ldap HINTS "${LINPHONE_OUTPUT_DIR}/lib")
target_link_libraries(${TARGET_NAME} wsock32 ws2_32 ${LDAP_LIBRARIES})
find_library(LDAP_LIBRARIES NAMES ldap libldap HINTS "${LINPHONE_OUTPUT_DIR}/lib")
find_library(LBER_LIBRARIES NAMES lber liblber HINTS "${LINPHONE_OUTPUT_DIR}/lib")
target_link_libraries(${TARGET_NAME} wsock32 ws2_32 ${LDAP_LIBRARIES} ${LBER_LIBRARIES})
endif()
add_dependencies(${APP_LIBRARY} update_translations ${TARGET_NAME}-git-version ${APP_PLUGIN})

6
linphone-app/cmake_builder/linphone_package/CMakeLists.txt
View file

@ -149,6 +149,12 @@ if (WIN32)
)
install(CODE "execute_process(COMMAND ${DEPLOYQT_PROGRAM} \"\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/${EXECUTABLE_NAME}.exe\" -qmldir=${LINPHONE_QML_DIR} --compiler-runtime)")# -verbose=2)" COMPONENT binary_application)
#On Windows, OpenLDAP couldn't be build with static libraries. Add them in installation for deployment.
find_file (LDAP_SSL_DLL NAMES "libssl.dll" "libssl-1_1.dll")
find_file (LDAP_CRYPTO_DLL NAMES "libcrypto.dll" "libcrypto-1_1.dll")
find_file (LDAP_GCC_DLL NAMES "libgcc.dll" "libgcc_s_dw2-1.dll")
find_file (LDAP_WINTHREAD_DLL NAMES "libwinpthread.dll" "libwinpthread-1.dll")
install(FILES ${LDAP_SSL_DLL} ${LDAP_CRYPTO_DLL} ${LDAP_GCC_DLL} ${LDAP_WINTHREAD_DLL} DESTINATION "${CMAKE_INSTALL_BINDIR}/" PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
# list(REMOVE_ITEM SHARE_CONTENT "${CMAKE_INSTALL_DATAROOTDIR}/belr" "${CMAKE_INSTALL_DATAROOTDIR}/Belr" "${CMAKE_INSTALL_DATAROOTDIR}/images" "${CMAKE_INSTALL_DATAROOTDIR}/${APPLICATION_NAME}" "${CMAKE_INSTALL_DATAROOTDIR}/${APPLICATION_NAME}" "${CMAKE_INSTALL_DATAROOTDIR}/sounds")
# foreach (ITEM IN LISTS SHARE_CONTENT)

2
linphone-sdk

@ -1 +1 @@
Subproject commit a49af84ad02275ef41a3b17dcc40e3a9210deec9
Subproject commit eacd44cc787cdcd3f68e75da303fabc57ce4416e