Revert "Revert "BUG: Do not register IO factories for testing within …

…ITK"" This reverts commit a6a7a97 (a wrong revert!) and does the same in applications. See conversation in GH-207.
RTKConsortium · Sep 19, 2018 · dd00d03 · dd00d03
1 parent a6a7a97
commit dd00d03
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/applications/CMakeLists.txt b/applications/CMakeLists.txt
@@ -26,8 +26,10 @@ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${RTK_INSTALL_LIB_DIR}")
 # Required to include ITK_USE_FILE in order to Register IO factories
 # Force requested modules to be RTK dependencies only, otherwise all
 # available factories will try to register themselves.
-find_package(ITK REQUIRED COMPONENTS ${ITK_MODULE_RTK_DEPENDS})
-include(${ITK_USE_FILE})
+if (NOT ITK_SOURCE_DIR)
+  find_package(ITK REQUIRED COMPONENTS ${ITK_MODULE_RTK_DEPENDS})
+  include(${ITK_USE_FILE})
+endif()
 
 #-----------------------------------------------------------------------------
 # Executables

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -6,8 +6,10 @@ configure_file (${CMAKE_CURRENT_SOURCE_DIR}/rtkTestConfiguration.h.in
 # Required to include ITK_USE_FILE in order to Register IO factories
 # Force requested modules to be RTK dependencies only, otherwise all
 # available factories will try to register themselves.
-find_package(ITK REQUIRED COMPONENTS ${ITK_MODULE_RTK_DEPENDS})
-include(${ITK_USE_FILE})
+if (NOT ITK_SOURCE_DIR)
+  find_package(ITK REQUIRED COMPONENTS ${ITK_MODULE_RTK_DEPENDS})
+  include(${ITK_USE_FILE})
+endif()
 
 #-----------------------------------------------------------------------------
 # rtk_add_test(testname testfile [DATA{}])