Base for c++ modules

CMakeLists.txt

@@ -1,5 +1,5 @@
 
-cmake_minimum_required(VERSION 3.25)
+cmake_minimum_required(VERSION 3.28)
 project(PhotoBroom VERSION 1.7.0 LANGUAGES CXX)
 
 if(POLICY CMP0140)

src/core/CMakeLists.txt

@@ -130,6 +130,7 @@ target_include_directories(core
 )
 
 set_target_properties(core PROPERTIES AUTOMOC TRUE)
+set_target_properties(core PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
 generate_export_header(core)
 hideSymbols(core)

src/core/implementation/configuration.cpp

@@ -27,10 +27,10 @@
 #include <QFileInfo>
 #include <QVariant>
 
-#include <system/system.hpp>
-
 #include "constants.hpp"
 
+import system;
+
 
 ConfigurationPrivate::ConfigurationPrivate(IConfigStorage& configStorage):
     m_configStorage(configStorage),

src/core/implementation/thumbnail_generator.cpp

@@ -23,7 +23,6 @@
 #include <QFileInfo>
 #include <opencv2/opencv.hpp>
 
-#include <system/system.hpp>
 #include "constants.hpp"
 #include "iconfiguration.hpp"
 #include "iexif_reader.hpp"
@@ -32,6 +31,8 @@
 #include "media_types.hpp"
 #include "video_media_information.hpp"
 
+import system;
+
 
 ThumbnailGenerator::ThumbnailGenerator(ILogger* logger, IExifReaderFactory& exif):
     m_logger(logger),

src/face_recognition/dlib_wrapper/dlib_face_recognition_api.cpp

@@ -5,13 +5,14 @@
 
 #include <core/ilogger.hpp>
 #include <core/lazy_ptr.hpp>
-#include <system/filesystem.hpp>
 
 #include "cnn_face_detector.hpp"
 #include "face_recognition.hpp"
 #include "dlib_face_recognition_api.hpp"
 #include "helpers.hpp"
 
+import system;
+
 
 #ifdef DLIB_USE_CUDA
 #define CUDA_AVAILABLE true

src/face_recognition/face_recognition.cpp

@@ -41,13 +41,14 @@
 #include <database/filter.hpp>
 #include <database/ibackend.hpp>
 #include <database/idatabase.hpp>
-#include <system/filesystem.hpp>
-#include <system/system.hpp>
 
 #include "dlib_wrapper/dlib_face_recognition_api.hpp"
 #include "unit_tests_utils/empty_logger.hpp"
 
 
+import system;
+
+
 using namespace std::placeholders;
 
 namespace
@@ -129,7 +130,7 @@ int FaceRecognition::recognize(const Person::Fingerprint& unknown, const std::ve
 
 QVector<QRect> FaceRecognition::fetchFaces(const OrientedImage& orientedPhoto, double scale) const
 {
-    std::lock_guard lock(g_dlibMutex);
+    std::lock_guard<std::mutex> lock(g_dlibMutex);
     QVector<QRect> result;
 
     const QSize scaledSize = orientedPhoto.get().size() * scale;

src/gui/desktop/models/photo_properties_model.cpp

@@ -24,7 +24,8 @@
 #include <QDir>
 #include <QFileInfo>
 
-#include <system/filesystem.hpp>
+
+import system;
 
 
 namespace

src/gui/desktop/ui/mainwindow.cpp

@@ -26,7 +26,6 @@
 #include <database/database_executor_traits.hpp>
 #include <project_utils/iproject_manager.hpp>
 #include <project_utils/project.hpp>
-#include <system/system.hpp>
 #include <features.hpp>
 
 #include "config.hpp"

src/gui/desktop/ui/photos_grouping_dialog.cpp

@@ -10,7 +10,6 @@
 #include <core/containers_utils.hpp>
 #include <core/iexif_reader.hpp>
 #include <core/tags_utils.hpp>
-#include <system/system.hpp>
 #include <project_utils/project.hpp>
 #include <project_utils/misc.hpp>
 

src/gui/desktop/utils/grouppers/animation_generator.cpp

@@ -27,7 +27,8 @@
 #include <webp_generator.hpp>
 
 #include <core/function_wrappers.hpp>
-#include <system/system.hpp>
+
+import system;
 
 using std::placeholders::_1;
 

src/gui/desktop/utils/grouppers/generator_utils.cpp

@@ -25,7 +25,8 @@
 #include <core/image_aligner.hpp>
 #include <core/image_tools.hpp>
 #include <core/utils.hpp>
-#include <system/system.hpp>
+
+import system;
 
 #include "generator_utils.hpp"
 

src/gui/desktop/utils/grouppers/hdr_generator.cpp

@@ -19,11 +19,12 @@
 #include <QImage>
 #include <opencv2/imgcodecs.hpp>
 
-#include "hdr_generator.hpp"
-
 #include <core/image_aligner.hpp>
 #include <core/hdr_assembler.hpp>
-#include <system/system.hpp>
+
+#include "hdr_generator.hpp"
+
+import system;
 
 
 HDRGenerator::HDRGenerator(const Data& data, ILogger* logger, IExifReaderFactory& exif):

src/gui/desktop/utils/groups_manager.cpp

@@ -24,11 +24,12 @@
 #include <database/iphoto_operator.hpp>
 #include <database/photo_utils.hpp>
 #include <project_utils/misc.hpp>
-#include <system/system.hpp>
 
 #include "utils/grouppers/collage_generator.hpp"
 #include "groups_manager.hpp"
 
+import system;
+
 
 QString GroupsManager::includeRepresentatInDatabase(const QString& representativePhoto, Project& project)
 {

src/plugins/CMakeLists.txt

@@ -32,4 +32,3 @@ target_link_libraries(plugins
 )
 
 generate_export_header(plugins)
-hideSymbols(plugins)

src/plugins/implementation/plugin_loader.cpp

@@ -27,10 +27,12 @@
 #include <core/ilogger.hpp>
 #include <core/ilogger_factory.hpp>
 #include <core/cast.hpp>
-#include <system/filesystem.hpp>
 #include <database/idatabase_plugin.hpp>
 
 
+import system;
+
+
 namespace
 {
     struct PluginFinder final

src/project_utils/implementation/misc.cpp

@@ -8,7 +8,8 @@
 #include <QTemporaryFile>
 
 #include "project.hpp"
-#include <system/system.hpp>
+
+import system;
 
 
 namespace

src/project_utils/implementation/project_manager.cpp

@@ -31,10 +31,11 @@
 #include <database/project_info.hpp>
 #include <database/idatabase.hpp>
 #include <plugins/iplugin_loader.hpp>
-#include <system/system.hpp>
 
 #include "project.hpp"
 
+import system;
+
 
 ProjectManager::ProjectManager(Database::IBuilder& builder): m_dbBuilder(builder)
 {

src/system/CMakeLists.txt

@@ -22,36 +22,36 @@ elseif(UNIX)
 
 endif(WIN32)
 
-
-# common stuff
-set(SYSTEM_SOURCES ${SYSTEM_SOURCES}
-                   implementation/filesystem.cpp
-                   implementation/system.cpp
-)
-
-set(SYSTEM_HEADERS
-        system.hpp
-        filesystem.hpp
-)
-
 if(WIN32)
     configure_file(paths_win.hpp.cmake ${CMAKE_BINARY_DIR}/paths.hpp @ONLY)
 else()
     configure_file(paths_unix.hpp.cmake ${CMAKE_BINARY_DIR}/paths.hpp @ONLY)
 endif()
 
-add_library(system ${SYSTEM_SOURCES} ${SYSTEM_HEADERS})
+
+add_library(system)
+
+target_sources(system
+    PUBLIC FILE_SET CXX_MODULES FILES
+        system.cxx
+        implementation/filesystem.cpp
+        implementation/system.cpp
+
+    PRIVATE
+        #${SYSTEM_SOURCES}
+)
+
 target_include_directories(system
                             PUBLIC
                                 ${CMAKE_CURRENT_BINARY_DIR}
                                 ${CMAKE_BINARY_DIR}
                             PRIVATE
                                 ${CMAKE_CURRENT_SOURCE_DIR}
 )
+
 target_link_libraries(system PRIVATE Qt::Core)
 
 hideSymbols(system)
-generate_export_header(system)
 
 if(BUILD_SHARED_LIBS)
     install(TARGETS system RUNTIME DESTINATION ${PATH_LIBS}
@@ -60,5 +60,5 @@ endif()
 
 
 if(BUILD_TESTING)
-    include(system_tests.cmake)
+    #include(system_tests.cmake)
 endif()

src/system/implementation/filesystem.cpp

@@ -17,12 +17,29 @@
  *
  */
 
-#include "filesystem.hpp"
+module;
 
 #include <QDir>
 
 #include "paths.hpp"
 
+export module system:filesystem;
+
+
+export struct FileSystem
+{
+        QString getPluginsPath() const;
+        QString getTranslationsPath() const;
+        QString getLibrariesPath() const;
+        QString getScriptsPath() const;
+        QString getDataPath() const;
+
+        QString commonPath(const QString &, const QString &) const;
+
+    private:
+        QString read(const char *) const;
+};
+
 QString FileSystem::getPluginsPath() const
 {
     return read(Paths::plugins);