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

CMakeLists.txt

@@ -439,6 +439,7 @@ add_subdirectory(Fwk/AppFwk/cafUserInterface)
 add_subdirectory(Fwk/AppFwk/cafPdmCvf)
 add_subdirectory(Fwk/AppFwk/CommonCode)
 add_subdirectory(Fwk/AppFwk/cafVizExtensions)
+option(CAF_CVF_SCRIPTING "" ON)
 add_subdirectory(Fwk/AppFwk/cafPdmScripting)
 set_property(TARGET cafPdmScripting PROPERTY FOLDER "AppFwk")
 

Fwk/AppFwk/cafPdmScripting/CMakeLists.txt

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

Fwk/AppFwk/cafPdmScripting/cafPdmFieldScriptingCapability.h

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