mirror of
https://github.com/OPM/ResInsight.git
synced 2026-09-03 20:53:13 -05:00
Fix proper include paths for new libecl version.
This commit is contained in:
+3
-6
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user