diff --git a/CMakeExternals/MatchPoint.cmake b/CMakeExternals/MatchPoint.cmake
index 2fd129a6ae..772ed0914e 100644
--- a/CMakeExternals/MatchPoint.cmake
+++ b/CMakeExternals/MatchPoint.cmake
@@ -1,61 +1,62 @@
 #-----------------------------------------------------------------------------
 # MatchPoint
 #-----------------------------------------------------------------------------
+if(MITK_USE_MatchPoint)
 
-set(MatchPoint_SOURCE_DIR "" CACHE PATH "Location of the MatchPoint source directory")
-mark_as_advanced(MatchPoint_SOURCE_DIR)
+  set(MatchPoint_SOURCE_DIR "" CACHE PATH "Location of the MatchPoint source directory")
+  mark_as_advanced(MatchPoint_SOURCE_DIR)
 
-# Sanity checks
-if(DEFINED MatchPoint_DIR AND NOT EXISTS ${MatchPoint_DIR})
-  message(FATAL_ERROR "MatchPoint_DIR variable is defined but corresponds to non-existing directory")
-endif()
-
-if(NOT MatchPoint_DIR AND MatchPoint_SOURCE_DIR AND NOT EXISTS ${MatchPoint_SOURCE_DIR})
-  message(FATAL_ERROR "MatchPoint_SOURCE_DIR variable is defined but corresponds to non-existing directory")
-endif()
-
-set(proj MatchPoint)
-set(proj_DEPENDENCIES ITK)
+  # Sanity checks
+  if(DEFINED MatchPoint_DIR AND NOT EXISTS ${MatchPoint_DIR})
+    message(FATAL_ERROR "MatchPoint_DIR variable is defined but corresponds to non-existing directory")
+  endif()
 
-set(MatchPoint_DEPENDS ${proj})
+  if(NOT MatchPoint_DIR AND MatchPoint_SOURCE_DIR AND NOT EXISTS ${MatchPoint_SOURCE_DIR})
+    message(FATAL_ERROR "MatchPoint_SOURCE_DIR variable is defined but corresponds to non-existing directory")
+  endif()
 
-if(NOT MatchPoint_DIR)
+  set(proj MatchPoint)
+  set(proj_DEPENDENCIES ITK)
+
+  set(MatchPoint_DEPENDS ${proj})
+
+  if(NOT MatchPoint_DIR)
+
+    if(MatchPoint_SOURCE_DIR)
+      set(download_step SOURCE_DIR ${MatchPoint_SOURCE_DIR})
+    else()
+      set(download_step
+          URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/MatchPoint_rev1481.tar.gz
+          URL_MD5 82b9b1bb3f909f2e00397e285ce8c981
+         )
+    endif()
+
+    ExternalProject_Add(${proj}
+       ${download_step}
+       # INSTALL_COMMAND "${CMAKE_COMMAND} -P cmake_install.cmake"
+       CMAKE_GENERATOR ${gen}
+       CMAKE_ARGS
+         ${ep_common_args}
+         ${additional_cmake_args}
+         -DBUILD_TESTING:BOOL=OFF
+         -DITK_DIR:PATH=${ITK_DIR} #/src/ITK-build
+         -DMAP_USE_SYSTEM_GDCM:BOOL=ON
+         -DMAP_DISABLE_ITK_IO_FACTORY_AUTO_REGISTER:BOOL=ON
+         -DMAP_WRAP_Plastimatch:BOOL=ON
+         -DGDCM_DIR:PATH=${GDCM_DIR}
+       CMAKE_CACHE_ARGS
+         ${ep_common_cache_args}
+       CMAKE_CACHE_DEFAULT_ARGS
+         ${ep_common_cache_default_args}
+       DEPENDS ${proj_DEPENDENCIES}
+      )
+
+    ExternalProject_Get_Property(${proj} binary_dir)
+    set(${proj}_DIR ${binary_dir})
+    mitkFunctionInstallExternalCMakeProject(${proj})
 
-  if(MatchPoint_SOURCE_DIR)
-    set(download_step SOURCE_DIR ${MatchPoint_SOURCE_DIR})
   else()
-    set(download_step
-        URL ${MITK_THIRDPARTY_DOWNLOAD_PREFIX_URL}/MatchPoint_rev1481.tar.gz
-        URL_MD5 82b9b1bb3f909f2e00397e285ce8c981
-       )
+    mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}")
   endif()
 
-  ExternalProject_Add(${proj}
-     ${download_step}
-     # INSTALL_COMMAND "${CMAKE_COMMAND} -P cmake_install.cmake"
-     CMAKE_GENERATOR ${gen}
-     CMAKE_ARGS
-       ${ep_common_args}
-       ${additional_cmake_args}
-       -DBUILD_TESTING:BOOL=OFF
-       -DITK_DIR:PATH=${ITK_DIR} #/src/ITK-build
-       -DMAP_USE_SYSTEM_GDCM:BOOL=ON
-       -DMAP_DISABLE_ITK_IO_FACTORY_AUTO_REGISTER:BOOL=ON
-       -DMAP_WRAP_Plastimatch:BOOL=ON
-       -DGDCM_DIR:PATH=${GDCM_DIR}
-     CMAKE_CACHE_ARGS
-       ${ep_common_cache_args}
-     CMAKE_CACHE_DEFAULT_ARGS
-       ${ep_common_cache_default_args}
-     DEPENDS ${proj_DEPENDENCIES}
-    )
-
-  ExternalProject_Get_Property(${proj} binary_dir)
-  set(${proj}_DIR ${binary_dir})
-  mitkFunctionInstallExternalCMakeProject(${proj})
-
-else()
-
-  mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}")
-
-endif()
+endif(MITK_USE_MatchPoint)