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

Build system changes to be able to build using modularization fwk

Browse Source
This commit is contained in:
Magne Sjaastad
2015-07-29 14:20:15 +02:00
parent 58149cbdb9
commit 57b005cdf2
2 changed files with 49 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
ApplicationCode/CMakeLists.txt
View File

@@ -10,6 +10,17 @@ CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/ApplicationCode/Adm/RiaVersionInfo.h.cmake
include_directories(
${cafPdmCore_SOURCE_DIR}
${cafPdmUiCore_SOURCE_DIR}
${cafPdmXml_SOURCE_DIR}
${cafProjectDataModel_SOURCE_DIR}
${cafCommand_SOURCE_DIR}
${cafViewer_SOURCE_DIR}
${cafUserInterface_SOURCE_DIR}
${cafPdmCvf_SOURCE_DIR}
${CommonCode_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/Adm
${CMAKE_CURRENT_SOURCE_DIR}/Application
@@ -290,13 +301,28 @@ endif ()
set( LINK_LIBRARIES
WellPathImportSsihub
cafPdmCvf
# cafPdmCvf
# cafUserInterface
# cafProjectDataModel
# cafViewer
# cafAnimControl
# cafTensor
# CommonCode
#cafPdmCore
#cafPdmUiCore
cafPdmXml
#cafProjectDataModel
cafUserInterface
cafProjectDataModel
cafViewer
cafAnimControl
cafCommand
cafPdmCvf
cafTensor
CommonCode
LibGuiQt
LibViewing
LibRender

38
CMakeLists.txt
View File

@@ -178,31 +178,35 @@ set_property(TARGET
# Application Framework
################################################################################
add_subdirectory(Fwk/AppFwk/cafProjectDataModel)
add_subdirectory(Fwk/AppFwk/CommonCode)
add_subdirectory(Fwk/AppFwk/cafAnimControl)
add_subdirectory(Fwk/AppFwk/cafViewer)
add_subdirectory(Fwk/AppFwk/cafProjectDataModel/cafPdmCore)
add_subdirectory(Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore)
add_subdirectory(Fwk/AppFwk/cafProjectDataModel/cafPdmXml)
add_subdirectory(Fwk/AppFwk/cafProjectDataModel)
add_subdirectory(Fwk/AppFwk/cafCommand)
add_subdirectory(Fwk/AppFwk/cafUserInterface)
add_subdirectory(Fwk/AppFwk/cafPdmCvf)
add_subdirectory(Fwk/AppFwk/CommonCode)
add_subdirectory(Fwk/AppFwk/cafTensor)
include_directories(
${cafUserInterface_SOURCE_DIR}
${cafProjectDataModel_SOURCE_DIR}
${cafPdmCvf_SOURCE_DIR}
${CommonCode_SOURCE_DIR}
${cafAnimControl_SOURCE_DIR}
${cafViewer_SOURCE_DIR}
${cafTensor_SOURCE_DIR}
)
set_property(TARGET
cafAnimControl
cafPdmCvf
cafAnimControl
cafViewer
cafPdmCore
cafPdmUiCore
cafPdmXml
cafProjectDataModel
cafCommand
cafUserInterface
cafViewer
cafTensor
cafPdmCvf
CommonCode
PROPERTY FOLDER "AppFwk"
)
@@ -237,12 +241,12 @@ add_subdirectory(OctavePlugin)
# Unit tests
################################################################################
add_subdirectory(ApplicationCode/ReservoirDataModel/ReservoirDataModel_UnitTests)
add_subdirectory(ApplicationCode/FileInterface/FileInterface_UnitTests)
#add_subdirectory(ApplicationCode/FileInterface/FileInterface_UnitTests)
add_subdirectory(ApplicationCode/ModelVisualization/ModelVisualization_UnitTests)
set_property(TARGET
ModelVisualization_UnitTests
FileInterface_UnitTests
# FileInterface_UnitTests
RigReservoirDataModel_UnitTests
PROPERTY FOLDER "UnitTests"
)