diff options
| author | Saturneric <[email protected]> | 2022-05-07 21:25:24 +0000 |
|---|---|---|
| committer | Saturneric <[email protected]> | 2022-05-07 21:25:24 +0000 |
| commit | 9a9f648824cbfc1b9075e1793504e541a700a721 (patch) | |
| tree | 3e5c4c0182887436eb1990817146511995324b95 /src | |
| parent | fix: link issue of intl in linux platform (diff) | |
| download | GpgFrontend-9a9f648824cbfc1b9075e1793504e541a700a721.tar.gz GpgFrontend-9a9f648824cbfc1b9075e1793504e541a700a721.zip | |
fix: solve some issues
1. slove deb packing issues
2. solve ci issues
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | src/core/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | src/main.cpp | 13 |
3 files changed, 12 insertions, 24 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 529b1a3c..dd8dff22 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -274,12 +274,21 @@ target_compile_features(${AppName} PUBLIC cxx_std_17) # if building linux package if (LINUX AND LINUX_INSTALL_SOFTWARE) if (INSTALL_GPGFRONTEND_APP) - install(TARGETS ${AppName} + install(TARGETS ${AppName} gpgfrontend_core gpgfrontend_ui EXPORT GpgFrontendTargets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) + install(DIRECTORY /usr/local/lib/ + DESTINATION ${CMAKE_INSTALL_LIBDIR} + FILES_MATCHING PATTERN "libgpgme.so*") + install(DIRECTORY /usr/local/lib/ + DESTINATION ${CMAKE_INSTALL_LIBDIR} + FILES_MATCHING PATTERN "libassuan.so*") + install(DIRECTORY /usr/local/lib/ + DESTINATION ${CMAKE_INSTALL_LIBDIR} + FILES_MATCHING PATTERN "libgpg-error.so*") install(FILES ${CMAKE_SOURCE_DIR}/TRANSLATORS DESTINATION /usr/local/share/${AppName}/) install(FILES ${CMAKE_SOURCE_DIR}/resource/meta/pub.gpgfrontend.gpgfrontend.appdata.xml diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index e87e32f3..dde81c0a 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -55,16 +55,8 @@ target_include_directories(gpgfrontend_core PUBLIC target_sources(gpgfrontend_core PUBLIC ${CMAKE_SOURCE_DIR}/third_party/easyloggingpp/src/easylogging++.cc) -if (LINUX AND GPGFRONTEND_GENERATE_LINUX_INSTALL_SOFTWARE) - # froce to link gnupg static libraries for deb - find_library(GPG_ERROR_LIB libgpg-error.a) - find_library(ASSUAN_LIB libassuan.a) - find_library(GPGME_LIB libgpgme.a) - target_link_libraries(gpgfrontend_core ${GPGME_LIB} ${ASSUAN_LIB} ${GPG_ERROR_LIB}) -else () - # link gnupg libraries - target_link_libraries(gpgfrontend_core gpgme assuan gpg-error) -endif () +# link gnupg libraries +target_link_libraries(gpgfrontend_core gpgme assuan gpg-error) # link openssl target_link_libraries(gpgfrontend_core OpenSSL::SSL OpenSSL::Crypto) # link Qt AES diff --git a/src/main.cpp b/src/main.cpp index 5badbf7c..51d977b2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -125,19 +125,6 @@ int main(int argc, char* argv[]) { file.close(); #endif -#ifdef GPG_STANDALONE_MODE - LOG(INFO) << "GPG_STANDALONE_MODE Enabled"; - auto gpg_path = - GpgFrontend::GlobalSettingStation::GetInstance().GetStandaloneGpgBinDir(); - auto db_path = GpgFrontend::GlobalSettingStation::GetInstance() - .GetStandaloneDatabaseDir(); - GpgFrontend::GpgContext::CreateInstance( - GpgFrontend::SingletonFunctionObject< - GpgFrontend::GpgContext>::GetDefaultChannel(), - std::make_unique<GpgFrontend::GpgContext>(true, db_path.u8string(), true, - gpg_path.u8string())); -#endif - // create the thread to load the gpg context auto* init_ctx_thread = new GpgFrontend::CtxCheckThread(); QApplication::connect(init_ctx_thread, &QThread::finished, init_ctx_thread, |