init

2026-02-16 14:22:03 +01:00
parent ad742a38bd
commit 9e088c2024
38 changed files with 934 additions and 1973 deletions
@@ -1,18 +1,15 @@
 cmake_minimum_required(VERSION 3.16)

-project(Wallpaper_Carousel VERSION 1.0.3 LANGUAGES CXX)
+project(Wallpaper_Carousel VERSION 0.1 LANGUAGES CXX)

-set(EXECUTABLE_NAME "wallpaper-carousel")
+set(EXECUTABLE_NAME "wallreel")
+set(CORELIB_NAME "wallreel-core")
+set(UILIB_NAME "wallreel-ui")
+set(COREMODULE_URI "WallReel.Core")
+set(UIMODULE_URI "WallReel.UI")
+set(MODULE_VERSION_MAJOR 1)
+set(MODULE_VERSION_MINOR 0)

-configure_file(src/version.h.in ${CMAKE_BINARY_DIR}/generated/version.h)
-
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-
-set(CMAKE_AUTOUIC_SEARCH_PATHS src/designer)
-
-set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

@@ -20,72 +17,50 @@ if(NOT CMAKE_BUILD_TYPE)
    set(CMAKE_BUILD_TYPE Release)
 endif()

-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
-find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets)
-
-set(PROJECT_SOURCES
-    src/main.cpp
-    src/main_window.cpp
-    src/main_window.h
-    src/designer/main_window.ui
-)
-
-if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
-    qt_add_executable(${EXECUTABLE_NAME}
-        MANUAL_FINALIZATION
-        ${PROJECT_SOURCES}
-        src/utils.h
-        src/images_carousel.h src/images_carousel.cpp src/designer/images_carousel.ui
-        src/config.h src/config.cpp
-        src/logger.h src/logger.cpp
-        src/loading_indicator.h src/loading_indicator.cpp src/designer/loading_indicator.ui
-        src/image_item.h src/image_item.cpp
-    )
-
-# Define target properties for Android with Qt 6 as:
-# set_property(TARGET wallpaper_chooser APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR
-# ${CMAKE_CURRENT_SOURCE_DIR}/android)
-# For more information, see https://doc.qt.io/qt-6/qt-add-executable.html#target-creation
-else()
-    if(ANDROID)
-        add_library(${EXECUTABLE_NAME} SHARED
-            ${PROJECT_SOURCES}
-        )
-
-    # Define properties for Android with Qt 5 after find_package() calls as:
-    # set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android")
-    else()
-        add_executable(${EXECUTABLE_NAME}
-            ${PROJECT_SOURCES}
-        )
-    endif()
+if(CMAKE_BUILD_TYPE STREQUAL "Release")
+    add_definitions(-DSUPPRESS_QRC_LOG)
 endif()

-target_link_libraries(${EXECUTABLE_NAME} PRIVATE Qt${QT_VERSION_MAJOR}::Widgets)
+configure_file(src/version.h.in ${CMAKE_BINARY_DIR}/generated/version.h)

-target_include_directories(${EXECUTABLE_NAME} PRIVATE src ${CMAKE_BINARY_DIR}/generated)
+find_package(Qt6 REQUIRED COMPONENTS Quick Widgets QuickControls2 Concurrent)

-# if(NOT ${CMAKE_BUILD_TYPE} STREQUAL "Debug")
-# target_compile_definitions(wallpaper_chooser PRIVATE
-# GENERAL_LOGGER_DISABLED
-# )
-# endif()
+qt_standard_project_setup(REQUIRES 6.5)
+
+qt_policy(SET QTP0004 NEW)
+
+add_subdirectory(src/core)
+add_subdirectory(src/ui)
+
+add_executable(${EXECUTABLE_NAME}
+    src/main.cpp
+)

 # Qt for iOS sets MACOSX_BUNDLE_GUI_IDENTIFIER automatically since Qt 6.1.
 # If you are developing for iOS or macOS you should consider setting an
 # explicit, fixed bundle identifier manually though.
-if(${QT_VERSION} VERSION_LESS 6.1.0)
-    set(BUNDLE_ID_OPTION MACOSX_BUNDLE_GUI_IDENTIFIER com.example.wallpaper_chooser)
-endif()
-
 set_target_properties(${EXECUTABLE_NAME} PROPERTIES
-    ${BUNDLE_ID_OPTION}
+
+    # MACOSX_BUNDLE_GUI_IDENTIFIER com.example.wallpaper-carousel
    MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
    MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
    MACOSX_BUNDLE TRUE
    WIN32_EXECUTABLE TRUE
 )

+target_link_libraries(${EXECUTABLE_NAME} PRIVATE
+    Qt6::Quick
+    Qt6::Widgets
+    Qt6::QuickControls2
+    Qt6::Concurrent
+    ${CORELIB_NAME}
+    ${UILIB_NAME}
+)
+
+target_include_directories(${EXECUTABLE_NAME} PRIVATE
+    ${CMAKE_BINARY_DIR}/generated
+)
+
 include(GNUInstallDirs)
 install(TARGETS ${EXECUTABLE_NAME}
    BUNDLE DESTINATION .
@@ -96,7 +71,3 @@ install(TARGETS ${EXECUTABLE_NAME}
 install(FILES ${CMAKE_CURRENT_LIST_DIR}/app/${EXECUTABLE_NAME}.desktop
    DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications
 )
-
-if(QT_VERSION_MAJOR EQUAL 6)
-    qt_finalize_executable(${EXECUTABLE_NAME})
-endif()