Fix MacOS build

CMakeLists.txt

@@ -38,6 +38,9 @@ endif ()
 # Setup other dependencies
 find_package(spdlog REQUIRED)
 find_package(magic_enum REQUIRED)
+if (APPLE)
+    find_package(range-v3 REQUIRED)
+endif()
 
 # Write version to file to ease packaging
 file(WRITE ${CMAKE_BINARY_DIR}/version.txt ${PROJECT_VERSION})

conanfile.py

@@ -0,0 +1,11 @@
+from conan import ConanFile
+
+
+class KemaiConan(ConanFile):
+    settings = "os", "compiler", "build_type", "arch"
+    generators = "cmake_find_package"
+    requires = ("spdlog/1.11.0", "magic_enum/0.8.2")
+
+    def requirements(self):
+        if self.settings.os == "Macos":
+            self.requires("range-v3/0.12.0")

src/CMakeLists.txt

@@ -106,7 +106,7 @@ elseif (APPLE)
     set(KEMAI_ICNS "${CMAKE_SOURCE_DIR}/bundle/macos/kemai.icns")
     set_source_files_properties(${KEMAI_ICNS} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
     set_target_properties(${PROJECT_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/bundle/macos/Info.plist)
-    target_link_libraries(${PROJECT_NAME} "-framework CoreGraphics")
+    target_link_libraries(${PROJECT_NAME} range-v3::meta "-framework CoreGraphics")
 elseif (UNIX)
     list(APPEND SRCS
             monitor/linuxDesktopEventsMonitor.cpp)

src/client/kimaiCache.cpp

@@ -1,6 +1,14 @@
 #include "kimaiCache.h"
 
+/*
+ * TODO: Removes when std::views is available on MacOS/clang
+ */
+#ifdef Q_OS_MACOS
+#include <range/v3/all.hpp>
+#else
 #include <ranges>
+namespace ranges = std;
+#endif
 
 #include <magic_enum.hpp>
 #include <spdlog/spdlog.h>
@@ -69,7 +77,7 @@ Projects KimaiCache::projects(std::optional<int> customerId) const
 {
     if (customerId.has_value())
     {
-        auto its = mProjects | std::views::filter([id = customerId.value()](auto const& project) { return project.customer.id == id; });
+        auto its = mProjects | ranges::views::filter([id = customerId.value()](auto const& project) { return project.customer.id == id; });
         return {its.begin(), its.end()};
     }
     return mProjects;
@@ -79,7 +87,7 @@ Activities KimaiCache::activities(std::optional<int> projectId) const
 {
     if (projectId.has_value())
     {
-        auto its = mActivities | std::views::filter([id = projectId.value()](auto const& activity) {
+        auto its = mActivities | ranges::views::filter([id = projectId.value()](auto const& activity) {
                        if (!activity.project.has_value())
                        {
                            return true;