--- qsampler/trunk/src/CMakeLists.txt 2020/12/11 19:39:09 3840 +++ qsampler/trunk/src/CMakeLists.txt 2020/12/14 15:49:17 3841 @@ -76,12 +76,12 @@ translations/qsampler_ru.ts ) -qt5_add_translation ( QM_FILES ${TRANSLATIONS} ) -add_custom_target( translations ALL DEPENDS ${QM_FILES} ) +qt_wrap_ui (UI_SOURCES ${FORMS}) +qt_wrap_cpp (MOC_SOURCES ${HEADERS}) +qt_add_resources (QRC_SOURCES ${RESOURCES}) +qt_add_translation (QM_FILES ${TRANSLATIONS}) -qt5_wrap_ui (UI_SOURCES ${FORMS}) -qt5_wrap_cpp (MOC_SOURCES ${HEADERS}) -qt5_add_resources (QRC_SOURCES ${RESOURCES}) +add_custom_target (translations ALL DEPENDS ${QM_FILES}) if (WIN32) set (RC_FILE ${CMAKE_CURRENT_SOURCE_DIR}/win32/${PROJECT_NAME}.rc) @@ -122,10 +122,10 @@ set_target_properties (${PROJECT_NAME} PROPERTIES MACOSX_BUNDLE true) endif () -target_link_libraries (${PROJECT_NAME} PRIVATE Qt5::Widgets) +target_link_libraries (${PROJECT_NAME} PRIVATE Qt${QT_VERSION_MAJOR}::Widgets) if (CONFIG_XUNIQUE) - target_link_libraries (${PROJECT_NAME} PRIVATE Qt5::Network) + target_link_libraries (${PROJECT_NAME} PRIVATE Qt${QT_VERSION_MAJOR}::Network) endif () if (CONFIG_LIBLSCP)