Commit 1eee4927 authored by Matt Clarkson's avatar Matt Clarkson

Merge branch '5359-patch-CTK'

parents 6e812e00 6e2250df
......@@ -9,6 +9,8 @@
# Eclipse config files:
/.cproject
/.project
# PyCharm config files:
/.idea
# QtCreator config files:
/*.config
/*.creator
......
......@@ -29,7 +29,7 @@ if(MITK_USE_Qt4 OR MITK_USE_Qt5)
# Note: If the CTK version changes, then you either clear the plugin cache
# or change the deploy path by changing the patch level.
set(version "910cec7415")
set(location "${NIFTK_EP_TARBALL_LOCATION}/NifTK-CTK-${version}.tar.gz")
set(location "${NIFTK_EP_TARBALL_LOCATION}/NifTK-CTK-${version}-sources.tar.gz")
set(depends VTK ITK DCMTK)
if(MITK_USE_Python AND NOT MITK_USE_SYSTEM_PYTHON)
list(APPEND depends Python)
......@@ -100,7 +100,7 @@ if(MITK_USE_Qt4 OR MITK_USE_Qt5)
INSTALL_DIR ${proj_INSTALL}
URL ${proj_LOCATION}
URL_MD5 ${proj_CHECKSUM}
UPDATE_COMMAND ${GIT_EXECUTABLE} checkout ${proj_VERSION}
PATCH_COMMAND ${PATCH_COMMAND} -N -p1 -i ${CMAKE_CURRENT_LIST_DIR}/CTK_Issue_716.patch
INSTALL_COMMAND ""
CMAKE_GENERATOR ${gen}
CMAKE_ARGS
......
diff --git a/CMake/ctkMacroSetupQt.cmake b/CMake/ctkMacroSetupQt.cmake
index 0b5d89c..a4b8751 100644
--- a/CMake/ctkMacroSetupQt.cmake
+++ b/CMake/ctkMacroSetupQt.cmake
@@ -72,9 +72,6 @@ macro(ctkMacroSetupQt)
else()
message(FATAL_ERROR "error: Qt4 was not found on your system. You probably need to set the QT_QMAKE_EXECUTABLE variable")
endif()
-
- else()
- message(FATAL_ERROR "error: Qt4 was not found on your system. You probably need to set the QT_QMAKE_EXECUTABLE variable")
endif()
mark_as_superbuild(CTK_QT_VERSION)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment