Mercurial > ldforge2 / file diff

--- a/widgets/CMakeLists.txt	Wed Jun 22 23:51:06 2022 +0300
+++ b/widgets/CMakeLists.txt	Sun Jun 26 19:44:45 2022 +0300
@@ -1,5 +1,4 @@
-find_package(Qt5 REQUIRED COMPONENTS UiPlugin)
-qt5_wrap_ui(LDFORGEWIDGETS_FORMS
+qt_wrap_ui(LDFORGEWIDGETS_FORMS
 	vec3editor.ui
 	multiplyfactordialog.ui
 	matrixeditor.ui
@@ -21,14 +20,14 @@
 	${LDFORGEWIDGETS_FORMS}
 )
 
-get_target_property(Qt5UiPlugin_INCLUDES Qt5::UiPlugin INTERFACE_INCLUDE_DIRECTORIES)
-target_include_directories(ldforgewidgets PUBLIC ${Qt5UiPlugin_INCLUDES})
+get_target_property(UIPLUGIN_INCLUDES QtUiPlugin INTERFACE_INCLUDE_DIRECTORIES)
+target_include_directories(ldforgewidgets PUBLIC "${UIPLUGIN_INCLUDES}")
 target_include_directories(ldforgewidgets PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
 target_include_directories(ldforgewidgets PUBLIC "${CMAKE_CURRENT_BINARY_DIR}")
-target_link_libraries(ldforgewidgets Qt5::Widgets)
+target_link_libraries(ldforgewidgets Qt::Widgets)
 set_target_properties(ldforgewidgets PROPERTIES AUTOMOC 1)
 
-get_target_property(QT_QMAKE_EXECUTABLE Qt5::qmake LOCATION)
+get_target_property(QT_QMAKE_EXECUTABLE Qt::qmake LOCATION)
 execute_process(COMMAND ${QT_QMAKE_EXECUTABLE} -query QT_INSTALL_PLUGINS
 	OUTPUT_VARIABLE QT_INSTALL_PLUGINS OUTPUT_STRIP_TRAILING_WHITESPACE
 )