diff -r b2b7af293c46 -r 2800a15e2a2f widgets/CMakeLists.txt --- a/widgets/CMakeLists.txt Mon Jun 27 01:09:18 2022 +0300 +++ b/widgets/CMakeLists.txt Mon Jun 27 01:28:04 2022 +0300 @@ -1,10 +1,12 @@ -qt_wrap_ui(LDFORGEWIDGETS_FORMS +set(WIDGETLIB "${PROJECT_NAME}widgets" PARENT_SCOPE) +set(WIDGETLIB "${PROJECT_NAME}widgets") +qt_wrap_ui(WIDGETS_FORMS vec3editor.ui multiplyfactordialog.ui matrixeditor.ui ) -add_library(ldforgewidgets SHARED +add_library(${WIDGETLIB} SHARED colorbutton.cpp colorbutton.h designerplugins.cpp @@ -17,21 +19,21 @@ vec3editor.h multiplyfactordialog.cpp multiplyfactordialog.h - ${LDFORGEWIDGETS_FORMS} + ${WIDGETS_FORMS} ) get_target_property(UIPLUGIN_INCLUDES QtUiPlugin INTERFACE_INCLUDE_DIRECTORIES) -target_include_directories(ldforgewidgets PUBLIC "${UIPLUGIN_INCLUDES}") -target_include_directories(ldforgewidgets PUBLIC "${CMAKE_SOURCE_DIR}") -target_include_directories(ldforgewidgets PUBLIC "${CMAKE_CURRENT_BINARY_DIR}") -target_link_libraries(ldforgewidgets Qt::Widgets) -set_target_properties(ldforgewidgets PROPERTIES AUTOMOC 1) +target_include_directories(${WIDGETLIB} PUBLIC "${UIPLUGIN_INCLUDES}") +target_include_directories(${WIDGETLIB} PUBLIC "${CMAKE_SOURCE_DIR}") +target_include_directories(${WIDGETLIB} PUBLIC "${CMAKE_CURRENT_BINARY_DIR}") +target_link_libraries(${WIDGETLIB} Qt::Widgets) +set_target_properties(${WIDGETLIB} PROPERTIES AUTOMOC 1) 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 ) -install(TARGETS ldforgewidgets LIBRARY DESTINATION lib) -install(TARGETS ldforgewidgets +install(TARGETS ${WIDGETLIB} LIBRARY DESTINATION lib) +install(TARGETS ${WIDGETLIB} LIBRARY DESTINATION ${QT_INSTALL_PLUGINS}/designer )