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

Rework on finding MinGW libraries

Browse source
This commit is contained in:
Julien Wadel 2021-04-30 19:34:23 +00:00
parent 7415ac3420
commit fc5bc239ce
2 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitlab-ci-files/job-windows-desktop.yml
View file

@ -6,6 +6,7 @@
.build_all_windows_script: &build_all_windows_script |
SET PATH_TEMP=%PATH:C:\MinGW\bin;=%
SET PATH_TEMP=%PATH_TEMP:C:\Strawberry\c\bin;=%
SET PATH_TEMP=%PATH_TEMP:C:\Strawberry\perl\bin;=%
SET PATH_TEMP=%PATH_TEMP:C:\Program Files\NASM=%
SET Qt5_DIR=C:\Qt\5.14.2\msvc2017\lib\cmake
SET PATH=%PATH_TEMP%;C:\Qt\5.14.2\msvc2017\bin;C:\msys64;C:\msys64\usr\bin;C:\msys64\%MINGW_TYPE%\bin;

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

@ -150,10 +150,29 @@ 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")
find_program(MSYS2_PROGRAM
NAMES msys2_shell.cmd
HINTS "C:/msys64/"
)
get_filename_component(MSYS2_PATH ${MSYS2_PROGRAM} PATH )
set(MSVC_ARCH ${CMAKE_CXX_COMPILER_ARCHITECTURE_ID})# ${MSVC_ARCH} MATCHES "X64"
string(TOUPPER ${MSVC_ARCH} MSVC_ARCH)
if(${MSVC_ARCH} MATCHES "X64")
set(MSYS2_MINGW "mingw64")
else()
set(MSYS2_MINGW "mingw32")
endif()
find_file (LDAP_SSL_DLL NAMES "libssl-1_1.dll" "libssl.dll" HINTS "${MSYS2_PATH}/${MSYS2_MINGW}/bin" NO_DEFAULT_PATH)
find_file (LDAP_CRYPTO_DLL NAMES "libcrypto-1_1.dll" "libcrypto.dll" HINTS "${MSYS2_PATH}/${MSYS2_MINGW}/bin" NO_DEFAULT_PATH)
find_file (LDAP_GCC_DLL NAMES "libgcc_s_dw2-1.dll" "libgcc.dll" HINTS "${MSYS2_PATH}/${MSYS2_MINGW}/bin" NO_DEFAULT_PATH)
find_file (LDAP_WINTHREAD_DLL NAMES "libwinpthread-1.dll" "libwinpthread.dll" HINTS "${MSYS2_PATH}/${MSYS2_MINGW}/bin" NO_DEFAULT_PATH)
#Try in default path if didn't find
find_file (LDAP_SSL_DLL NAMES "libssl-1_1.dll" "libssl.dll" HINTS "${MSYS2_PATH}/${MSYS2_MINGW}/bin")
find_file (LDAP_CRYPTO_DLL NAMES "libcrypto-1_1.dll" "libcrypto.dll" HINTS "${MSYS2_PATH}/${MSYS2_MINGW}/bin")
find_file (LDAP_GCC_DLL NAMES "libgcc_s_dw2-1.dll" "libgcc.dll" HINTS "${MSYS2_PATH}/${MSYS2_MINGW}/bin")
find_file (LDAP_WINTHREAD_DLL NAMES "libwinpthread-1.dll" "libwinpthread.dll" HINTS "${MSYS2_PATH}/${MSYS2_MINGW}/bin")
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")