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

#2536 Build System : Remove obsolete includes and update depending includes

Browse Source
This commit is contained in:
Magne Sjaastad 2018-02-27 20:00:56 +01:00
parent 3b63c8d433
commit 233df05f68
11 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ApplicationCode/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8) cmake_minimum_required (VERSION 2.8.12)
project (ApplicationCode) project (ApplicationCode)
@ -15,29 +15,10 @@ if (MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11))
endif() endif()
include_directories( include_directories(
${cafPdmCore_SOURCE_DIR}
${cafPdmUiCore_SOURCE_DIR}
${cafPdmXml_SOURCE_DIR}
${cafProjectDataModel_SOURCE_DIR}
${cafCommand_SOURCE_DIR}
${cafViewer_SOURCE_DIR}
${cafAnimControl_SOURCE_DIR}
${cafUserInterface_SOURCE_DIR}
${cafPdmCvf_SOURCE_DIR}
${CommonCode_SOURCE_DIR}
${cafVizExtensions_SOURCE_DIR}
${cafTensor_SOURCE_DIR}
${ResInsight_SOURCE_DIR}/ThirdParty
${ResInsight_SOURCE_DIR}/ThirdParty/NRLib/nrlib/well
${ResInsight_SOURCE_DIR}/ThirdParty/Qwt/src
${boost-Subset_SOURCE_DIR}
${custom-opm-flowdiagnostics_SOURCE_DIR}/opm-flowdiagnostics/
${custom-opm-flowdiag-app_SOURCE_DIR}/opm-flowdiagnostics-applications/
${custom-opm-flowdiag-app_SOURCE_DIR}/opmCore
# required for compilation of gtest, should be refactored
${ResInsight_SOURCE_DIR}/ThirdParty
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/Adm ${CMAKE_CURRENT_SOURCE_DIR}/Adm
${CMAKE_CURRENT_SOURCE_DIR}/Application ${CMAKE_CURRENT_SOURCE_DIR}/Application

12
ApplicationCode/GeoMech/GeoMechDataModel/CMakeLists.txt
View File

@ -40,6 +40,16 @@ target_include_directories(${PROJECT_NAME}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )
target_link_libraries( ${PROJECT_NAME} LibCore cafTensor ResultStatisticsCache RifOdbReader) target_link_libraries( ${PROJECT_NAME}
LibCore
cafPdmCvf
cafTensor
cafUserInterface
CommonCode
ResultStatisticsCache
RifOdbReader
)
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})

1
ApplicationCode/GeoMech/OdbReader/CMakeLists.txt
View File

@ -36,7 +36,6 @@ endif(MSVC)
include_directories( include_directories(
${RESINSIGHT_ODB_API_DIR}/include ${RESINSIGHT_ODB_API_DIR}/include
${RigGeoMechDataModel_SOURCE_DIR}
${LibCore_SOURCE_DIR} ${LibCore_SOURCE_DIR}
) )

2
ApplicationCode/UserInterface/RiuNightchartsWidget.h
View File

@ -19,7 +19,7 @@
#pragma once #pragma once
#include "nightcharts/nightcharts.h" #include "nightcharts.h"
#include "cafPdmPointer.h" #include "cafPdmPointer.h"

2
ApplicationCode/WellPathImportSsihub/CMakeLists.txt
View File

@ -43,7 +43,7 @@ add_library( ${PROJECT_NAME}
) )
target_link_libraries ( ${PROJECT_NAME} target_link_libraries ( ${PROJECT_NAME}
cafUserInterface cafUserInterface cafPdmCvf CommonCode
) )
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})

2
CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8) cmake_minimum_required (VERSION 2.8.12)
include (CheckCSourceCompiles) include (CheckCSourceCompiles)
project (ResInsight) project (ResInsight)

3
Fwk/AppFwk/cafViewer/CMakeLists.txt
View File

@ -54,6 +54,9 @@ target_link_libraries ( ${PROJECT_NAME}
LibViewing LibViewing
LibRender LibRender
LibGuiQt LibGuiQt
cafAnimControl
${QT_LIBRARIES} ${QT_LIBRARIES}
) )

1
Fwk/AppFwk/cafVizExtensions/CMakeLists.txt
View File

@ -11,7 +11,6 @@ include_directories(
${LibGuiQt_SOURCE_DIR} ${LibGuiQt_SOURCE_DIR}
${LibRender_SOURCE_DIR} ${LibRender_SOURCE_DIR}
${LibViewing_SOURCE_DIR} ${LibViewing_SOURCE_DIR}
${CommonCode_SOURCE_DIR}
) )
add_library( ${PROJECT_NAME} add_library( ${PROJECT_NAME}

2
ThirdParty/NRLib/well_UnitTests/CMakeLists.txt vendored
View File

@ -4,8 +4,6 @@ project ( well_UnitTests )
include_directories ( include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/..
${CMAKE_CURRENT_SOURCE_DIR}/../.. ${CMAKE_CURRENT_SOURCE_DIR}/../..
) )

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

@ -33,3 +33,8 @@ target_link_libraries(custom-opm-flowdiag-app
if (MSVC) if (MSVC)
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/wd4190 /wd4267") set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/wd4190 /wd4267")
endif() endif()
target_include_directories(${PROJECT_NAME}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/opm-flowdiagnostics-applications
)

5
ThirdParty/custom-opm-flowdiagnostics/CMakeLists.txt vendored
View File

@ -24,3 +24,8 @@ add_library(${PROJECT_NAME}
if (MSVC) if (MSVC)
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/wd4267") set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/wd4267")
endif() endif()
target_include_directories(${PROJECT_NAME}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/opm-flowdiagnostics
)