Commit Graph

45 Commits

Author SHA1 Message Date
Magne Sjaastad
212f5bf5ae
Add support for Qt6 and disable Qt5
Required changes to use Qt6 and disable support for Qt5. There are still some adjustments related to Qt6 to be done, but these changes are not required to make Qt6 compile on relevant systems.

* Build system changes Qt6
* Override enterEvent
* Update QKeySequence
* QtChart changes
* Use QScreen to instepct dotsPerInch
* Add app->quit()
* Required updates for code related to QString
* Use RiaQDateTimeTools
* Required changes related to regular expressions
* Support compile on Qt  < 6.5
When version < 6.5 is found, qt_generate_deploy_app_script() is disabled. Compilation of ResInsight will work, but the install target will be incomplete.
* Octave: add missing header.
* Qt Advanced Docking: force Qt6 where both Qt5 and Qt6 is available.

---------

Co-authored-by: magnesj <1793152+magnesj@users.noreply.github.com>
Co-authored-by: Kristian Bendiksen <kristian.bendiksen@gmail.com>
2024-09-30 11:21:17 +02:00
Magne Sjaastad
ffc1687cc7
Add Sumo connector and related cloud tools
* Add cloud data icon
* Add Sumo connector and related helper tools
* Reorganize preferences and remove ssihub
* Use timeout defined for Sumo
2024-07-05 09:31:16 +02:00
Magne Sjaastad
3f535e5b62 Add bundling of QtNetworkAuth 2024-06-01 14:40:20 +02:00
Magne Sjaastad
4617bcc673
11402 Save copy of project file to a backup database when saving project file 2024-05-01 09:46:22 +02:00
Kristian Bendiksen
55c0e81d9e OpenSSL: remove OpenSSL bundling.
The OpenSSL library from vcpkg is unlikely to be the one needed by Qt.
2024-04-26 11:59:47 +02:00
Magne Sjaastad
8fe385adcf
Create binary artifacts for Linux
* Bundle Qt binaries and create artifacts on Linux 
* Add qt.conf for Linux
* Remove install target for unit test
2024-02-13 09:06:38 +01:00
jonjenssen
5391179e16
Add separate target for unit tests for easier test access. Remove unit tests from ResInsight application. (#11184)
Clean up cmake configuration a bit, and pull down gtest when needed, no longer use a thirdparty subfolder
Add a ResInsight-tests target to run the unit tests
2024-02-11 20:04:04 +01:00
magnesj
c0921a1fce Fixes by cmake-format 2024-01-26 08:58:27 +01:00
Magne Sjaastad
de58f3dd54 Support RESINSIGHT_INSTALL_RPATH as CMake build parameter 2024-01-26 08:37:41 +01:00
magnesj
caa42a89d3 Fixes by cmake-format 2024-01-15 09:13:31 +01:00
Magne Sjaastad
6eb8f75f17 Bump version to dev.09 2024-01-15 08:55:41 +01:00
jonjenssen
50a766591b
Enable INP support without ODB libraries (#10990)
Enable INP support without ODB libraries
2024-01-03 11:55:35 +01:00
Magne Sjaastad
b3865d2d4a OpenVds: Update path to latest 3.2
Previous OpenVds version was removed from server, update to latest available 3.2 version
2023-12-11 10:30:21 +01:00
Magne Sjaastad
7fb8de2204 Use a separate target to copy files to build folder
Several operations was attached to the POST_BUILD custom command of the ResInsight target. The number of characters in this command exceeded the limit on Windows, and error message "line too long" was displayed on GitHub actions.

Suggested solution to copy files into build folder
- add new target ResInsightDummyTarget used to find full path to build folder
- add new target PreBuildFileCopy for file copy
- add all copy operations as a list of cmake commands on PreBuildFileCopy
2023-12-11 10:30:21 +01:00
Kristian Bendiksen
3f6883b875 Update openssl library numbers 2023-11-27 16:16:32 +01:00
Magne Sjaastad
f0b28170da
Copy openvds libraries to binary build folder 2023-04-27 08:44:51 +02:00
Magne Sjaastad
0907f57de9
Use target_include_directory
* Fwk: Avoid use of include_directories
* Remove target_include_directories from Commands
* Refactor cmake includes
- Avoid using include_directories, and use target_include_directories.
- Use add_subdirectory directly from main cmakefile, do not use in ApplicationLibCode.
2023-04-25 13:14:26 +02:00
jonjenssen
d8def3d986
OpenVDS should always be used (#10166)
* OpenVDS should always be used, remove optional defines
2023-04-24 18:23:31 +02:00
Magne Sjaastad
90ccf447fb
Download and use openvds package (#10153)
Download and use openvds package
2023-04-24 17:10:51 +02:00
jonjenssen
0e7cf49b17
OpenVDS seismic access (#10145)
Add OpenVDS support for reading seismic data from VDS files
2023-04-21 16:38:04 +02:00
jonjenssen
2e01f4a31d
Basic seismic support (#10010)
Add basic seismic section support to eclipse and geomech views.
2023-03-24 15:36:10 +01:00
github-actions[bot]
5b66dce009 Fixes by cmake-format (#9725)
Co-authored-by: magnesj <magnesj@users.noreply.github.com>
2023-01-25 06:39:03 +01:00
Magne Sjaastad
77bca7affa Make sure qoffscreen.dll is included in distribution
Headless plot export requires qoffscreen.dll, make sure this file is included in installer.
2023-01-25 06:39:03 +01:00
Magne Sjaastad
583c248cf9
Janitor issues
* Use horizontalAdvance
* Remove unused code
* Hide some warnings from Qt code
* Remove message for _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
* Use CMP0077 NEW
* Move roff libraries to folder Thirdparty
* avoid operator()==
* Remove cmake_minimum_required and set version to 3.15
2023-01-24 12:29:27 +01:00
Kristian Bendiksen
806c9af82b
9172 Remove dependency on QtScript
* #9172 Update json encoding/decoding to avoid QtScript
* Janitor: remove unused debug code
* Janitor: minor cleanup
* Remove dependencies to Qt Script

Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
2022-10-18 10:07:16 +02:00
jonjenssen
d5269abc6e
New dockingsystem (#9116)
* Use Qt Advanced Docking as forked submodule
* Use new docking system in code
2022-07-07 12:03:02 +02:00
Magne Sjaastad
2aec91e66d Janitor : Add offscreen dynamic library when bundling Qt 2022-03-23 12:42:40 +01:00
Magne Sjaastad
7238894bf6
Janitor: Set minimum Qt version to 5.12 2022-03-12 16:43:48 +01:00
Magne Sjaastad
728885a6c8 Janitor : Fix invalid rename introduce by horizontal/vertical depth log plots
Fix deprecated
2022-03-09 08:33:56 +01:00
Magne Sjaastad
0e57cfe201 Memory Management : Adjustment and fixes
Add release of several static singleton objects
Fix several minor memory leaks
2022-03-03 14:39:41 +01:00
Magne Sjaastad
638f926429
cmake-format: Allow dangling parenthesis 2021-09-01 08:13:16 +02:00
Magne Sjaastad
0377da8097
System : Optionally bundle OpenSSL on Linux (#7458) 2021-03-05 09:56:05 +01:00
magnesj
1a28e71b68 Fixes by cmake-format 2021-02-23 07:10:12 +01:00
Magne Sjaastad
9cb59f9ea4 #7411 Python : Copy Python module to build folder
Remove obsolete _unityTargetName used by cotire
2021-02-23 07:07:07 +01:00
magnesj
8c424ca09b Fixes by cmake-format 2021-01-22 12:21:49 +01:00
Gaute Lindkvist
a2ee4c8fef Add a new pass-through module for resinsight_classes.py to aid documentation 2021-01-21 20:10:14 +01:00
Gaute Lindkvist
861577922a Make CMake-setup for python sources work 2021-01-21 20:10:14 +01:00
Gaute Lindkvist
ee29349d5e Use libprotobufd.dll for debug windows builds 2021-01-14 10:47:15 +01:00
Magne Sjaastad
0246377adc Add missing bundling of libprotobuf 2021-01-13 08:02:12 +01:00
Kristian Bendiksen
39e678ae81 Remove target_link_directories calls.
The link directories are handled by target_link_libraries.
2021-01-12 11:05:53 +01:00
Kristian Bendiksen
3112f61890 Configure RESINSIGHT_USE_ODB_API in root CMakeLists.txt 2021-01-12 11:05:53 +01:00
Gaute Lindkvist
14f87533fa Fix Centos 7 linker error 2021-01-12 11:05:53 +01:00
Magne Sjaastad
140c292a93 Fix precompiled headers 2021-01-11 22:21:39 +01:00
Gaute Lindkvist
f6113ec38b Remove some status messages from CMakeLists.txt 2021-01-11 15:27:45 +01:00
Gaute Lindkvist
04d5daca67 Create a new ApplicationExe project for the executable 2021-01-11 15:27:45 +01:00