diff options
| author | Saturneric <[email protected]> | 2022-02-05 09:37:48 +0000 |
|---|---|---|
| committer | Saturneric <[email protected]> | 2022-02-05 09:37:48 +0000 |
| commit | d772e583155f0e4f12fd6e72092a2d4fa32ac203 (patch) | |
| tree | ae43201ed9dc190b00934c4b52fe3b9607d68367 /src | |
| parent | <refactor>(ui, core, project): Use std::filesystem instead of boost::filesystem (diff) | |
| download | GpgFrontend-d772e583155f0e4f12fd6e72092a2d4fa32ac203.tar.gz GpgFrontend-d772e583155f0e4f12fd6e72092a2d4fa32ac203.zip | |
<chore>(project, ci): Make the Windows platform pass the compilation
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/ui/main_window/MainWindow.cpp | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 607119b4..0a81e5dc 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -46,7 +46,12 @@ target_link_libraries(gpgfrontend_core gpgme assuan gpg-error) # link openssl target_link_libraries(gpgfrontend_core OpenSSL::SSL OpenSSL::Crypto) # link libarchive -target_link_libraries(gpgfrontend_core archive_static) +if (MINGW) + find_library(LIBARCHIVE_LIB libarchive.a) + target_link_libraries(gpgfrontend_core ${LIBARCHIVE_LIB}) +else () + target_link_libraries(gpgfrontend_core archive_static) +endif () # link json target_link_libraries(gpgfrontend_core nlohmann_json::nlohmann_json) diff --git a/src/ui/main_window/MainWindow.cpp b/src/ui/main_window/MainWindow.cpp index ee5c1c2c..18b40f78 100644 --- a/src/ui/main_window/MainWindow.cpp +++ b/src/ui/main_window/MainWindow.cpp @@ -126,8 +126,8 @@ void MainWindow::init() noexcept { connect(version_thread, &VersionCheckThread::finished, version_thread, &VersionCheckThread::deleteLater); - connect(version_thread, &VersionCheckThread::upgradeVersion, this, - &MainWindow::slotVersionUpgrade); + connect(version_thread, &VersionCheckThread::SignalUpgradeVersion, this, + &MainWindow::slot_version_upgrade); version_thread->start(); #endif |