diff options
| author | saturneric <[email protected]> | 2023-10-15 19:49:11 +0000 |
|---|---|---|
| committer | saturneric <[email protected]> | 2023-10-15 19:49:11 +0000 |
| commit | 645980569242fb80781276e4fc8543305dcfdb7e (patch) | |
| tree | e55773ed871ae61518b5f6b0cb80c2aad0c71c98 | |
| parent | feat: start to add plugin system and do some improve on project configuration (diff) | |
| parent | fix: slove build problem on platform aarch64 (diff) | |
| download | GpgFrontend-645980569242fb80781276e4fc8543305dcfdb7e.tar.gz GpgFrontend-645980569242fb80781276e4fc8543305dcfdb7e.zip | |
merge: branch 'dev/2.1.1/main' of github.com:saturneric/GpgFrontend into dev/2.1.1/main
Diffstat (limited to '')
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/main.cpp | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 66d45a05..8d889bd7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -81,7 +81,6 @@ if (BUILD_APPLICATION) endif () endif () - if (BUILD_CORE_MODULE) message("[*] Build Core Module") add_subdirectory(core) @@ -94,7 +93,6 @@ endif () if (BUILD_PLUGIN_MODULE) message("[*] Build Plugin Module") - add_subdirectory(plugin) endif () if (BUILD_APPLICATION) @@ -518,7 +516,7 @@ if (LINUX AND LINUX_INSTALL_SOFTWARE) DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/${AppName}/) install(FILES ${CMAKE_SOURCE_DIR}/resource/appstream/com.bktus.gpgfrontend.appdata.xml DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/metainfo/) - install(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/appstream/com.bktus.gpgfrontend.desktop + install(FILES ${CMAKE_SOURCE_DIR}/resource/appstream/com.bktus.gpgfrontend.desktop DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications/) install(DIRECTORY ${CMAKE_SOURCE_DIR}/resource/lfs/pixmaps/ DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/pixmaps/) diff --git a/src/main.cpp b/src/main.cpp index 42c52bc7..44176945 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -39,7 +39,7 @@ #include "core/GpgConstants.h" #include "core/GpgCoreInit.h" #include "core/function/GlobalSettingStation.h" -#include "plugin/GpgFrontendPluginInit.h" +// #include "plugin/GpgFrontendPluginInit.h" #include "spdlog/spdlog.h" #include "ui/GpgFrontendApplication.h" #include "ui/GpgFrontendUIInit.h" @@ -120,7 +120,7 @@ int main(int argc, char* argv[]) { GpgFrontend::UI::InitUILoggingSystem(); // init the logging system for ui - GpgFrontend::Plugin::InitPluginLoggingSystem(); + // GpgFrontend::Plugin::InitPluginLoggingSystem(); // change path to search for related init_global_path_env(); @@ -168,7 +168,7 @@ int main(int argc, char* argv[]) { } while (return_from_event_loop_code == RESTART_CODE && restart_count < 3); // shutdown the logging system for core - GpgFrontend::Plugin::ShutdownPluginLoggingSystem(); + // GpgFrontend::Plugin::ShutdownPluginLoggingSystem(); // shutdown the logging system for ui GpgFrontend::UI::ShutdownUILoggingSystem(); |