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
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
Magne Sjaastad
1929798532
Moved include_directory from main to ApplicationCode. Include of Eclipse hearder files must now be prefixed with ert/<module_name>
2016-05-26 14:55:59 +02:00
Magne Sjaastad
a4fd584fb1
Added compiler directive for C++11
2016-05-24 10:28:04 +02:00
Magne Sjaastad
1d9405b266
ERT: Disable compile of CXX wrappers
...
CXX wrappers are using newer C++ syntax, disable this feature until
relevant compilers are verified
2016-04-19 15:09:13 +02:00
Magne Sjaastad
c72e047b23
( #687 ) Moved FileInterface tests into ApplicationCode/UnitTests
2015-12-03 11:11:07 +01:00
Magne Sjaastad
563dd8c04f
( #687 ) Moved tests from ModelVisualization into ApplicationCode/UnitTests
2015-12-03 10:53:12 +01:00
Magne Sjaastad
df604f7e12
Commented out test project
2015-11-26 14:22:53 +01:00
Magne Sjaastad
941d117fbf
[Fwk] Updated Cvf test application
2015-11-26 14:22:49 +01:00
Magne Sjaastad
11c76b9fcc
( #613 ) Disable compile of python wrappers
2015-10-30 10:03:09 +01:00
Pål Hagen
095d974e38
( #435 ) WIP - Reading metadata from LAS files
2015-09-14 16:33:28 +02:00
Pål Hagen
68662d2968
( #434 ) Building and linking NRLib with ResInsight
2015-09-11 17:03:11 +02:00
Pål Hagen
2b87c8c7d6
Added Qwt library and basic classes for well log viewer
2015-08-26 12:27:29 +02:00
Magne Sjaastad
57b005cdf2
Build system changes to be able to build using modularization fwk
2015-07-29 14:20:15 +02:00
Jacob Støren
ff79f1a8ba
Added calculation of S1, S2 and S3 of Geomechanical stress tensor
...
See #320
2015-06-17 13:07:48 +02:00
Stein Dale
ed3d8b422a
Removed ecl_lfs from target
2015-05-13 10:53:19 +02:00
Jacob Støren
4a21bb4a30
Added RimView, and sorted the libs in folders
2015-04-29 10:50:25 +02:00
Fredrik Gundersen
eea5ac6d1d
Enable usage of external ERT source
...
This change in cmakelist enables the usage of an external ERT source. You can now point to a later version of ERT and use this in sted of the one bundled in the ResInsight source.
2015-01-09 08:52:42 +01:00
Andreas Lauser
d8cefc1023
fix build
...
on my machine (openSUSE 13.1), it broke because the
CheckCSourceCompiles CMake module was not included...
2014-08-14 10:56:45 +02:00
