GerbilSoft/rvthtool
1
Fork 0
mirror of https://github.com/GerbilSoft/rvthtool.git synced 2025-06-18 19:45:35 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

[qrvthtool] CMakeLists.txt: Fix the QT_WRAP_*() functions on Qt 5.5.1.

Browse Source 
QT_WRAP_CPP is somehow being detected as a "command", even though
it's not a valid function. Use a version check instead.

This fixes QT_WRAP_*() issues on Xubuntu 16.04, which has Qt 5.5.1.
This commit is contained in:
David Korth 2022-08-01 19:07:56 -04:00
parent 1d98eb4eee
commit 8b8cc807e5
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/qrvthtool/CMakeLists.txt
View File

@ -33,30 +33,24 @@ IF(QT_VERSION EQUAL 5)
# Qt 5.15/6 has qt_wrap_cpp. # Qt 5.15/6 has qt_wrap_cpp.
# We can't depend on having Qt 5.15, though. # We can't depend on having Qt 5.15, though.
IF(NOT COMMAND QT_WRAP_CPP) IF(Qt5_VERSION VERSION_LESS 5.15.0)
FUNCTION(QT_WRAP_CPP outfiles) FUNCTION(QT_WRAP_CPP outfiles)
QT5_WRAP_CPP("${outfiles}" ${ARGN}) QT5_WRAP_CPP(${outfiles} ${ARGN})
SET("${outfiles}" "${${outfiles}}" PARENT_SCOPE) SET(${outfiles} ${${outfiles}} PARENT_SCOPE)
ENDFUNCTION(QT_WRAP_CPP) ENDFUNCTION(QT_WRAP_CPP)
ENDIF(NOT COMMAND QT_WRAP_CPP)
IF(NOT COMMAND QT_ADD_RESOURCES)
FUNCTION(QT_ADD_RESOURCES outfiles) FUNCTION(QT_ADD_RESOURCES outfiles)
QT5_ADD_RESOURCES("${outfiles}" ${ARGN}) QT5_ADD_RESOURCES("${outfiles}" ${ARGN})
SET("${outfiles}" "${${outfiles}}" PARENT_SCOPE) SET("${outfiles}" "${${outfiles}}" PARENT_SCOPE)
ENDFUNCTION(QT_ADD_RESOURCES) ENDFUNCTION(QT_ADD_RESOURCES)
ENDIF(NOT COMMAND QT_ADD_RESOURCES)
IF(NOT COMMAND QT_WRAP_UI)
FUNCTION(QT_WRAP_UI outfiles) FUNCTION(QT_WRAP_UI outfiles)
QT5_WRAP_UI("${outfiles}" ${ARGN}) QT5_WRAP_UI("${outfiles}" ${ARGN})
SET("${outfiles}" "${${outfiles}}" PARENT_SCOPE) SET("${outfiles}" "${${outfiles}}" PARENT_SCOPE)
ENDFUNCTION(QT_WRAP_UI) ENDFUNCTION(QT_WRAP_UI)
ENDIF(NOT COMMAND QT_WRAP_UI)
IF(NOT COMMAND QT_ADD_DBUS_INTERFACES)
FUNCTION(QT_ADD_DBUS_INTERFACES sources) FUNCTION(QT_ADD_DBUS_INTERFACES sources)
QT5_ADD_DBUS_INTERFACE("${sources}" ${ARGN}) QT5_ADD_DBUS_INTERFACE("${sources}" ${ARGN})
SET("${sources}" "${${sources}}" PARENT_SCOPE) SET("${sources}" "${${sources}}" PARENT_SCOPE)
ENDFUNCTION(QT_ADD_DBUS_INTERFACES sources) ENDFUNCTION(QT_ADD_DBUS_INTERFACES sources)
ENDIF(NOT COMMAND QT_ADD_DBUS_INTERFACES) ENDIF(Qt5_VERSION VERSION_LESS 5.15.0)
ELSEIF(QT_VERSION EQUAL 6) ELSEIF(QT_VERSION EQUAL 6)
# Find Qt6. # Find Qt6.
SET(Qt6_NO_LINK_QTMAIN 1) SET(Qt6_NO_LINK_QTMAIN 1)