Slicer · jcfr · Dec 5, 2017
diff --git a/Applications/SlicerApp/Main.cxx b/Applications/SlicerApp/Main.cxx
@@ -53,7 +53,9 @@
 #include "qSlicerStyle.h"
 
 // ITK includes
+#ifdef Slicer_USE_ITKFactoryRegistration
 #include <itkFactoryRegistration.h>
+#endif
 
 // VTK includes
 //#include <vtkObject.h>
@@ -95,7 +97,9 @@ void splashMessage(QScopedPointer<QSplashScreen>& splashScreen, const QString& m
 //----------------------------------------------------------------------------
 int SlicerAppMain(int argc, char* argv[])
 {
+#ifdef Slicer_USE_ITKFactoryRegistration
   itk::itkFactoryRegistration();
+#endif
 
 #if QT_VERSION >= 0x040803
 #ifdef Q_OS_MACX

diff --git a/Base/CLI/CMakeLists.txt b/Base/CLI/CMakeLists.txt
@@ -34,12 +34,23 @@ include_directories(${include_dirs})
 # --------------------------------------------------------------------------
 # Update SlicerExecutionModel_EXTRA_INCLUDE_DIRECTORIES
 # --------------------------------------------------------------------------
-set(SlicerExecutionModel_EXTRA_INCLUDE_DIRECTORIES
+set(_include_dirs
   ${SlicerExecutionModel_EXTRA_INCLUDE_DIRECTORIES}
   ${Slicer_BaseCLI_INCLUDE_DIRS}
-  ${ITKFactoryRegistration_INCLUDE_DIRS}
+  )
+if(Slicer_USE_ITKFactoryRegistration)
+  list(APPEND _include_dirs
+    ${ITKFactoryRegistration_INCLUDE_DIRS}
+    )
+endif()
+set(SlicerExecutionModel_EXTRA_INCLUDE_DIRECTORIES
+  ${_include_dirs}
   CACHE INTERNAL "SlicerExecutionModel extra includes" FORCE
   )
+
+# --------------------------------------------------------------------------
+# Update SlicerExecutionModel_CLI_LIBRARY_WRAPPER_CXX
+# --------------------------------------------------------------------------
 set(SlicerExecutionModel_CLI_LIBRARY_WRAPPER_CXX
   ${CMAKE_CURRENT_BINARY_DIR}/SEMCommandLineLibraryWrapper.cxx
   CACHE INTERNAL "SlicerExecutionModel extra includes" FORCE

diff --git a/Base/CLI/Testing/itkTestMain.h b/Base/CLI/Testing/itkTestMain.h
@@ -50,7 +50,14 @@
 #include "itksys/SystemTools.hxx"
 #include "itkIntTypes.h"
 #include "itkFloatingPointExceptions.h"
+
+// Slicer includes
+#include <vtkSlicerConfigure.h> //For Slicer_* macros
+
+// ITK includes
+#ifdef Slicer_USE_ITKFactoryRegistration
 #include <itkFactoryRegistration.h>
+#endif
 
 #define ITK_TEST_DIMENSION_MAX 6
 
@@ -96,7 +103,9 @@ int main(int ac, char *av[])
   typedef std::pair<char *, char *> ComparePairType;
   std::vector<ComparePairType> compareList;
 
+#ifdef Slicer_USE_ITKFactoryRegistration
   itk::itkFactoryRegistration();
+#endif
 
   RegisterTests();
   std::string testToRun;

diff --git a/Base/Logic/CMakeLists.txt b/Base/Logic/CMakeLists.txt
@@ -31,11 +31,13 @@ if(Slicer_BUILD_CLI_SUPPORT)
   list(APPEND ${PROJECT_NAME}_ITK_COMPONENTS ${ModuleDescriptionParser_ITK_COMPONENTS})
 endif()
 find_package(ITK 4.6 COMPONENTS ${${PROJECT_NAME}_ITK_COMPONENTS} REQUIRED)
-set(ITK_NO_IO_FACTORY_REGISTER_MANAGER 1) # See Libs/ITKFactoryRegistration/CMakeLists.txt
-list(APPEND ITK_LIBRARIES ITKFactoryRegistration)
-list(APPEND ITK_INCLUDE_DIRS
-  ${ITKFactoryRegistration_INCLUDE_DIRS}
-  )
+if(Slicer_USE_ITKFactoryRegistration)
+  set(ITK_NO_IO_FACTORY_REGISTER_MANAGER 1) # See Libs/ITKFactoryRegistration/CMakeLists.txt
+  list(APPEND ITK_LIBRARIES ITKFactoryRegistration)
+  list(APPEND ITK_INCLUDE_DIRS
+    ${ITKFactoryRegistration_INCLUDE_DIRS}
+    )
+endif()
 include(${ITK_USE_FILE})
 
 #

diff --git a/Base/QTCore/CMakeLists.txt b/Base/QTCore/CMakeLists.txt
@@ -27,7 +27,9 @@ if(Slicer_BUILD_CLI_SUPPORT)
     ITKCommon
     )
   find_package(ITK 4.6 COMPONENTS ${${PROJECT_NAME}_ITK_COMPONENTS} REQUIRED)
-  set(ITK_NO_IO_FACTORY_REGISTER_MANAGER 1) # See Libs/ITKFactoryRegistration/CMakeLists.txt
+  if(Slicer_USE_ITKFactoryRegistration)
+    set(ITK_NO_IO_FACTORY_REGISTER_MANAGER 1) # See Libs/ITKFactoryRegistration/CMakeLists.txt
+  endif()
   include(${ITK_USE_FILE})
 endif()
 

diff --git a/Base/QTGUI/Testing/Cxx/CMakeLists.txt b/Base/QTGUI/Testing/Cxx/CMakeLists.txt
@@ -10,25 +10,34 @@ if(BUILD_TESTING)
     ITKCommon
     )
   find_package(ITK 4.6 COMPONENTS ${${KIT}Testing_ITK_COMPONENTS} REQUIRED)
-  set(ITK_NO_IO_FACTORY_REGISTER_MANAGER 1) # See Libs/ITKFactoryRegistration/CMakeLists.txt
-  list(APPEND ITK_LIBRARIES ITKFactoryRegistration)
-  list(APPEND ITK_INCLUDE_DIRS
-    ${ITKFactoryRegistration_INCLUDE_DIRS}
-    )
+  if(Slicer_USE_ITKFactoryRegistration)
+    set(ITK_NO_IO_FACTORY_REGISTER_MANAGER 1) # See Libs/ITKFactoryRegistration/CMakeLists.txt
+    list(APPEND ITK_LIBRARIES ITKFactoryRegistration)
+    list(APPEND ITK_INCLUDE_DIRS
+      ${ITKFactoryRegistration_INCLUDE_DIRS}
+      )
+  endif()
   include(${ITK_USE_FILE})
 
   #-----------------------------------------------------------------------------
   set(CMAKE_TESTDRIVER_BEFORE_TESTMAIN  "
     DEBUG_LEAKS_ENABLE_EXIT_ERROR();
     TESTING_OUTPUT_INIT();
-    itk::itkFactoryRegistration();
     ")
+  if(Slicer_USE_ITKFactoryRegistration)
+    set(CMAKE_TESTDRIVER_BEFORE_TESTMAIN  "${CMAKE_TESTDRIVER_BEFORE_TESTMAIN}
+      itk::itkFactoryRegistration();
+      ")
+  endif()
 
   set(CMAKE_TESTDRIVER_AFTER_TESTMAIN  "
     TESTING_OUTPUT_ASSERT_WARNINGS_ERRORS(0);
     ")
 
-  set(EXTRA_INCLUDE "vtkMRMLDebugLeaksMacro.h\"\n\#include <itkConfigure.h>\n\#include <itkFactoryRegistration.h>\n\#include \"vtkTestingOutputWindow.h")
+  set(EXTRA_INCLUDE "vtkMRMLDebugLeaksMacro.h\"\n\#include <itkConfigure.h>\n\#include \"vtkTestingOutputWindow.h")
+  if(Slicer_USE_ITKFactoryRegistration)
+    set(EXTRA_INCLUDE "${EXTRA_INCLUDE}\"\n\#include \"itkFactoryRegistration.h")
+  endif()
 
   include_directories(${CMAKE_CURRENT_BINARY_DIR})
   set(KIT_TEST_SRCS

diff --git a/CMake/SlicerConfig.cmake.in b/CMake/SlicerConfig.cmake.in
@@ -112,6 +112,7 @@ endif()
 # --------------------------------------------------------------------------
 # Slicer options
 # --------------------------------------------------------------------------
+set(Slicer_USE_ITKFactoryRegistration "@Slicer_USE_ITKFactoryRegistration@")
 set(Slicer_USE_NUMPY "@Slicer_USE_NUMPY@")
 set(Slicer_USE_OpenIGTLink "@Slicer_USE_OpenIGTLink@")
 set(Slicer_USE_PYTHONQT "@Slicer_USE_PYTHONQT@")

diff --git a/CMake/UseSlicer.cmake.in b/CMake/UseSlicer.cmake.in
@@ -114,11 +114,13 @@ endif()
 # Prerequisites
 # --------------------------------------------------------------------------
 
-# Expose mechanism allowing extensions to register ITK IOFactories.
-# For details: http://viewvc.slicer.org/viewvc.cgi/Slicer4?view=revision&revision=21592
-set(ITK_NO_IO_FACTORY_REGISTER_MANAGER 1) # See Libs/ITKFactoryRegistration/CMakeLists.txt
-list(APPEND ITK_LIBRARIES ITKFactoryRegistration)
-list(APPEND ITK_INCLUDE_DIRS ${ITKFactoryRegistration_INCLUDE_DIRS})
+if(Slicer_USE_ITKFactoryRegistration)
+  # Expose mechanism allowing extensions to register ITK IOFactories.
+  # For details: http://viewvc.slicer.org/viewvc.cgi/Slicer4?view=revision&revision=21592
+  set(ITK_NO_IO_FACTORY_REGISTER_MANAGER 1) # See Libs/ITKFactoryRegistration/CMakeLists.txt
+  list(APPEND ITK_LIBRARIES ITKFactoryRegistration)
+  list(APPEND ITK_INCLUDE_DIRS ${ITKFactoryRegistration_INCLUDE_DIRS})
+endif()
 
 # By default, the "<PROJECT>_USE_FILE" of each slicer external project will be included.
 # This can be changed by setting the variable Slicer_SKIP_EXTERNAL_PROJECTS_USEFILE to TRUE

diff --git a/CMake/vtkSlicerConfigure.h.in b/CMake/vtkSlicerConfigure.h.in
@@ -33,6 +33,7 @@
 #endif
 
 #cmakedefine Slicer_USE_IGSTK
+#cmakedefine Slicer_USE_ITKFactoryRegistration
 #cmakedefine Slicer_USE_NAVITRACK
 #cmakedefine Slicer_USE_NUMPY
 #cmakedefine Slicer_USE_PYTHONQT

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -239,6 +239,11 @@ CMAKE_DEPENDENT_OPTION(
   "Slicer_BUILD_CLI_SUPPORT" OFF
   )
 
+if(NOT DEFINED Slicer_USE_ITKFactoryRegistration)
+  set(Slicer_USE_ITKFactoryRegistration ${Slicer_BUILD_CLI_SUPPORT})
+endif()
+mark_as_superbuild(Slicer_USE_ITKFactoryRegistration:BOOL)
+
 mark_as_superbuild(Slicer_BUILD_CLI)
 CMAKE_DEPENDENT_OPTION(
   Slicer_BUILD_LEGACY_CLI "Build Slicer LEGACY_CLI Plugins" ON

diff --git a/Libs/CMakeLists.txt b/Libs/CMakeLists.txt
@@ -11,13 +11,15 @@ set(GENERATECLP_USE_MD5 ON)
 
 set(dirs )
 
-list(APPEND dirs
-  ITKFactoryRegistration
-  )
-set(SlicerExecutionModel_EXTRA_EXECUTABLE_TARGET_LIBRARIES
-  ${SlicerExecutionModel_EXTRA_EXECUTABLE_TARGET_LIBRARIES} ITKFactoryRegistration
-  CACHE INTERNAL "SlicerExecutionModel extra executable target libraries" FORCE
-  )
+if(Slicer_USE_ITKFactoryRegistration)
+  list(APPEND dirs
+    ITKFactoryRegistration
+    )
+  set(SlicerExecutionModel_EXTRA_EXECUTABLE_TARGET_LIBRARIES
+    ${SlicerExecutionModel_EXTRA_EXECUTABLE_TARGET_LIBRARIES} ITKFactoryRegistration
+    CACHE INTERNAL "SlicerExecutionModel extra executable target libraries" FORCE
+    )
+endif()
 
 list(APPEND dirs
   vtkAddon

diff --git a/Libs/MRML/Core/CMakeLists.txt b/Libs/MRML/Core/CMakeLists.txt
@@ -46,9 +46,11 @@ set(${PROJECT_NAME}_ITK_COMPONENTS
   ITKTransform
   )
 find_package(ITK 4.6 COMPONENTS ${${PROJECT_NAME}_ITK_COMPONENTS} REQUIRED)
-set(ITK_NO_IO_FACTORY_REGISTER_MANAGER 1) # See Libs/ITKFactoryRegistration/CMakeLists.txt
-list(APPEND ITK_LIBRARIES ITKFactoryRegistration)
-list(APPEND ITK_INCLUDE_DIRS ${ITKFactoryRegistration_INCLUDE_DIRS})
+if(Slicer_USE_ITKFactoryRegistration)
+  set(ITK_NO_IO_FACTORY_REGISTER_MANAGER 1) # See Libs/ITKFactoryRegistration/CMakeLists.txt
+  list(APPEND ITK_LIBRARIES ITKFactoryRegistration)
+  list(APPEND ITK_INCLUDE_DIRS ${ITKFactoryRegistration_INCLUDE_DIRS})
+endif()
 include(${ITK_USE_FILE})
 
 #

diff --git a/Libs/MRML/Core/Testing/vtkMRMLNonlinearTransformNodeTest1.cxx b/Libs/MRML/Core/Testing/vtkMRMLNonlinearTransformNodeTest1.cxx
@@ -10,9 +10,13 @@
 
 =========================================================================auto=*/
 
+// Slicer includes
+#include <vtkSlicerConfigure.h> // For Slicer_* macros
+
 // ITK includes
-#include <itkConfigure.h>
+#ifdef Slicer_USE_ITKFactoryRegistration
 #include <itkFactoryRegistration.h>
+#endif
 
 #include "vtkOrientedBSplineTransform.h"
 #include "vtkOrientedGridTransform.h"
@@ -40,7 +44,9 @@ int TestGetTransform();
 
 int vtkMRMLNonlinearTransformNodeTest1(int argc, char * argv[] )
 {
+#ifdef Slicer_USE_ITKFactoryRegistration
   itk::itkFactoryRegistration();
+#endif
 
   const char *filename = 0;
   if (argc > 1)

diff --git a/Libs/MRML/IDImageIO/CMakeLists.txt b/Libs/MRML/IDImageIO/CMakeLists.txt
@@ -24,9 +24,11 @@ set(${PROJECT_NAME}_ITK_COMPONENTS
   ITKIOImageBase
   )
 find_package(ITK 4.6 COMPONENTS ${${PROJECT_NAME}_ITK_COMPONENTS} REQUIRED)
-set(ITK_NO_IO_FACTORY_REGISTER_MANAGER 1) # See Libs/ITKFactoryRegistration/CMakeLists.txt
-list(APPEND ITK_LIBRARIES ITKFactoryRegistration)
-list(APPEND ITK_INCLUDE_DIRS ${ITKFactoryRegistration_INCLUDE_DIRS})
+if(Slicer_USE_ITKFactoryRegistration)
+  set(ITK_NO_IO_FACTORY_REGISTER_MANAGER 1) # See Libs/ITKFactoryRegistration/CMakeLists.txt
+  list(APPEND ITK_LIBRARIES ITKFactoryRegistration)
+  list(APPEND ITK_INCLUDE_DIRS ${ITKFactoryRegistration_INCLUDE_DIRS})
+endif()
 include(${ITK_USE_FILE})
 
 #

diff --git a/Libs/MRML/Logic/Testing/Cxx/CMakeLists.txt b/Libs/MRML/Logic/Testing/Cxx/CMakeLists.txt
@@ -5,11 +5,13 @@ set(${KIT}Testing_ITK_COMPONENTS
   ITKCommon
   )
 find_package(ITK 4.6 COMPONENTS ${${KIT}Testing_ITK_COMPONENTS} REQUIRED)
-set(ITK_NO_IO_FACTORY_REGISTER_MANAGER 1) # See Libs/ITKFactoryRegistration/CMakeLists.txt
-list(APPEND ITK_LIBRARIES ITKFactoryRegistration)
-list(APPEND ITK_INCLUDE_DIRS
-  ${ITKFactoryRegistration_INCLUDE_DIRS}
-  )
+if(Slicer_USE_ITKFactoryRegistration)
+  set(ITK_NO_IO_FACTORY_REGISTER_MANAGER 1) # See Libs/ITKFactoryRegistration/CMakeLists.txt
+  list(APPEND ITK_LIBRARIES ITKFactoryRegistration)
+  list(APPEND ITK_INCLUDE_DIRS
+    ${ITKFactoryRegistration_INCLUDE_DIRS}
+    )
+endif()
 include(${ITK_USE_FILE})
 
 #-----------------------------------------------------------------------------

diff --git a/Libs/MRML/Logic/Testing/Cxx/vtkMRMLSliceLogicTest2.cxx b/Libs/MRML/Logic/Testing/Cxx/vtkMRMLSliceLogicTest2.cxx
@@ -46,14 +46,20 @@
 #include <vtkTimerLog.h>
 #include <vtkVersion.h>
 
+// Slicer includes
+#include <vtkSlicerConfigure.h> // For Slicer_* macros
+
 // ITK includes
-#include <itkConfigure.h>
+#ifdef Slicer_USE_ITKFactoryRegistration
 #include <itkFactoryRegistration.h>
+#endif
 
 //-----------------------------------------------------------------------------
 int vtkMRMLSliceLogicTest2(int argc, char * argv [] )
 {
+#ifdef Slicer_USE_ITKFactoryRegistration
   itk::itkFactoryRegistration();
+#endif
 //  vtkMultiThreader::SetGlobalMaximumNumberOfThreads(1);
 
   if( argc < 2 )

diff --git a/Libs/MRML/Logic/Testing/Cxx/vtkMRMLSliceLogicTest3.cxx b/Libs/MRML/Logic/Testing/Cxx/vtkMRMLSliceLogicTest3.cxx
@@ -38,9 +38,13 @@
 #include <vtkTimerLog.h>
 #include <vtkVersion.h>
 
+// Slicer includes
+#include <vtkSlicerConfigure.h> // For Slicer_* macros
+
 // ITK includes
-#include <itkConfigure.h>
+#ifdef Slicer_USE_ITKFactoryRegistration
 #include <itkFactoryRegistration.h>
+#endif
 
 //-----------------------------------------------------------------------------
 vtkMRMLScalarVolumeNode* loadVolume(const char* volume, vtkMRMLScene* scene)
@@ -81,7 +85,9 @@ vtkMRMLScalarVolumeNode* loadVolume(const char* volume, vtkMRMLScene* scene)
 //-----------------------------------------------------------------------------
 int vtkMRMLSliceLogicTest3(int argc, char * argv [] )
 {
+#ifdef Slicer_USE_ITKFactoryRegistration
   itk::itkFactoryRegistration();
+#endif
 
   if( argc < 2 )
     {

diff --git a/Libs/MRML/Logic/Testing/Cxx/vtkMRMLSliceLogicTest4.cxx b/Libs/MRML/Logic/Testing/Cxx/vtkMRMLSliceLogicTest4.cxx
@@ -35,9 +35,13 @@
 #include <vtkNew.h>
 #include <vtkVersion.h>
 
+// Slicer includes
+#include <vtkSlicerConfigure.h> // For Slicer_* macros
+
 // ITK includes
-#include <itkConfigure.h>
+#ifdef Slicer_USE_ITKFactoryRegistration
 #include <itkFactoryRegistration.h>
+#endif
 
 //-----------------------------------------------------------------------------
 vtkMRMLScalarVolumeNode* loadVolume2(const char* volume, vtkMRMLScene* scene)
@@ -79,7 +83,9 @@ vtkMRMLScalarVolumeNode* loadVolume2(const char* volume, vtkMRMLScene* scene)
 //-----------------------------------------------------------------------------
 int vtkMRMLSliceLogicTest4(int argc, char * argv [] )
 {
+#ifdef Slicer_USE_ITKFactoryRegistration
   itk::itkFactoryRegistration();
+#endif
 
   if( argc < 2 )
     {

diff --git a/Libs/MRML/Logic/Testing/Cxx/vtkMRMLSliceLogicTest5.cxx b/Libs/MRML/Logic/Testing/Cxx/vtkMRMLSliceLogicTest5.cxx
@@ -39,9 +39,13 @@
 #include <vtkTimerLog.h>
 #include <vtkVersion.h>
 
+// Slicer includes
+#include <vtkSlicerConfigure.h> // For Slicer_* macros
+
 // ITK includes
-#include <itkConfigure.h>
+#ifdef Slicer_USE_ITKFactoryRegistration
 #include <itkFactoryRegistration.h>
+#endif
 
 //-----------------------------------------------------------------------------
 vtkMRMLScalarVolumeNode* vtkMRMLSliceLogicTest5_loadVolume(const char* volume, vtkMRMLScene* scene)
@@ -83,7 +87,9 @@ vtkMRMLScalarVolumeNode* vtkMRMLSliceLogicTest5_loadVolume(const char* volume, v
 //-----------------------------------------------------------------------------
 int vtkMRMLSliceLogicTest5(int argc, char * argv [] )
 {
+#ifdef Slicer_USE_ITKFactoryRegistration
   itk::itkFactoryRegistration();
+#endif
 
   if( argc < 2 )
     {