Commit Graph

151 Commits

Author SHA1 Message Date
Gaute Lindkvist
6691dca4ca #4448 Clean up ResInsight Qt5-checks 2019-05-28 15:58:49 +02:00
Gaute Lindkvist
6ba9d42b45 #4448 Move Resinsight from -std=c++0x to -std=c++11 on GNU CXX 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
Magne Sjaastad
45c5a950a4 #4266 : libecl : Update version number in generated so 2019-05-10 09:10:28 +02:00
Magne Sjaastad
387d7cf7c2 System : Use appropriate mode when displaying a cmake message 2019-04-08 12:32:14 +02:00
Magne Sjaastad
dcac03dfd1 #4302 Install : Bundle HDF5 libraries 2019-04-08 12:26:52 +02:00
Magne Sjaastad
288ee59587 #4066 System : Improve cmake macros for cotire 2019-02-11 07:13:08 +01:00
Magne Sjaastad
9a88c33de0 #4061 VizFwk : Use variable CAF_USE_QT5 2019-02-08 11:28:14 +01:00
Magne Sjaastad
6f7730c1f5 #4061 VizFwk : Use variable CEE_USE_QT5 2019-02-08 11:02:26 +01:00
Magne Sjaastad
8bb13f4e15 #4020 System : Add ri_apply_cotire() and make available for targets 2019-02-01 06:55:44 +01:00
Magne Sjaastad
ca267a7f44 System : Add option RESINSIGHT_BUILD_WITH_QT5 2019-01-07 13:58:34 +01:00
Magne Sjaastad
53ef8dbed9 #3932 System : Add FindOctave 2019-01-07 12:44:36 +01:00
Magne Sjaastad
648250290e System : Add AppFwk unit tests using RESINSIGHT_INCLUDE_APPFWK_TESTS 2018-12-20 10:42:16 +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
6cee9eb9e6 #3752 Upgrade ResInsight CMake-system to support both Qt5 and Qt5 2018-11-30 09:47:53 +01:00
Magne Sjaastad
1a1661b12d System : Add compiler flag c++14 to avoid using too new language features 2018-11-02 11:36:46 +01:00
Jacob Støren
5bf5e6c99d #3382 Remove libslvs from the code base, including some cleanup. 2018-10-16 09:20:44 +02:00
Jacob Støren
c5b5980da3 #3049 Add SolveSpaceLib libslvs with an S-Curve test to ResInsight 2018-06-15 14:47:42 +02:00
Gaute Lindkvist
53cf8a80cd Stop building docs as part of "ALL". 2018-04-18 11:33:04 +02:00
Magne Sjaastad
25a1823f35 Merge branch 'dev' into cmake-improvements 2018-02-28 08:47:01 +01:00
Magne Sjaastad
ca0087eb55 #2536 Build System VizFwk : Use target_* and remove includes 2018-02-28 07:42:19 +01:00
Magne Sjaastad
233df05f68 #2536 Build System : Remove obsolete includes and update depending includes 2018-02-27 20:00:56 +01:00
Magne Sjaastad
f4bae6f796 #2529 Fracture : Remove RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES from CMake files 2018-02-26 21:11:14 +01:00
Magne Sjaastad
1df20d1b10 #2313 Improve cmake tooltip text and mark as advanced 2018-01-05 14:21:02 +01:00
Magne Sjaastad
0f30433286 #2313 Make sure ResInsight compiles if HDF5 is not available on Linux 2018-01-05 07:06:55 +01:00
Magne Sjaastad
706740ca5b #2313 Improve RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_SOURING
Set default ON
2018-01-04 13:53:50 +01:00
Magne Sjaastad
efd321f2c6 #2313 Improve RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES
Set default on and mark as advanced
2018-01-04 13:51:54 +01:00
Magne Sjaastad
c976091336 #1985 Expression Parser: Add exprtk to ThirdParty 2017-10-12 10:52:30 +02:00
Jacob Støren
8859726d61 Update so version number for installed libecl so to 2.3 2017-10-03 08:30:19 +02:00
Magne Sjaastad
7da886db11 #1794 System : Move packaging config to ResInsight project 2017-08-23 07:21:00 +02:00
Magne Sjaastad
a609556be9 #1810 HDF5 : Link with dynamic libraries on Windows 2017-08-22 22:30:31 +02:00
Magne Sjaastad
1ee068cd6a #1809 System : Add 'fractures' to package name 2017-08-22 14:42:22 +02:00
Magne Sjaastad
f483e1aa37 #1794 System : Always show HDF5 path on Windows 2017-08-22 14:08:17 +02:00
Magne Sjaastad
75f5c6ab3b #1794 Set RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES default off 2017-08-22 10:03:53 +02:00
Magne Sjaastad
be5106a146 #1794 Set RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES to ON for pre-proto branch 2017-08-22 09:35:54 +02:00
Magne Sjaastad
de6e6858fa #1794 Include Clipper library inside ifdef USE_PROTOTYPE_FEATURE_FRACTURES 2017-08-21 22:05:15 +02:00
Magne Sjaastad
553b3bf63e #1794 Add flag RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES 2017-08-21 15:24:20 +02:00
Magne Sjaastad
dde03dcc8c #1794 Rename flag to RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_SOURING 2017-08-21 11:49:49 +02:00
Magne Sjaastad
51c30448e9 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-08-21 10:42:11 +02:00
Magne Sjaastad
6188f507f2 MSVC : Disable warnings for libecl 2017-08-17 14:06:57 +02:00
Magne Sjaastad
4ebd51da56 System : Disable warning 4190 caused by libecl 2017-08-17 14:06:57 +02:00
Magne Sjaastad
6ddf8aae27 #1786 Use EXTERNAL_LINK_LIBRARIES for external binaries 2017-08-17 09:12:27 +02:00
Magne Sjaastad
534572345d #1786 Add build option RESINSIGHT_USE_HDF5, default off
Moved HDF config to top level cmake file
2017-08-17 08:39:02 +02:00
Magne Sjaastad
d5d5cedbf5 #1686 Remove explicit include of Ert
Ert includes are implicit defined by tartget_link_library
2017-08-09 08:31:18 +02:00
Magne Sjaastad
fb158b29bd #1747 Build System : Include hdf5 in package name 2017-08-08 13:07:49 +02:00
Magne Sjaastad
cc4789d79c #1686 Remove setting of BUILD_PYTHON and ERT_BUILD_CXX
These flags are set to correct values by default in libecl, it is not required to set these in ResInsight cmake
2017-08-08 11:45:16 +02:00
Magne Sjaastad
8c7bd87050 #1712 Build System : Add ERT lib to list of third party libs 2017-07-31 14:08:43 +02:00
Magne Sjaastad
59543d1708 #1712 Build System : Remove references to obsolete ERT libs 2017-07-31 14:07:59 +02:00
Bjørnar Grip Fjær
0e8d76d05c Fix proper include paths for new libecl version. 2017-06-22 13:46:46 +02:00
Bjørnar Grip Fjær
9b5d8a7f21 #1641 Update ResInsight CMake configuration for latest libecl 2017-06-22 11:52:11 +02:00