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

Fix proper include paths for new libecl version.

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

9
CMakeLists.txt
View File

@@ -118,15 +118,13 @@ else()
set(ERT_INCLUDE_ROOT "${RESINSIGHT_ERT_EXTERNAL_SOURCE_ROOT}")
add_subdirectory(${ERT_SOURCE_PATH} ${CMAKE_BINARY_DIR}/ThirdParty/Ert)
else()
set(ERT_INCLUDE_ROOT ${CMAKE_SOURCE_DIR}/ThirdParty/Ert/lib/include/ert)
set(ERT_INCLUDE_ROOT ${CMAKE_SOURCE_DIR}/ThirdParty/Ert/lib/include)
add_subdirectory(ThirdParty/Ert)
endif ()
list(APPEND ERT_INCLUDE_DIRS
${ERT_INCLUDE_ROOT}/ecl/
${ERT_INCLUDE_ROOT}/util/
${ERT_INCLUDE_ROOT}/geometry/
${ERT_INCLUDE_ROOT}/ecl_well/
${CMAKE_BINARY_DIR}/ThirdParty/Ert/lib/include
${ERT_INCLUDE_ROOT}/
)
list(APPEND ERT_LIBRARIES
@@ -136,7 +134,6 @@ else()
if (MSVC)
set_property(TARGET
${ERT_LIBRARIES}
# ecl_lfs
PROPERTY FOLDER "Thirdparty/ERT"
)
endif()