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

#1686 Remove explicit include of Ert

Browse Source 
Ert includes are implicit defined by tartget_link_library
This commit is contained in:
Magne Sjaastad 2017-08-09 08:31:18 +02:00
parent acd7b4784d
commit d5d5cedbf5
3 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/CMakeLists.txt
View File

@ -27,7 +27,6 @@ include_directories(
${ResInsight_SOURCE_DIR}/ThirdParty ${ResInsight_SOURCE_DIR}/ThirdParty
${ResInsight_SOURCE_DIR}/ThirdParty/NRLib/nrlib/well ${ResInsight_SOURCE_DIR}/ThirdParty/NRLib/nrlib/well
${ResInsight_SOURCE_DIR}/ThirdParty/Qwt/src ${ResInsight_SOURCE_DIR}/ThirdParty/Qwt/src
${ERT_INCLUDE_DIRS}
${boost-Subset_SOURCE_DIR} ${boost-Subset_SOURCE_DIR}
${custom-opm-flowdiagnostics_SOURCE_DIR}/opm-flowdiagnostics/ ${custom-opm-flowdiagnostics_SOURCE_DIR}/opm-flowdiagnostics/

21
CMakeLists.txt
View File

@ -79,6 +79,8 @@ if (RESINSIGHT_ERT_EXTERNAL_LIB_ROOT OR 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")
endif() endif()
message(FATAL_ERROR "TODO: Building using and external system installed ERT is broken.")
list(APPEND ERT_INCLUDE_DIRS list(APPEND ERT_INCLUDE_DIRS
${RESINSIGHT_ERT_EXTERNAL_INCLUDE_ROOT} ${RESINSIGHT_ERT_EXTERNAL_INCLUDE_ROOT}
) )
@ -109,25 +111,18 @@ else()
endif() endif()
if (RESINSIGHT_ERT_EXTERNAL_SOURCE_ROOT) if (RESINSIGHT_ERT_EXTERNAL_SOURCE_ROOT)
set(ERT_INCLUDE_ROOT "${RESINSIGHT_ERT_EXTERNAL_SOURCE_ROOT}") add_subdirectory(${RESINSIGHT_ERT_EXTERNAL_SOURCE_ROOT} ${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/lib/include)
add_subdirectory(ThirdParty/Ert) add_subdirectory(ThirdParty/Ert)
endif () endif ()
list(APPEND ERT_INCLUDE_DIRS list(APPEND THIRD_PARTY_LIBRARIES
${CMAKE_BINARY_DIR}/ThirdParty/Ert/lib/include ecl
${ERT_INCLUDE_ROOT}/
)
list(APPEND ERT_LIBRARIES
ecl
) )
if (MSVC) if (MSVC)
set_property(TARGET set_property(TARGET
${ERT_LIBRARIES} ecl
PROPERTY FOLDER "Thirdparty/ERT" PROPERTY FOLDER "Thirdparty/ERT"
) )
endif() endif()
@ -137,10 +132,6 @@ else()
endif(RESINSIGHT_ERT_EXTERNAL_LIB_ROOT OR RESINSIGHT_ERT_EXTERNAL_INCLUDE_ROOT) endif(RESINSIGHT_ERT_EXTERNAL_LIB_ROOT OR RESINSIGHT_ERT_EXTERNAL_INCLUDE_ROOT)
list(APPEND THIRD_PARTY_LIBRARIES
${ERT_LIBRARIES}
)
################################################################################ ################################################################################
# Subset of Boost, used by NRLib and flow diagnostics application # Subset of Boost, used by NRLib and flow diagnostics application

2
ThirdParty/custom-opm-flowdiag-app/CMakeLists.txt vendored
View File

@ -6,7 +6,6 @@ include_directories(
../custom-opm-flowdiagnostics/opm-flowdiagnostics ../custom-opm-flowdiagnostics/opm-flowdiagnostics
opm-flowdiagnostics-applications opm-flowdiagnostics-applications
opmCore opmCore
${ERT_INCLUDE_DIRS}
${boost-Subset_SOURCE_DIR} ${boost-Subset_SOURCE_DIR}
) )
@ -27,3 +26,4 @@ add_library(custom-opm-flowdiag-app
${project_source_files_complete_path1} ${project_source_files_complete_path1}
) )
target_link_libraries(custom-opm-flowdiag-app ecl)