COMP: Update ctkMacroSetupQt - use QT_QMAKE_EXECUTABLE instead of CTK_QMAKE_EXECTUABLE

Also move the cmake statement related to the update of CTK_BASE_LIBRARIES to the main
CMakeLists.txt, just after the the macro ctkMAcroSetupSlicerQt.

CMake/ctkMacroSetupQt.cmake

@@ -5,10 +5,6 @@
 
 MACRO(ctkMacroSetupQt)
 
-  IF(DEFINED CTK_QMAKE_EXECUTABLE)
-    SET(QT_QMAKE_EXECUTABLE ${CTK_QMAKE_EXECUTABLE})
-  ENDIF()
-
   SET(minimum_required_qt_version "4.6")
 
   FIND_PACKAGE(Qt4)
@@ -26,8 +22,6 @@ MACRO(ctkMacroSetupQt)
     SET(QT_USE_QTSQL ON)
     INCLUDE(${QT_USE_FILE})
 
-    SET(CTK_BASE_LIBRARIES ${CTK_BASE_LIBRARIES} ${QT_LIBRARIES} CACHE INTERNAL "CTK libraries" FORCE)
-    SET(CTK_QMAKE_EXECUTABLE ${QT_QMAKE_EXECUTABLE})
   ELSE(QT4_FOUND)
     MESSAGE(FATAL_ERROR "error: Qt4 was not found on your system. You probably need to set the QT_QMAKE_EXECUTABLE variable")
   ENDIF(QT4_FOUND)

CMakeLists.txt

@@ -103,6 +103,11 @@ ENDIF()
 #
 ctkMacroSetupQt()
 
+# Update CTK_BASE_LIBRARIES with QT libraries
+IF(QT4_FOUND)
+  SET(CTK_BASE_LIBRARIES ${CTK_BASE_LIBRARIES} ${QT_LIBRARIES} CACHE INTERNAL "CTK libraries" FORCE)
+ENDIF()
+
 #-----------------------------------------------------------------------------
 # CTK Libraries
 #

SuperBuild.cmake

@@ -4,8 +4,8 @@ SET(cmake_version_required_dash "2-8")
 CMAKE_MINIMUM_REQUIRED(VERSION ${cmake_version_required})
 
 # 
-# CTK_QMAKE_EXECUTABLE
 # CTK_KWSTYLE_EXECUTABLE
+# QT_QMAKE_EXECUTABLE
 # CTK_DCMTK_DIR
 #
 
@@ -256,7 +256,7 @@ ExternalProject_Add(${proj}
     -DCTK_SUPERBUILD:BOOL=OFF
     -DCMAKE_INSTALL_PREFIX:PATH=${ep_install_dir}
     -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-    -DCTK_QMAKE_EXECUTABLE:FILEPATH=${CTK_QMAKE_EXECUTABLE}
+    -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
     -DCTK_KWSTYLE_EXECUTABLE:FILEPATH=${CTK_KWSTYLE_EXECUTABLE}
     -DDCMTK_DIR=${CTK_DCMTK_DIR} # FindDCMTK expects DCMTK_DIR
   SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}