OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/dev'

Browse Source 
Conflicts:
	ApplicationCode/CMakeLists.txt
	ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
	ApplicationCode/ProjectDataModel/RimEclipseWell.h
	ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake
This commit is contained in:
Magne Sjaastad
2017-01-24 15:23:02 +01:00
parent df4b42e69e 5053112e3d
commit e845ae1ed8
70 changed files with 2948 additions and 871 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
CMakeLists.txt
View File

@@ -185,13 +185,14 @@ else()
ecl_well
ert_geometry
ert_util
ert_utilxx
)
if (MSVC)
set_property(TARGET
${ERT_LIBRARIES}
ecl_lfs
PROPERTY FOLDER "ERT"
PROPERTY FOLDER "Thirdparty/ERT"
)
endif()
@@ -210,12 +211,32 @@ add_subdirectory(ThirdParty/custom-opm-parser/custom-opm-parser-tests)
add_subdirectory(ThirdParty/custom-opm-flowdiagnostics)
add_subdirectory(ThirdParty/custom-opm-flowdiag-app)
list(APPEND OPM_LIBRARIES
custom-opm-parser
custom-opm-flowdiagnostics
custom-opm-flowdiag-app
)
set_property(TARGET
${OPM_LIBRARIES}
PROPERTY FOLDER "Thirdparty/OPM"
)
set_property(TARGET
opm-parser-tests
PROPERTY FOLDER "Thirdparty/OPM"
)
################################################################################
# NRLib
################################################################################
add_subdirectory(ThirdParty/NRLib)
list(APPEND THIRD_PARTY_LIBRARIES
NRLib
)
################################################################################
# clipper
@@ -248,6 +269,30 @@ find_package( OpenGL )
add_subdirectory(ThirdParty/Qwt/src)
list(APPEND THIRD_PARTY_LIBRARIES
Qwt
)
################################################################################
# Nightcharts
################################################################################
add_subdirectory(ThirdParty/nightcharts)
list(APPEND THIRD_PARTY_LIBRARIES
nightcharts
)
################################################################################
# Thirdparty libraries are put in ThirdParty solution folder
################################################################################
set_property(TARGET
${THIRD_PARTY_LIBRARIES}
PROPERTY FOLDER "Thirdparty"
)
################################################################################
# Vizualization Framework
################################################################################