s

danmar · Sep 21, 2024 · 5ce8333 · 5ce8333
1 parent f8ce612
commit 5ce8333
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake
@@ -31,8 +31,14 @@ if(BUILD_GUI)
 
     if(WIN32)
         # TODO: how to get the proper folder to look for Qt binaries in
-        # piggy-back off WINDEPLOYQT_EXECUTABLE for now as it is in the same folder as the binary we are looking for
-        get_filename_component(_qt_bin_dir ${WINDEPLOYQT_EXECUTABLE} DIRECTORY)
+        if(WINDEPLOYQT_EXECUTABLE)
+            # piggy-back off WINDEPLOYQT_EXECUTABLE for now as it is in the same folder as the binary we are looking for
+            get_filename_component(_qt_bin_dir ${WINDEPLOYQT_EXECUTABLE} DIRECTORY)
+        else()
+            # WINDEPLOYQT_EXECUTABLE does not seem to exist with Qt5 so piggy-back off another variable
+            get_target_property(_qmake_executable Qt5::qmake IMPORTED_LOCATION)
+            get_filename_component(_qt_bin_dir "${_qmake_executable}" DIRECTORY)
+        endif()
         find_program(QHELPGENERATOR qhelpgenerator HINTS ${_qt_bin_dir} REQUIRED)
     else()
         find_program(QHELPGENERATOR qhelpgenerator REQUIRED)