ENH: Re-add Qt5 CMake configuration support passing CMAKE_PREFIX_PATH

CMake/ctkMacroSetupQt.cmake

@@ -50,6 +50,12 @@ macro(ctkMacroSetupQt)
     find_package(Qt5 COMPONENTS ${CTK_QT5_COMPONENTS} REQUIRED)
 
     mark_as_superbuild(Qt5_DIR) # Qt 5
+
+    # XXX Backward compatible way
+    if(DEFINED CMAKE_PREFIX_PATH)
+      mark_as_superbuild(CMAKE_PREFIX_PATH) # Qt 5
+    endif()
+
   else()
     set(minimum_required_qt_version "4.6")
 

CMakeExternals/Log4Qt.cmake

@@ -49,6 +49,12 @@ if(NOT DEFINED Log4Qt_DIR)
     list(APPEND ep_cache_args
       -DQt5_DIR:PATH=${Qt5_DIR}
       )
+    # XXX Backward compatible way
+    if(DEFINED CMAKE_PREFIX_PATH)
+      list(APPEND ep_cache_args
+        -DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH}
+        )
+    endif()
   endif()
 
   ExternalProject_Add(${proj}

CMakeExternals/PythonQt.cmake

@@ -37,6 +37,12 @@ if(NOT DEFINED PYTHONQT_INSTALL_DIR)
     list(APPEND ep_PythonQt_args
       -DQt5_DIR:PATH=${Qt5_DIR}
       )
+    # XXX Backward compatible way
+    if(DEFINED CMAKE_PREFIX_PATH)
+      list(APPEND ep_PythonQt_args
+        -DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH}
+        )
+    endif()
   else()
     list(APPEND ep_PythonQt_args
       -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}

CMakeExternals/QtSOAP.cmake

@@ -49,6 +49,12 @@ if(NOT DEFINED QtSOAP_DIR)
     list(APPEND ep_cache_args
       -DQt5_DIR:PATH=${Qt5_DIR}
       )
+    # XXX Backward compatible way
+    if(DEFINED CMAKE_PREFIX_PATH)
+      list(APPEND ep_cache_args
+        -DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH}
+        )
+    endif()
   endif()
 
   ExternalProject_Add(${proj}

CMakeExternals/QtTesting.cmake

@@ -54,11 +54,17 @@ if(NOT DEFINED QtTesting_DIR)
   if(CTK_QT_VERSION VERSION_LESS "5")
     list(APPEND ep_cache_args
       -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}
-    )
+      )
   else()
     list(APPEND ep_cache_args
       -DQt5_DIR:PATH=${Qt5_DIR}
-    )
+      )
+    # XXX Backward compatible way
+    if(DEFINED CMAKE_PREFIX_PATH)
+      list(APPEND ep_cache_args
+        -DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH}
+        )
+    endif()
   endif()
   message(STATUS "Adding project:${proj}")
   ExternalProject_Add(${proj}

CMakeExternals/VTK.cmake

@@ -66,6 +66,12 @@ if(NOT DEFINED VTK_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
       -DDESIRED_QT_VERSION:STRING=5
       -DQt5_DIR:PATH=${Qt5_DIR}
       )
+    # XXX Backward compatible way
+    if(DEFINED CMAKE_PREFIX_PATH)
+      list(APPEND additional_vtk_cmakevars
+        -DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH}
+        )
+    endif()
   endif()
 
   ExternalProject_Add(${proj}

CMakeExternals/qRestAPI.cmake

@@ -49,6 +49,12 @@ if(NOT DEFINED ${proj}_DIR)
     list(APPEND ep_cache_args
       -DQt5_DIR:PATH=${Qt5_DIR}
       )
+    # XXX Backward compatible way
+    if(DEFINED CMAKE_PREFIX_PATH)
+      list(APPEND ep_cache_args
+        -DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH}
+        )
+    endif()
   endif()
 
   ExternalProject_Add(${proj}

CMakeExternals/qxmlrpc.cmake

@@ -51,6 +51,12 @@ if(NOT DEFINED qxmlrpc_DIR)
     list(APPEND ep_cache_args
       -DQt5_DIR:PATH=${Qt5_DIR}
       )
+    # XXX Backward compatible way
+    if(DEFINED CMAKE_PREFIX_PATH)
+      list(APPEND ep_cache_args
+        -DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH}
+        )
+    endif()
   endif()
 
   ExternalProject_Add(${proj}