From b5ab9cf35e8d244e3b60e5e8d6a0e2720dce3353 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Thu, 16 Nov 2017 12:56:05 +0100 Subject: fix qresource precompilation with cmake --- CMakeLists.txt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e7d4cd..97116b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,6 @@ FIND_PACKAGE(X11 REQUIRED) FIND_PACKAGE(VNC REQUIRED) SET(CMAKE_AUTOMOC ON) -SET(CMAKE_AUTORCC ON) # some includes INCLUDE_DIRECTORIES( @@ -85,8 +84,12 @@ FILE(GLOB PVSCLIENT_UIS ) # .qrc files -SET(PVSMGR_RCS pvsmgr.qrc) -SET(PVSCLIENT_RCS pvsclient.qrc) +FILE(GLOB PVSMGR_RC_SRCS + pvsmgr.qrc +) +FILE(GLOB PVSCLIENT_RC_SRCS + pvsclient.qrc +) # includes all header files that should be treated with moc #FILE(GLOB PVSMGR_MOC_HDRS @@ -121,8 +124,8 @@ FILE(GLOB PVSCLIENT_TSS #INCLUDE(${QT_USE_FILE}) # this will run rcc on .qrc files -#QT4_ADD_RESOURCES(PVSMGR_RC_SRCS ${PVSMGR_RCS}) -#QT4_ADD_RESOURCES(PVSCLIENT_RC_SRCS ${PVSCLIENT_RCS}) +QT5_ADD_RESOURCES(PVSMGR_RCS ${PVSMGR_RC_SRCS}) +QT5_ADD_RESOURCES(PVSCLIENT_RCS ${PVSCLIENT_RC_SRCS}) # this will run uic on .ui files QT5_WRAP_UI(PVSMGR_UI_HDRS ${PVSMGR_UIS}) -- cgit v1.2.3-55-g7522