File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -17,6 +17,16 @@ if (NOT Qt6_FOUND)
1717 find_package (Qt5 COMPONENTS Core Gui Widgets Network PrintSupport SerialBus SerialPort Qml Help LinguistTools QUIET )
1818endif ()
1919
20+ if (Qt6_FOUND)
21+ get_target_property (QT_BINARY_DIR Qt6::qmake IMPORTED_LOCATION )
22+ get_filename_component (QT_BINARY_DIR "${QT_BINARY_DIR} " DIRECTORY )
23+ get_filename_component (QT_LIBEXEC_DIR "${QT_BINARY_DIR} /../libexec" REALPATH )
24+ else ()
25+ get_target_property (QT_BINARY_DIR Qt5::qmake IMPORTED_LOCATION )
26+ get_filename_component (QT_BINARY_DIR "${QT_BINARY_DIR} " DIRECTORY )
27+ set (QT_LIBEXEC_DIR "${QT_BINARY_DIR} " )
28+ endif ()
29+
2030# Define target
2131add_executable (omodsim )
2232
@@ -230,7 +240,7 @@ set(JSHELP_QHC "${CMAKE_BINARY_DIR}/docs/jshelp.qhc")
230240file (MAKE_DIRECTORY ${CMAKE_BINARY_DIR} /docs )
231241
232242find_program (QHELP_GENERATOR_EXECUTABLE qhelpgenerator
233- HINTS "${QT_BIN_DIR } "
243+ HINTS "${QT_BINARY_DIR} " " ${QT_LIBEXEC_DIR } "
234244 NO_DEFAULT_PATH )
235245if (NOT QHELP_GENERATOR_EXECUTABLE)
236246 find_program (QHELP_GENERATOR_EXECUTABLE qhelpgenerator )
You can’t perform that action at this time.
0 commit comments