Commit Graph

41 Commits

Author SHA1 Message Date
Sigurd Pettersen
ce9a65ee41
VizFwk housekeeping (#11026)
Housekeeping in VizFwk in preparation for introducing support for QOpenGLWidget and Qt6

* Adjusted unit tests to changes in source code
* Use Qt5 as default and removed copying of Qt DLLs
* Removed support for Qt4
* Removed the CVF_OPENGL_ES define. If we ever want to re-introduce support fro OpenGLES/Angle it should be handled differently.
*Added include of <locale.h>
* Added target for running Glsl2Include in order to build cvfShaderSourceStrings.h
* Removed all usage of CVF_USING_CMAKE
* Removed visual studio project files
2024-01-09 14:38:57 +01:00
Magne Sjaastad
edf44cb4c0 Prepare CMake to support both Qt5 andf Qt6
CEE_USE_QT6 controls if Qt6 is used.
Improved install and package for Qt6, target version Qt 6.5.3
Added Qt6 to github action for AppFwkUnitTest
2024-01-09 11:02:41 +01:00
Magne Sjaastad
50234f0ea8 Add missing includes 2024-01-07 18:28:36 +01:00
Eirik Marthinsen
9701866736 CMake: Update/Remove old minimum version check
- Update the minimum required CMake version to 3.15 for Fwk folders
  that might be used as top level projects.
- Remove the minimum required CMake version from projects that is just
  included from other top level projects.

Since version 3.19 CMake has been warning that CMake versions below 3.5
is deprecated and support will be removed in the future. This will
silence those warning.

By removing the minimum required version check from projects that is not
intended as top level projects we avoid redundant checks and simplifies
future maintenance.

Closes #10957
2023-12-16 17:35:54 +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
Magne Sjaastad
f0ce04597d
Merge pull request #8985 from OPM/8926-remove-useoptionsonly
AppFwk : Remove obsolete useOptionsOnly
2022-05-29 13:01:27 +02:00
Magne Sjaastad
638f926429
cmake-format: Allow dangling parenthesis 2021-09-01 08:13:16 +02:00
github-actions[bot]
223fe756fe
Fixes by cmake-format (#6874) 2020-10-30 12:31:16 +01:00
Gaute Lindkvist
069b427d10 Require CMake 3.12 2020-10-20 11:05:10 +02:00
Gaute Lindkvist
f7aed637f8 Require CMake 3.6 2020-10-20 11:05:10 +02:00
Gaute Lindkvist
2e1bf89bff #6417 Fix update of cvf::Vec3d from Python 2020-09-08 13:44:55 +02:00
Gaute Lindkvist
f82b2f73ec #6320 Refactor of PdmScripting
* Make base class abstract
* Implement support for IOHandling for PdmChild and PdmChildArray fields
2020-08-25 08:33:47 +02:00
Magne Sjaastad
bdc536dfc4 #6106 Apply clang-format on AppFwk 2020-06-19 08:00:01 +02:00
Kristian Bendiksen
2eb18d8151 #6029 Upgrade gtest to v1.10 for Fwk/. 2020-06-03 22:06:30 +02:00
Magne Sjaastad
4b372b438e System : Remove support for Qt4 2020-04-24 11:40:22 +02:00
Gaute Lindkvist
ba0ded23c3 #5671 Move caf::PdmFieldScriptability<cvf::Color3f> into cafPdmCvf 2020-03-13 17:12:05 +01:00
Magne Sjaastad
4e3a894464 #5370 Unity Build : Add config for AppFwk 2020-01-23 13:37:29 +01:00
Jacob Støren
72d4c0b51a AppFwk: Added pdm field of cvf::Mat3d 2019-06-25 16:42:38 +02:00
Gaute Lindkvist
5365f4dd7d Caf build fixes for CEE_USE_QT5 2019-05-31 11:00:32 +02:00
Gaute Lindkvist
10afe4987b #4448 Clean up CAF Qt5-enabling/detection 2019-05-28 15:58:49 +02:00
Gaute Lindkvist
8f3eb6a748 Add Qt5 test to AppFwk main CMakeLists.txt and update CAF to use CEE_USE_QT5 2019-05-28 15:58:48 +02:00
Gaute Lindkvist
d9672ad9a1 Simplify pick event system 2019-02-11 15:48:02 +01:00
Magne Sjaastad
9a88c33de0 #4061 VizFwk : Use variable CAF_USE_QT5 2019-02-08 11:28:14 +01:00
Gaute Lindkvist
4e17b5acfa #4047 Alter mouse cursor in Vec3dPickEventHandler 2019-02-07 16:34:43 +01:00
Gaute Lindkvist
4ec8869743 Rename in caf::PdmUiVec3dEditor 2019-02-06 09:39:47 +01:00
Gaute Lindkvist
058b9cfb7a #4014 Implement caf::PdmUiVec3dEditor and a RicVec3dPickEventHandler 2019-02-06 08:21:14 +01:00
Gaute Lindkvist
17e12a92a0 Update CMake to only look for Qt5 if RESINSIGHT_BUILD_WITH_QT5 is set 2018-12-10 15:10:46 +01:00
Gaute Lindkvist
ddb546d877 #3754 Upgrade CAF CMake-system to support both Qt4 and Qt5 2018-11-30 09:47:53 +01:00
Magne Sjaastad
ca0087eb55 #2536 Build System VizFwk : Use target_* and remove includes 2018-02-28 07:42:19 +01:00
Magne Sjaastad
3fbce58fa5 #2536 Build System AppFwk : Several updates
Simplified automoc
Use target_include_directories and target_link_libraries
Use CMake 2.8.12
2018-02-27 18:37:11 +01:00
Jacob Støren
214f013499 Caf: Fixed issues regarding custom type in fields with multi selection 2016-06-16 16:55:02 +02:00
Jacob Støren
e1fa9aa9f3 Caf: Corrected the spesialization of field of vector and list equality compare, which is supposed to be pr. element 2016-06-16 16:55:02 +02:00
Magne Sjaastad
ef64dc9b62 cotire : Boolean variables are now unique globally in the project 2016-06-10 14:01:41 +02:00
Magne Sjaastad
bf5de93113 [Fwk] Improved static initializer naming 2015-11-27 10:38:23 +01:00
Magne Sjaastad
563aa95abf [Fwk] Static initializer must be placed at file global scope in order to always call the constructor in the cpp file 2015-11-27 10:38:22 +01:00
Magne Sjaastad
5093b559d2 [Fwk] Set default editor for std::vector of Vec3d 2015-11-26 14:22:52 +01:00
Magne Sjaastad
3e9e5779ab [Fwk] Updated headers and added unit tests, fixed minor issues related to text stream operator overload 2015-11-26 14:22:51 +01:00
Jacob Storen
47819812bf Fix of Linux compile errors and warnings 2015-08-13 06:23:51 -07:00
Magne Sjaastad
fd5bd534f6 Added dummy static class to fix issue with single macro in cpp
The implementation of this dummy class is put in the file with the
single macro defining the UI editor. This will cause the cpp file to
always be compiled.
2015-08-12 21:51:02 +02:00
Magne Sjaastad
58149cbdb9 Copied in RPM/Fwk/AppFwk
Commented out use of stipple line, as VizFwk is not update yet
2015-07-29 14:19:43 +02:00
sigurdp
f64d9b7e64 Moved CAF to Fwk/AppFwk and moved/renamed VisualizationModules to Fwk/VizFwk 2013-09-20 16:01:20 +02:00