Work on CI builds

emericg · Nov 28, 2024 · b347466 · b347466
1 parent da2ebf1
commit b347466
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/builds_desktop_cmake.yml b/.github/workflows/builds_desktop_cmake.yml
@@ -103,7 +103,7 @@ jobs:
       - name: Build application
         run: |
              export CMAKE_BUILD_PARALLEL_LEVEL=`sysctl -n hw.logicalcpu`
-             cmake -B build/ -DCMAKE_BUILD_TYPE=Release
+             cmake -B build/ -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
              cmake --build build/ --config Release
 
       # Deploy application

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -81,8 +81,6 @@ qt_add_qml_module(${CMAKE_PROJECT_NAME}
         qml/popups/PopupChoice.qml
         qml/popups/PopupDate.qml
         qml/popups/PopupTime.qml
-
-        qml/QmlImports.qml
 )
 
 ################################################################################

diff --git a/thirdparty/ComponentLibrary/CMakeLists.txt b/thirdparty/ComponentLibrary/CMakeLists.txt
@@ -177,7 +177,9 @@ set_source_files_properties(ThemeEngine.qml PROPERTIES
 
 set_target_properties(ComponentLibrary PROPERTIES AUTOMOC ON)
 
-target_link_libraries(ComponentLibrary PRIVATE Qt::Quick)
+find_package(Qt6 REQUIRED COMPONENTS Qml Quick QuickControls2)
+
+target_link_libraries(ComponentLibrary PRIVATE Qt6::Qml Qt6::Quick Qt6::QuickControls2 Qt6::QmlModels)
 
 qt_add_qml_module(ComponentLibrary
     URI ComponentLibrary