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
6a5f924c0f
#1431 Update version of Ert so-files to be installed
2017-04-26 13:03:57 +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
3007a62238
System : Improved control of cotire
2017-03-29 08:13:45 +02: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
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
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
Magne Sjaastad
5420960b22
#826 Added opm-flowdiagnostics libary with a basic test
2016-09-05 15:23:24 +02:00
Magne Sjaastad
1101db5787
( #805 ) Added category legend and mapper
2016-08-05 17:23:50 +02:00
Magne Sjaastad
e57bbb2402
Modified compiler flags to make opm-parser unit test compile
2016-06-16 18:10:50 +02:00
Magne Sjaastad
718e724760
Include JSON files directly in opm-parser, opm-parser has now no dependencies
2016-06-13 10:39:57 +02:00
Jacob Støren
73e72623d2
Set to compile internal libraries statically by default
2016-06-12 15:47:41 +02:00
Jacob Støren
64aea7285d
Fixed BUILD_SHARED_LIBS related build sytem problems on linux. Now working with both on and off.
2016-06-12 02:03:48 +02:00
Magne Sjaastad
a7ed8f297f
cotire : Added unity build of cafUserInterface
2016-06-10 14:03:22 +02:00
Magne Sjaastad
954edd8ec1
Added missing library
2016-06-08 12:15:46 +02:00
Magne Sjaastad
4fd8e2503c
Added cotire to speed up build times
2016-06-06 09:56:45 +02:00
Jacob Støren
94bf950278
Boost is set to be staticly linked on MSVC and dynamic on linux
...
On MSVC force user to add the paths to the boost directories
2016-06-03 16:25:48 +02:00
Magne Sjaastad
c69ffc2a3d
#734 Must hardcode all ERT filenames because the search with GLOB returns empty list when compiled for the first time in a new folder
2016-06-02 13:55:27 +02:00
Magne Sjaastad
5c9e8a8075
#734 Always compile ERT as shared library on Linux
2016-06-02 12:50:42 +02:00
Magne Sjaastad
a08a4eb5ef
Added custom wrapper for json files to control install features of json
2016-06-02 11:31:41 +02:00
Magne Sjaastad
60b71cc078
Force build of ERT CXX wrappers in CMake
2016-06-02 09:36:11 +02:00
Magne Sjaastad
9b6e422d0c
#742 Integrated opm-parser and added basic unit test
2016-06-01 15:53:21 +02:00
Magne Sjaastad
2892653298
#742 Added custom-opm-parser, compiles on Windows
2016-06-01 15:53:21 +02:00
Magne Sjaastad
758b4a452b
#742 Added custom-opm-common to ThirdParty
2016-06-01 15:53:21 +02:00
Magne Sjaastad
54c98ca9f8
#742 NRLib now uses Boost from CMake
2016-06-01 15:53:21 +02:00
Magne Sjaastad
bffad18f9c
#742 Added dependency to Boost
2016-06-01 15:53:21 +02:00
Magne Sjaastad
e3fd05145f
#734 Fixed issue on Linux when compiling in-source ERT
2016-05-26 21:40:19 +02:00
Magne Sjaastad
31cb06089d
#734 Added support for linking with both custom and system installed external ERT library
2016-05-26 21:23:16 +02:00
