diff options
| author | Saturneric <[email protected]> | 2022-05-08 17:00:05 +0000 |
|---|---|---|
| committer | Saturneric <[email protected]> | 2022-05-08 17:00:05 +0000 |
| commit | 1b26275d3f43edaed68d66caec529f2d8e5f40fa (patch) | |
| tree | bae52db0ed4a6788e23dcc7fd3c433a29126f2af | |
| parent | doc: update translate document. (diff) | |
| download | GpgFrontend-1b26275d3f43edaed68d66caec529f2d8e5f40fa.tar.gz GpgFrontend-1b26275d3f43edaed68d66caec529f2d8e5f40fa.zip | |
feat: merge tiny third_party library into core
1. code detecting
2. qt-aes
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/core/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | src/ui/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | third_party/CMakeLists.txt | 10 |
4 files changed, 8 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 37c2d2d1..de112a4c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -427,7 +427,6 @@ if (QT5_ENV_SUPPORT) else () find_package(Qt5 5.15 COMPONENTS Core Test Widgets PrintSupport Network REQUIRED) endif () - # find_package(Qt5 5.15.2 EXACT COMPONENTS Core Test Widgets PrintSupport Network LinguistTools REQUIRED) # Qt configuration set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index dde81c0a..2840e1a1 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -54,13 +54,18 @@ target_include_directories(gpgfrontend_core PUBLIC ${CMAKE_SOURCE_DIR}/third_party/easyloggingpp/src) target_sources(gpgfrontend_core PUBLIC ${CMAKE_SOURCE_DIR}/third_party/easyloggingpp/src/easylogging++.cc) +# qt-aes +target_sources(gpgfrontend_core PUBLIC + ${CMAKE_SOURCE_DIR}/third_party/qt-aes/qaesencryption.cpp) + +# encoding detect library +aux_source_directory(${CMAKE_SOURCE_DIR}/third_party/encoding-detect ENCODING_DETECT_SOURCE_CODE) +target_sources(gpgfrontend_core PUBLIC ${ENCODING_DETECT_SOURCE_CODE}) # 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 -target_link_libraries(gpgfrontend_core QtAES) # link boost libraries target_link_libraries(gpgfrontend_core ${Boost_LIBRARIES}) diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt index 6016e45a..10165bbd 100644 --- a/src/ui/CMakeLists.txt +++ b/src/ui/CMakeLists.txt @@ -49,9 +49,6 @@ target_link_libraries(gpgfrontend_ui target_link_libraries(gpgfrontend_ui gpgfrontend_core) -# link encoding_detect -target_link_libraries(gpgfrontend_ui encoding_detect) - # set up pch target_precompile_headers(gpgfrontend_ui PUBLIC GpgFrontendUI.h) diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt index 2c39eb4d..04068ca1 100644 --- a/third_party/CMakeLists.txt +++ b/third_party/CMakeLists.txt @@ -26,12 +26,4 @@ # json set(JSON_BuildTests OFF CACHE INTERNAL "") -add_subdirectory(json EXCLUDE_FROM_ALL) - -# qt-aes -include(GenerateExportHeader) -add_subdirectory(qt-aes EXCLUDE_FROM_ALL) - -# encoding detect library -aux_source_directory(./encoding-detect ENCODING_DETECT_SOURCE_CODE) -add_library(encoding_detect STATIC ${ENCODING_DETECT_SOURCE_CODE})
\ No newline at end of file +add_subdirectory(json EXCLUDE_FROM_ALL)
\ No newline at end of file |