Don't use AUTORCC, this would require cmake >= 3.0.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 17e28827aafe3f43e13b99eb8e9e379675e89a6d..45055ab8e66a72f885bdb7580e4e242b44c59817 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,7 +69,6 @@ find_package(PkgConfig)
 pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS})
 
 set(CMAKE_AUTOMOC TRUE)
 pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS})
 
 set(CMAKE_AUTOMOC TRUE)

-set(CMAKE_AUTORCC TRUE)

 
 find_package(Qt5 COMPONENTS Core Gui Widgets Svg REQUIRED)
 
 
 find_package(Qt5 COMPONENTS Core Gui Widgets Svg REQUIRED)
 


@@ -258,7 +257,6 @@ set(pulseview_SOURCES
        pv/widgets/sweeptimingwidget.cpp
        pv/widgets/timestampspinbox.cpp
        pv/widgets/wellarray.cpp
        pv/widgets/sweeptimingwidget.cpp
        pv/widgets/timestampspinbox.cpp
        pv/widgets/wellarray.cpp

-       pulseview.qrc

 )
 
 # This list includes only QObject derived class headers.
 )
 
 # This list includes only QObject derived class headers.


@@ -320,6 +318,10 @@ set(pulseview_HEADERS
        pv/widgets/wellarray.hpp
 )
 
        pv/widgets/wellarray.hpp
 )
 

+set(pulseview_RESOURCES
+       pulseview.qrc
+)
+

 if(ENABLE_SIGNALS)
        list(APPEND pulseview_SOURCES signalhandler.cpp)
        list(APPEND pulseview_HEADERS signalhandler.hpp)
 if(ENABLE_SIGNALS)
        list(APPEND pulseview_SOURCES signalhandler.cpp)
        list(APPEND pulseview_HEADERS signalhandler.hpp)


@@ -360,6 +362,8 @@ if(ANDROID)
        )
 endif()
 
        )
 endif()
 

+qt5_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
+

 #===============================================================================
 #= Global Definitions
 #-------------------------------------------------------------------------------
 #===============================================================================
 #= Global Definitions
 #-------------------------------------------------------------------------------


@@ -435,9 +439,9 @@ if(ANDROID)
 endif()
 
 if(ANDROID)
 endif()
 
 if(ANDROID)

-       add_library(${PROJECT_NAME} SHARED ${pulseview_SOURCES})
+       add_library(${PROJECT_NAME} SHARED ${pulseview_SOURCES} ${pulseview_RESOURCES_RCC})

 else()
 else()

-       add_executable(${PROJECT_NAME} ${pulseview_SOURCES})
+       add_executable(${PROJECT_NAME} ${pulseview_SOURCES} ${pulseview_RESOURCES_RCC})

 endif()
 
 target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS})
 endif()
 
 target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS})