aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSaturneric <[email protected]>2022-05-08 17:00:05 +0000
committerSaturneric <[email protected]>2022-05-08 17:00:05 +0000
commit1b26275d3f43edaed68d66caec529f2d8e5f40fa (patch)
treebae52db0ed4a6788e23dcc7fd3c433a29126f2af /src
parentdoc: update translate document. (diff)
downloadGpgFrontend-1b26275d3f43edaed68d66caec529f2d8e5f40fa.tar.gz
GpgFrontend-1b26275d3f43edaed68d66caec529f2d8e5f40fa.zip
feat: merge tiny third_party library into core
1. code detecting 2. qt-aes
Diffstat (limited to 'src')
-rw-r--r--src/core/CMakeLists.txt9
-rw-r--r--src/ui/CMakeLists.txt3
2 files changed, 7 insertions, 5 deletions
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)