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

Merge pull request #5057 from OPM/fix-cafCommandFeatures

Browse Source 
AppFwk : Include cafCommandFeatures in ResInsight
This commit is contained in:
Magne Sjaastad 2019-11-15 17:44:18 +01:00 committed by GitHub
commit f0c127df27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/CMakeLists.txt
View File

@ -357,6 +357,7 @@ set( EXE_FILES
.clang-format .clang-format
.clang-tidy .clang-tidy
Adm/RiaVersionInfo.h.cmake Adm/RiaVersionInfo.h.cmake
$<TARGET_OBJECTS:cafCommandFeatures> # Needed for cmake version < 3.12. Remove when we can use target_link_libraries with OBJECT libraries
) )
if (RESINSIGHT_ENABLE_GRPC) if (RESINSIGHT_ENABLE_GRPC)
@ -475,6 +476,7 @@ if(RESINSIGHT_ENABLE_COTIRE)
# QT 5 # QT 5
qrc_cafAnimControl.cpp qrc_cafAnimControl.cpp
qrc_ResInsight.cpp qrc_ResInsight.cpp
qrc_cafCommandFeatures.cpp
ProjectDataModel/RimContourMapView.cpp ProjectDataModel/RimContourMapView.cpp
Commands/CompletionExportCommands/RicExportFractureCompletionsImpl.cpp Commands/CompletionExportCommands/RicExportFractureCompletionsImpl.cpp
) )

6
CMakeLists.txt
View File

@ -375,6 +375,9 @@ add_subdirectory(Fwk/AppFwk/cafPdmCvf)
add_subdirectory(Fwk/AppFwk/CommonCode) add_subdirectory(Fwk/AppFwk/CommonCode)
add_subdirectory(Fwk/AppFwk/cafVizExtensions) add_subdirectory(Fwk/AppFwk/cafVizExtensions)
add_subdirectory(Fwk/AppFwk/cafCommandFeatures)
set_property(TARGET cafCommandFeatures PROPERTY FOLDER "AppFwk")
#add_subdirectory(Fwk/AppFwk/cafTests/cafTestCvfApplication) #add_subdirectory(Fwk/AppFwk/cafTests/cafTestCvfApplication)
add_subdirectory(Fwk/AppFwk/cafTensor) add_subdirectory(Fwk/AppFwk/cafTensor)
@ -416,9 +419,6 @@ if (RESINSIGHT_INCLUDE_APPFWK_TESTS)
set_property(TARGET cafPdmXml_UnitTests PROPERTY FOLDER "AppFwkTests") set_property(TARGET cafPdmXml_UnitTests PROPERTY FOLDER "AppFwkTests")
# Executables # Executables
add_subdirectory(Fwk/AppFwk/cafCommandFeatures)
set_property(TARGET cafCommandFeatures PROPERTY FOLDER "AppFwk")
add_subdirectory(Fwk/AppFwk/cafTests/cafTestApplication) add_subdirectory(Fwk/AppFwk/cafTests/cafTestApplication)
set_property(TARGET cafTestApplication PROPERTY FOLDER "AppFwkTests") set_property(TARGET cafTestApplication PROPERTY FOLDER "AppFwkTests")
endif() endif()