From: Leonardo Florez-Valencia <florez-l@javeriana.edu.co>
Date: Thu, 16 Jun 2016 20:17:27 +0000 (-0500)
Subject: ...
X-Git-Tag: v0.1~141
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=55cce1021acddccbacb5404da58f4f81b795e026;p=cpPlugins.git

...
---

diff --git a/lib/cpPlugins_Instances/BaseObjects_extra.cxx b/lib/cpPlugins_Instances/BaseObjects_extra.cxx
index 1715ae0..80c0319 100644
--- a/lib/cpPlugins_Instances/BaseObjects_extra.cxx
+++ b/lib/cpPlugins_Instances/BaseObjects_extra.cxx
@@ -1,5 +1,6 @@
 #include <cpPlugins_Instances_BaseObjects_Export.h>
 #include <cpPlugins_Instances/BaseObjects.h>
+#include <cpPlugins_Config.h>
 
 #include <itkImageRegion.h>
 #include <itkFixedArray.h>
@@ -47,6 +48,8 @@ cpPlugins_Instances_BaseObjects_extra_Array_AllScalars_AllDims( itk::Point );
 cpPlugins_Instances_BaseObjects_extra_Array_AllScalars_AllDims( itk::Vector );
 
 // -------------------------------------------------------------------------
+#ifndef cpPlugins_SYS_MACOS
+
 #define cpPlugins_Instances_BaseObjects_extra_VariableLengthVector_SetSize( T, P, Q ) \
   template cpPlugins_Instances_BaseObjects_EXPORT void itk::VariableLengthVector< T >:: \
   SetSize                                                               \
@@ -62,4 +65,6 @@ cpPlugins_Instances_BaseObjects_extra_VariableLengthVector_SetSize( float, Shrin
 cpPlugins_Instances_BaseObjects_extra_VariableLengthVector_SetSize( double, AlwaysReallocate, KeepOldValues );
 cpPlugins_Instances_BaseObjects_extra_VariableLengthVector_SetSize( double, ShrinkToFit, KeepOldValues );
 
+#endif // cpPlugins_SYS_MACOS
+
 // eof - $RCSfile$
diff --git a/lib/cpPlugins_Instances/CMakeLists.txt b/lib/cpPlugins_Instances/CMakeLists.txt
index fb7490c..1bfd0c5 100644
--- a/lib/cpPlugins_Instances/CMakeLists.txt
+++ b/lib/cpPlugins_Instances/CMakeLists.txt
@@ -5,19 +5,34 @@
 SET(pfx "cpPlugins_Instances_")
 SET(arg ${pfx} ${prj_VER} ${prj_sVER})
 
-cpPlugins_WrapInstances(BaseObjects ${arg}) #${ITK_LIBRARIES})
-cpPlugins_WrapInstances(Decorators ${arg}) #${ITK_LIBRARIES})
+IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+  cpPlugins_WrapInstances(BaseObjects ${arg})
+  cpPlugins_WrapInstances(Decorators ${arg})
+ELSE(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+  cpPlugins_WrapInstances(BaseObjects ${arg} ${ITK_LIBRARIES})
+  cpPlugins_WrapInstances(Decorators ${arg} ${ITK_LIBRARIES})
+ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 cpPlugins_WrapInstances(Mesh ${arg} ${pfx}BaseObjects)
 cpPlugins_WrapInstances(Transforms ${arg} ${pfx}BaseObjects)
 cpPlugins_WrapInstances(ColorPixels ${arg} ${pfx}BaseObjects)
 cpPlugins_WrapInstances(ScalarImages ${arg} ${pfx}BaseObjects)
 cpPlugins_WrapInstances(ColorImages ${arg} ${pfx}ColorPixels ${pfx}ScalarImages)
 cpPlugins_WrapInstances(VectorImages ${arg} ${pfx}ScalarImages)
-cpPlugins_WrapInstances(Paths ${arg} ${pfx}ScalarImages) # ${VTK_LIBRARIES})
+IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+  cpPlugins_WrapInstances(Paths ${arg} ${pfx}ScalarImages)
+ELSE(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+  cpPlugins_WrapInstances(Paths ${arg} ${pfx}ScalarImages ${VTK_LIBRARIES})
+ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 cpPlugins_WrapInstances(NeighborhoodIterators ${arg} ${pfx}ScalarImages)
-cpPlugins_WrapInstances(
-  ImageITK2VTK ${arg} ${pfx}ScalarImages ${pfx}ColorImages ${pfx}VectorImages # ${VTK_LIBRARIES}
-  )
+IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+  cpPlugins_WrapInstances(
+    ImageITK2VTK ${arg} ${pfx}ScalarImages ${pfx}ColorImages ${pfx}VectorImages
+    )
+ELSE(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+  cpPlugins_WrapInstances(
+    ImageITK2VTK ${arg} ${pfx}ScalarImages ${pfx}ColorImages ${pfx}VectorImages ${VTK_LIBRARIES}
+    )
+ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 cpPlugins_WrapInstances(
   ImagesIO ${arg} ${pfx}ScalarImages ${pfx}ColorImages ${pfx}VectorImages ${pfx}Decorators
   )