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

#1641 Update ResInsight CMake configuration for latest libecl

Browse Source
This commit is contained in:
Bjørnar Grip Fjær
2017-06-22 11:52:11 +02:00
parent 956798afd6
commit 9b5d8a7f21
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
CMakeLists.txt
View File

@@ -118,33 +118,25 @@ else()
set(ERT_INCLUDE_ROOT "${RESINSIGHT_ERT_EXTERNAL_SOURCE_ROOT}") set(ERT_INCLUDE_ROOT "${RESINSIGHT_ERT_EXTERNAL_SOURCE_ROOT}")
add_subdirectory(${ERT_SOURCE_PATH} ${CMAKE_BINARY_DIR}/ThirdParty/Ert) add_subdirectory(${ERT_SOURCE_PATH} ${CMAKE_BINARY_DIR}/ThirdParty/Ert)
else() else()
set(ERT_INCLUDE_ROOT ${CMAKE_SOURCE_DIR}/ThirdParty/Ert) set(ERT_INCLUDE_ROOT ${CMAKE_SOURCE_DIR}/ThirdParty/Ert/lib/include/ert)
add_subdirectory(ThirdParty/Ert) add_subdirectory(ThirdParty/Ert)
endif () endif ()
list(APPEND ERT_INCLUDE_DIRS list(APPEND ERT_INCLUDE_DIRS
${ERT_INCLUDE_ROOT}/libecl/include/ ${ERT_INCLUDE_ROOT}/ecl/
${ERT_INCLUDE_ROOT}/libert_util/include/ ${ERT_INCLUDE_ROOT}/util/
${ERT_INCLUDE_ROOT}/libgeometry/include/ ${ERT_INCLUDE_ROOT}/geometry/
${ERT_INCLUDE_ROOT}/libecl_well/include/ ${ERT_INCLUDE_ROOT}/ecl_well/
${ERT_INCLUDE_ROOT}/libeclxx/include
${ERT_INCLUDE_ROOT}/libert_utilxx/include
${CMAKE_BINARY_DIR}/ThirdParty/Ert/libert_util/include
) )
list(APPEND ERT_LIBRARIES list(APPEND ERT_LIBRARIES
ecl ecl
eclxx
ecl_well
ert_geometry
ert_util
) )
if (MSVC) if (MSVC)
set_property(TARGET set_property(TARGET
${ERT_LIBRARIES} ${ERT_LIBRARIES}
ecl_lfs # ecl_lfs
PROPERTY FOLDER "Thirdparty/ERT" PROPERTY FOLDER "Thirdparty/ERT"
) )
endif() endif()