"different way to bring in resources; updates QUItCoding#53"

RespiraWorks · Oct 15, 2021 · e39bb02 · e39bb02
1 parent 92630b7
commit e39bb02
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ jobs:
         run: |
           mkdir build
           cd build
-          cmake -DQNANO_WIDGETS=1 -DQNANO_QUICK=1 ..
+          cmake ..
       - name: Build library
         run: |
           cd build

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -67,6 +67,9 @@ find_package(QT NAMES Qt5 Qt6 Qt4 COMPONENTS Core QUIET)
 message(STATUS "Detected QT major version = ${QT_VERSION_MAJOR}")
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Gui REQUIRED)
 
+# Auto generate moc files
+set(CMAKE_AUTORCC ON)
+
 set(${this_target}_sources
   libqnanopainter
   libqnanopainter/qnanopainter.cpp
@@ -100,8 +103,9 @@ set(${this_target}_headers
   libqnanopainter/nanovg/nanovg.h
   )
 
-qt_add_resources(${this_target}_resources
-  libqnanopainter/libqnanopainterdata.qrc)
+set(${this_target}_resources
+  libqnanopainter/libqnanopainterdata.qrc
+  )
 
 if(${QNANO_BUILD_GLES_BACKENDS})
   message(STATUS "QNanoPainter: Including OpenGL ES backends")