COMP: cmake: Include CTK_Qt5_DIR and CTK_CMAKE_PREFIX_PATH to CTKConfig and UseCTK

CMake/LastConfigureStep/CTKGenerateCTKConfig.cmake

@@ -145,7 +145,13 @@ set(CTK_CONFIG_CODE "####### Expanded from \@CTK_CONFIG_CODE\@ #######\n")
 set(CTK_CONFIG_CODE "${CTK_CONFIG_CODE}# The CTK DGraph executable used to compute target dependency graphs\n")
 set(CTK_CONFIG_CODE "${CTK_CONFIG_CODE}set(CTK_DGRAPH_EXECUTABLE \"${DGraph_EXECUTABLE}\")\n")
 set(CTK_CONFIG_CODE "${CTK_CONFIG_CODE}# Qt configuration\n")
-set(CTK_CONFIG_CODE "${CTK_CONFIG_CODE}set(CTK_QT_QMAKE_EXECUTABLE \"${QT_QMAKE_EXECUTABLE}\")\n") # FIXME: Just pass Qt version (and bitness?)
+if(CTK_QT_VERSION STREQUAL "4")
+  set(CTK_CONFIG_CODE "${CTK_CONFIG_CODE}set(CTK_QT_QMAKE_EXECUTABLE \"${QT_QMAKE_EXECUTABLE}\")\n") # FIXME: Just pass Qt version (and bitness?)
+elseif(DEFINED Qt5_DIR)
+  set(CTK_CONFIG_CODE "${CTK_CONFIG_CODE}set(CTK_Qt5_DIR \"${Qt5_DIR}\")\n")
+elseif(DEFINED CMAKE_PREFIX_PATH)
+  set(CTK_CONFIG_CODE "${CTK_CONFIG_CODE}set(CTK_CMAKE_PREFIX_PATH \"${CMAKE_PREFIX_PATH}\")\n")
+endif()
 set(CTK_CONFIG_CODE "${CTK_CONFIG_CODE}# The CTK Qt designer plugins directory\n")
 set(CTK_CONFIG_CODE "${CTK_CONFIG_CODE}set(CTK_QTDESIGNERPLUGINS_DIR \"${CMAKE_LIBRARY_OUTPUT_DIRECTORY}\")\n")
 set(CTK_CONFIG_CODE "${CTK_CONFIG_CODE}# CTK library include dirctories\n")

CMake/UseCTK.cmake.in

@@ -35,8 +35,18 @@ if(NOT CTK_USE_FILE_INCLUDED)
   endif()
   include_directories(${new_include_directories})
 
-  if (NOT DEFINED QT_QMAKE_EXECUTABLE)
+  if(NOT DEFINED QT_QMAKE_EXECUTABLE AND CTK_QT_VERSION STREQUAL "4")
     set(QT_QMAKE_EXECUTABLE ${CTK_QT_QMAKE_EXECUTABLE})
   endif()
 
+  if(CTK_QT_VERSION STREQUAL "5")
+    if(NOT DEFINED Qt5_DIR AND DEFINED CTK_Qt5_DIR)
+      # Setting "Qt5_DIR" is the preferred approach
+      set(Qt5_DIR ${CTK_Qt5_DIR})
+    elseif(NOT DEFINED CMAKE_PREFIX_PATH AND DEFINED CTK_CMAKE_PREFIX_PATH)
+      # Support for "CMAKE_PREFIX_PATH" is here for backward compatibility
+      set(CMAKE_PREFIX_PATH ${CTK_CMAKE_PREFIX_PATH})
+    endif()
+  endif()
+
 endif()