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
Magne Sjaastad
a45aee0cc2
Merge branch 'fishbones' into pre-proto
2017-05-23 10:28:42 +02:00
Jacob Støren
df269931c9
#1481 Add subset of Eigen, and method to condense transmisibilities
...
Not yet fully tested.
2017-05-12 14:41:38 +02:00
Magne Sjaastad
6a5f924c0f
#1431 Update version of Ert so-files to be installed
2017-04-26 13:03:57 +02:00
Magne Sjaastad
c35e79c3b5
Merge branch 'dev' into pre-proto
2017-04-20 13:40:56 +02:00
Magne Sjaastad
2b4efc4b5c
#1398 Removed dependency on system boost, added subset of boost to ThirdParty
...
Added a subset of boost to ThirdParty folder. Code extracted from version boost version 1.59.0
2017-04-05 08:38:59 +02:00
Magne Sjaastad
e1ca217422
#1371 Removed dependency on opm-parser
2017-04-04 13:53:44 +02:00
Magne Sjaastad
8255a3aaa3
Merge branch 'dev' into pre-proto
2017-04-03 07:34:56 +02:00
Magne Sjaastad
3007a62238
System : Improved control of cotire
2017-03-29 08:13:45 +02:00
Magne Sjaastad
aedf184d14
Merge remote-tracking branch 'refs/remotes/origin/dev'
...
Conflicts:
ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
2017-01-26 14:30:13 +01:00
Magne Sjaastad
329bed71a4
Removed linking of ert_utilxx included in d71476b1aa
...
This library contains shared pointer code, and is not needed to link with
2017-01-26 14:21:24 +01:00
Magne Sjaastad
405cd382af
Reorganized how clipper is included and deleted example files
2017-01-24 15:39:39 +01:00
Magne Sjaastad
e845ae1ed8
Merge remote-tracking branch 'refs/remotes/origin/dev'
...
Conflicts:
ApplicationCode/CMakeLists.txt
ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
ApplicationCode/ProjectDataModel/RimEclipseWell.h
ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake
2017-01-24 15:23:02 +01:00
Magne Sjaastad
09dacf1928
System : Set solution folder property at correct location
2017-01-23 12:59:24 +01:00
Magne Sjaastad
699c2a1103
#1116 Added nightcharts pie plotting library
2017-01-23 12:59:24 +01:00
Magne Sjaastad
d71476b1aa
System : Improved organization of ThirdParty libraries
2017-01-23 12:59:24 +01:00
astridkbjorke
2c90136a04
pre-proto - Adding clipper library version 6.4.0 to be used for polygon clipping
2017-01-16 09:40:26 +01:00
Magne Sjaastad
f7437438d1
Merged branch maintenance-enhancements into dev
2016-12-13 22:38:01 +01:00
Magne Sjaastad
eb43c82c55
System : Fixed issue when building without Octave
2016-12-13 22:04:02 +01:00
Jacob Støren
2692abe7fe
Renamed catalog to avoid build-server problems due to too long path
2016-12-09 16:25:43 +01:00
Jacob Støren
bc493298e2
Flow: Integrated from the FlowDiag branch Step 1.
2016-12-08 17:11:47 +01:00
Magne Sjaastad
97d053cc68
#1014 System : Install files directly in Install folder without extra ResInsight folder
2016-12-01 11:23:52 +01:00
Magne Sjaastad
18abc03825
#1014 System : Include odb and octave in package name
2016-12-01 08:26:58 +01:00
Magne Sjaastad
10ddf1eccc
#1014 System : Use RESINSIGHT_MAJOR_VERSION and RESINSIGHT_MINOR_VERSION
2016-11-30 17:36:22 +01:00
Magne Sjaastad
706241db5c
Improved how external ERT is used
2016-10-14 10:03:53 +02:00
Magne Sjaastad
473626b9bb
#804 Use CMAKE_INSTALL_LIBDIR for path to ERT libraries and updated file references to 2.1
2016-10-13 15:15:12 +02:00
Magne Sjaastad
5a0e8cdce6
#804 Ert removed devel from source code path
2016-10-13 13:40:44 +02:00
Arne Morten Kvarving
71a4e6bc7b
fixed: compilation issues with boost < 1.57
...
due to c++11 name mangling issues in boost::filesystem,
you cannot build a program with c++11 if boost was built for c++03.
workaround this by using boost's internal hack to do so,
disabling the exposure of c++11 scoped enums which is the cause
of the problems.
2016-10-10 11:22:43 +02:00