diff options
Diffstat (limited to '')
| -rw-r--r-- | src/before_exit.cpp | 4 | ||||
| -rw-r--r-- | src/main.cpp | 4 | ||||
| -rw-r--r-- | src/ui/CMakeLists.txt | 11 |
3 files changed, 13 insertions, 6 deletions
diff --git a/src/before_exit.cpp b/src/before_exit.cpp index 53878758..074db049 100644 --- a/src/before_exit.cpp +++ b/src/before_exit.cpp @@ -24,7 +24,7 @@ #include "ui/settings/GlobalSettingStation.h" -void before_exit(int status, void *arg) { - LOG(INFO) << "called exit status" << status; +void before_exit() { + LOG(INFO) << "called"; GpgFrontend::UI::GlobalSettingStation::GetInstance().ResetRootCerts(); } diff --git a/src/main.cpp b/src/main.cpp index 06edc084..fef03eb8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -41,7 +41,7 @@ extern void init_logging(); extern void init_certs(); extern void init_locale(); extern void handle_signal(int sig); -extern void before_exit(int status, void* arg); +extern void before_exit(); int main(int argc, char* argv[]) { // Register Signals @@ -50,7 +50,7 @@ int main(int argc, char* argv[]) { signal(SIGILL, handle_signal); // clean something before exit - on_exit(before_exit, nullptr); + atexit(before_exit); // Qt Q_INIT_RESOURCE(gpgfrontend); diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt index 2b18e971..4db300da 100644 --- a/src/ui/CMakeLists.txt +++ b/src/ui/CMakeLists.txt @@ -32,9 +32,16 @@ target_link_libraries(${GPGFRONTEND_UI_LIB_NAME} # link Qt target_link_libraries(${GPGFRONTEND_UI_LIB_NAME} Qt5::Network Qt5::PrintSupport Qt5::Widgets Qt5::Test Qt5::Core) + # link vmime -target_link_libraries(${GPGFRONTEND_UI_LIB_NAME} - gpgfrontend_vmime anl ssl crypto) +if (APPLE) + target_link_libraries(${GPGFRONTEND_UI_LIB_NAME} + gpgfrontend_vmime ssl crypto) +else () + target_link_libraries(${GPGFRONTEND_UI_LIB_NAME} + gpgfrontend_vmime anl ssl crypto) +endif () + # link easyloggingpp target_link_libraries(${GPGFRONTEND_UI_LIB_NAME} easyloggingpp) |