OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-11-02 20:30:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove obsolete code related to Qt5

Browse Source 
* Remove bundling of openssl1.1
* Remove obsolete compile flags
* Remove use of obsolete RimCommandObject
* Use QColor::isValidColorName
QColor::isValidColor is deprecated in Qt 6.6, QColor::isValidColorName was introduced in 6.4

* Make sure debug DLLs are copied when required
* Remove Qt5 from AppFwk
* Remove obsolete copy of Qt  DLLs
This commit is contained in:
Magne Sjaastad authored and GitHub committed 2024-10-07 10:16:48 +02:00
1 parent c75990551a
commit ca4a7b9000
40 files changed
+198 -1194
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

CMakeLists.txt
+1 -33
View File
@@ -10,11 +10,9 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
set(VIZ_MODULES_FOLDER_NAME Fwk/VizFwk)
# !!! For now, we force Qt to version 5
message(STATUS "Set CEE_USE_QT6 to ON")
set(CEE_USE_QT5 OFF)
message(STATUS "Forcing setting of CEE_USE_QT6 to ON")
set(CEE_USE_QT6 ON)
message(STATUS "CEE_USE_QT6=${CEE_USE_QT6}")
cmake_policy(SET CMP0020 NEW)
if(POLICY CMP0077)
@@ -1079,36 +1077,6 @@ install(TARGETS extract-projectfile-versions
DESTINATION ${RESINSIGHT_INSTALL_FOLDER}
)
# ##############################################################################
# Add OpenSSL 1.1.1 libraries The OpenSSL libraries are needed for the
# NetworkAuth module in Qt 5 Installed by adding openssl-windows in vcpkg.json
# Required to use fully specified path to the dlls, as it is not trivial to find
# the path. OpenSSL 3 is installed and used by other modules
# ##############################################################################
if(MSVC)
FetchContent_Declare(
openssl_1_1_1
URL https://github.com/CeetronSolutions/resinsight-dependencies/releases/download/2024.05/openssl_1_1_1.zip
)
FetchContent_Populate(openssl_1_1_1)
set(FILE_PATH_LIBCRYPTO_1_1
"${openssl_1_1_1_SOURCE_DIR}/libcrypto-1_1-x64.dll"
)
set(FILE_PATH_LIBOPENSSL_1_1 "${openssl_1_1_1_SOURCE_DIR}/libssl-1_1-x64.dll")
message(STATUS "FILE_PATH_LIBCRYPTO_1_1: ${FILE_PATH_LIBCRYPTO_1_1}")
message(STATUS "FILE_PATH_LIBOPENSSL_1_1: ${FILE_PATH_LIBOPENSSL_1_1}")
install(
FILES ${FILE_PATH_LIBCRYPTO_1_1} ${FILE_PATH_LIBOPENSSL_1_1}
DESTINATION ${RESINSIGHT_INSTALL_FOLDER}
OPTIONAL
)
endif() # MSVC
# ##############################################################################
# Visual Studio : Create the ruleset file to be used by Static Code Analysis
# https://stackoverflow.com/questions/75031903/how-to-enable-static-analysis-with-custom-ruleset-in-msvc-via-cmakelists-txt