COMP: integrated in SuperElastix with initial google tests

Modules/Core/ComponentInterface/ComponentBase.h → Modules/Core/ComponentInterface/include/ComponentBase.h

@@ -10,8 +10,8 @@ namespace elx
   class ComponentBase {
   public:
     virtual interfaceStatus ConnectFrom(const char *, ComponentBase*) = 0;
-  protected:
-    virtual ~ComponentBase(){};
+  //protected:
+    virtual ~ComponentBase() {};
   };
 } // end namespace elx
 #endif // #define ComponentBase_h
\ No newline at end of file

Modules/Core/ComponentInterface/GDOptimizer3rdPartyComponent.h → Modules/Core/ComponentInterface/include/GDOptimizer3rdPartyComponent.h

@@ -18,7 +18,7 @@ namespace elx
   {
   public:
     GDOptimizer3rdPartyComponent();
-    ~GDOptimizer3rdPartyComponent();
+    virtual ~GDOptimizer3rdPartyComponent();
     Example3rdParty::GDOptimizer3rdParty* theImplementation;
     Metric3rdPartyWrapper* MetricObject;
     //virtual int ConnectFrom(const char *, ComponentBase*);

Modules/Core/ComponentInterface/GDOptimizer4thPartyComponent.h → Modules/Core/ComponentInterface/include/GDOptimizer4thPartyComponent.h

@@ -18,7 +18,7 @@ namespace elx
   {
   public:
     GDOptimizer4thPartyComponent();
-    ~GDOptimizer4thPartyComponent();
+    virtual ~GDOptimizer4thPartyComponent();
     Example4thParty::GDOptimizer4thParty* theImplementation;
     Metric4thPartyWrapper* MetricObject;
     //virtual int ConnectFrom(const char *, ComponentBase*);

Modules/Core/ComponentInterface/SSDMetric3rdPartyComponent.h → Modules/Core/ComponentInterface/include/SSDMetric3rdPartyComponent.h

@@ -16,7 +16,7 @@ namespace elx
   {
   public:
     SSDMetric3rdPartyComponent();
-    ~SSDMetric3rdPartyComponent();
+    virtual ~SSDMetric3rdPartyComponent();
     Example3rdParty::SSDMetric3rdParty* theImplementation;
     int GetValue();
     int GetDerivative();

Modules/Core/ComponentInterface/SSDMetric4thPartyComponent.h → Modules/Core/ComponentInterface/include/SSDMetric4thPartyComponent.h

@@ -16,7 +16,7 @@ namespace elx
   {
   public:
     SSDMetric4thPartyComponent();
-    ~SSDMetric4thPartyComponent();
+    virtual ~SSDMetric4thPartyComponent();
     Example4thParty::SSDMetric4thParty* theImplementation;
     int GetValue();
   };

Modules/Core/elxModuleCore.cmake

@@ -4,6 +4,7 @@ set( MODULE elxModuleCore )
 set( ${MODULE}_INCLUDE_DIRS
   ${${MODULE}_SOURCE_DIR}/Common/include
   ${${MODULE}_SOURCE_DIR}/Blueprints/include
+  ${${MODULE}_SOURCE_DIR}/ComponentInterface/include
 )
 
 # Export libraries
@@ -14,8 +15,18 @@ set( ${MODULE}_LIBRARIES
 # Module source files
 set( ${MODULE}_SOURCE_FILES
   ${${MODULE}_SOURCE_DIR}/Blueprints/src/elxBlueprint.cxx
+  ${${MODULE}_SOURCE_DIR}/ComponentInterface/src/Example3rdPartyCode.cxx
+  ${${MODULE}_SOURCE_DIR}/ComponentInterface/src/Example4thPartyCode.cxx
+  ${${MODULE}_SOURCE_DIR}/ComponentInterface/src/GDOptimizer3rdPartyComponent.cxx
+  ${${MODULE}_SOURCE_DIR}/ComponentInterface/src/GDOptimizer4thPartyComponent.cxx
+  ${${MODULE}_SOURCE_DIR}/ComponentInterface/src/Metric3rdPartyWrapper.cxx
+  ${${MODULE}_SOURCE_DIR}/ComponentInterface/src/Metric4thPartyWrapper.cxx
+  ${${MODULE}_SOURCE_DIR}/ComponentInterface/src/SSDMetric3rdPartyComponent.cxx
+  ${${MODULE}_SOURCE_DIR}/ComponentInterface/src/SSDMetric4thPartyComponent.cxx
+  ${${MODULE}_SOURCE_DIR}/ComponentInterface/src/componenthandshake.cxx
 )
 
+
 # Compile library
 
 add_library( ${MODULE} STATIC "${${MODULE}_SOURCE_FILES}" )