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

Improved how external ERT is used

Browse Source
This commit is contained in:
Magne Sjaastad
2016-10-14 10:03:53 +02:00
parent 473626b9bb
commit 706241db5c
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/CMakeLists.txt
View File

@@ -354,7 +354,6 @@ set( LINK_LIBRARIES
${VIZ_FWK_LIBRARIES} ${VIZ_FWK_LIBRARIES}
${ERT_LIBRARIES} ${ERT_LIBRARIES}
${ERT_EXTERNAL_LIBRARIES}
NRLib NRLib

10
CMakeLists.txt
View File

@@ -120,14 +120,6 @@ if (NOT MSVC)
set(RESINSIGHT_ERT_EXTERNAL_INCLUDE_ROOT "" CACHE PATH "Path to installed ERT includes") set(RESINSIGHT_ERT_EXTERNAL_INCLUDE_ROOT "" CACHE PATH "Path to installed ERT includes")
endif() endif()
set (ERT_BINARY_LIB_NAMES
libecl.so
libeclxx.so
libecl_well.so
libert_geometry.so
libert_util.so
)
if (RESINSIGHT_ERT_EXTERNAL_LIB_ROOT OR RESINSIGHT_ERT_EXTERNAL_INCLUDE_ROOT) if (RESINSIGHT_ERT_EXTERNAL_LIB_ROOT OR RESINSIGHT_ERT_EXTERNAL_INCLUDE_ROOT)
if (NOT(RESINSIGHT_ERT_EXTERNAL_LIB_ROOT AND RESINSIGHT_ERT_EXTERNAL_INCLUDE_ROOT)) if (NOT(RESINSIGHT_ERT_EXTERNAL_LIB_ROOT AND RESINSIGHT_ERT_EXTERNAL_INCLUDE_ROOT))
message(FATAL_ERROR "Both RESINSIGHT_ERT_EXTERNAL_LIB_ROOT and RESINSIGHT_ERT_EXTERNAL_INCLUDE_ROOT must be defined") message(FATAL_ERROR "Both RESINSIGHT_ERT_EXTERNAL_LIB_ROOT and RESINSIGHT_ERT_EXTERNAL_INCLUDE_ROOT must be defined")
@@ -137,7 +129,7 @@ if (RESINSIGHT_ERT_EXTERNAL_LIB_ROOT OR RESINSIGHT_ERT_EXTERNAL_INCLUDE_ROOT)
${RESINSIGHT_ERT_EXTERNAL_INCLUDE_ROOT} ${RESINSIGHT_ERT_EXTERNAL_INCLUDE_ROOT}
) )
list(APPEND ERT_EXTERNAL_LIBRARIES list(APPEND ERT_LIBRARIES
${RESINSIGHT_ERT_EXTERNAL_LIB_ROOT}/libecl.so ${RESINSIGHT_ERT_EXTERNAL_LIB_ROOT}/libecl.so
${RESINSIGHT_ERT_EXTERNAL_LIB_ROOT}/libeclxx.so ${RESINSIGHT_ERT_EXTERNAL_LIB_ROOT}/libeclxx.so
${RESINSIGHT_ERT_EXTERNAL_LIB_ROOT}/libecl_well.so ${RESINSIGHT_ERT_EXTERNAL_LIB_ROOT}/libecl_well.so