Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-13 11:29:51 +03:00
Code Issues Wiki Activity

Issue with SSL

Browse source
This commit is contained in:
Bertrand Songis 2023-10-02 12:22:28 +02:00
parent 56d43d6205
commit 6942f0abe0
No known key found for this signature in database
GPG key ID: F189F79290FEC50F
1 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
companion/src/CMakeLists.txt
View file

@ -421,29 +421,28 @@ elseif(WIN32)
# Qt dlls (using windeployqt) # Qt dlls (using windeployqt)
## Qt translations are already packaged into our custom qrc. Also don't need software rendering engines. ## Qt translations are already packaged into our custom qrc. Also don't need software rendering engines.
set(wdqtopts --no-translations --no-opengl-sw --no-system-d3d-compiler --no-angle) set(wdqtopts --no-translations --no-opengl-sw --no-system-d3d-compiler --no-angle)
# if(CMAKE_BUILD_TYPE STREQUAL "Release")
# set(wdqtopts ${wdqtopts} --release) # release builds aren't always properly detected with mingw
# endif()
if(MSVC) if(MSVC)
set(wdqtopts ${wdqtopts} --no-compiler-runtime) # --compiler-runtime includes vcredist_x86, but we just copy the required DLLs manually set(wdqtopts ${wdqtopts} --no-compiler-runtime) # --compiler-runtime includes vcredist_x86, but we just copy the required DLLs manually
endif() endif()
set(wdqtopts ${wdqtopts} -dir "\"${INSTALL_DESTINATION}\"" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}/${COMPANION_NAME}.exe" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}/${SIMULATOR_NAME}.exe") set(wdqtopts ${wdqtopts} -dir "\"${INSTALL_DESTINATION}\"" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}/${COMPANION_NAME}.exe" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}/${SIMULATOR_NAME}.exe")
list(JOIN wdqtopts " " wdqtopts) list(JOIN wdqtopts " " wdqtopts)
# Add installer command to execute windeployqt
# message(STATUS "windeployqt command: ${QT_BIN_DIR}/windeployqt.exe ${wdqtopts}") # message(STATUS "windeployqt command: ${QT_BIN_DIR}/windeployqt.exe ${wdqtopts}")
install(CODE "execute_process(COMMAND \"${QT_BIN_DIR}/windeployqt.exe\" ${wdqtopts})") install(CODE "execute_process(COMMAND \"${QT_BIN_DIR}/windeployqt.exe\" ${wdqtopts})")
# SDL dll # SDL dll
if(EXISTS "${SDL_LIBRARY_PATH}/SDL.dll") find_path(SDL_LIB_DIR SDL.dll HINTS
set(SDL_DIR ${SDL_LIBRARY_PATH}) # this is also used by NSIS installer script "${SDL_LIBRARY_PATH}"
install(FILES ${SDL_DIR}/SDL.dll DESTINATION ${INSTALL_DESTINATION}) "${WIN_EXTRA_LIBS_PATH}"
elseif(SDL_FOUND) "${MINGW_DIR}/../opt/bin"
message(WARNING "Installer: SDL.dll not found, set SDL_LIBRARY_PATH manually.") "${PYTHON_DIRECTORY}/lib/site-packages/PyQt4"
PATH_SUFFIXES bin
DOC "Path to SDL.dll"
if(SDL_LIB_DIR)
install(FILES ${SDL_LIB_DIR}/SDL.dll DESTINATION ${INSTALL_DESTINATION})
else()
message(WARNING "Installer: SDL.dll not found, set SDL_LIB_DIR manually.")
endif() endif()
message(STATUS ${MINGW_DIR})
# SSL dlls (used by QtNetwork) # SSL dlls (used by QtNetwork)
file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" WIN_PROGRAM_FILES) file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" WIN_PROGRAM_FILES)
find_path(SSL_LIB_DIR libssl-3.dll HINTS find_path(SSL_LIB_DIR libssl-3.dll HINTS