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

Fix build issues with test app by making CAF CVF-datatype scripting optional

Browse Source
This commit is contained in:
Gaute Lindkvist 2020-09-07 14:42:33 +02:00
parent b0ff04ea18
commit 5ae0e6a511
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -439,6 +439,7 @@ add_subdirectory(Fwk/AppFwk/cafUserInterface)
add_subdirectory(Fwk/AppFwk/cafPdmCvf) 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)
option(CAF_CVF_SCRIPTING "" ON)
add_subdirectory(Fwk/AppFwk/cafPdmScripting) add_subdirectory(Fwk/AppFwk/cafPdmScripting)
set_property(TARGET cafPdmScripting PROPERTY FOLDER "AppFwk") set_property(TARGET cafPdmScripting PROPERTY FOLDER "AppFwk")

18
Fwk/AppFwk/cafPdmScripting/CMakeLists.txt
View File

@ -2,6 +2,8 @@ cmake_minimum_required (VERSION 2.8.12)
project (cafPdmScripting) project (cafPdmScripting)
option(CAF_CVF_SCRIPTING "Enable CVF-data support in Scripting" OFF)
# Unity Build # Unity Build
if (CAF_ENABLE_UNITY_BUILD) if (CAF_ENABLE_UNITY_BUILD)
message("Cmake Unity build is enabled on : ${PROJECT_NAME}") message("Cmake Unity build is enabled on : ${PROJECT_NAME}")
@ -30,11 +32,20 @@ set( PROJECT_FILES
cafPdmMarkdownGenerator.cpp cafPdmMarkdownGenerator.cpp
cafPdmMarkdownBuilder.h cafPdmMarkdownBuilder.h
cafPdmMarkdownBuilder.cpp cafPdmMarkdownBuilder.cpp
)
set (CAF_LIBS cafProjectDataModel)
if (CAF_CVF_SCRIPTING)
list(APPEND PROJECT_FILES
cafPdmFieldScriptingCapabilityCvfColor3.h cafPdmFieldScriptingCapabilityCvfColor3.h
cafPdmFieldScriptingCapabilityCvfColor3.cpp cafPdmFieldScriptingCapabilityCvfColor3.cpp
cafPdmFieldScriptingCapabilityCvfVec3d.h cafPdmFieldScriptingCapabilityCvfVec3d.h
cafPdmFieldScriptingCapabilityCvfVec3d.cpp cafPdmFieldScriptingCapabilityCvfVec3d.cpp
) )
list(APPEND CAF_LIBS cafPdmCvf)
endif()
add_library( ${PROJECT_NAME} add_library( ${PROJECT_NAME}
@ -47,9 +58,10 @@ target_include_directories(${PROJECT_NAME}
) )
target_link_libraries ( ${PROJECT_NAME} target_link_libraries ( ${PROJECT_NAME}
cafProjectDataModel ${CAF_LIBS}
cafPdmCvf
) )
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})

2
Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptingCapability.h
View File

@ -39,8 +39,6 @@
#include "cafPdmAbstractFieldScriptingCapability.h" #include "cafPdmAbstractFieldScriptingCapability.h"
#include "cafPdmChildArrayField.h" #include "cafPdmChildArrayField.h"
#include "cafPdmChildField.h" #include "cafPdmChildField.h"
#include "cafPdmCoreColor3f.h"
#include "cafPdmCoreVec3d.h"
#include "cafPdmPtrArrayField.h" #include "cafPdmPtrArrayField.h"
#include "cafPdmPtrField.h" #include "cafPdmPtrField.h"
#include "cafPdmScriptIOMessages.h" #include "cafPdmScriptIOMessages.h"