70 lines
2.6 KiB
Diff
70 lines
2.6 KiB
Diff
diff --git a/YACReaderLibrary/server/CMakeLists.txt b/YACReaderLibrary/server/CMakeLists.txt
|
|
index 839072efe4..8b8a2a5dd4 100644
|
|
--- a/YACReaderLibrary/server/CMakeLists.txt
|
|
+++ b/YACReaderLibrary/server/CMakeLists.txt
|
|
@@ -77,10 +77,10 @@
|
|
Qt6::Core
|
|
Qt6::Network
|
|
Qt6::Sql
|
|
- QtWebApp_httpserver
|
|
- QtWebApp_templateengine
|
|
QsLog
|
|
common_all
|
|
comic_backend
|
|
db_helper
|
|
+ PRIVATE
|
|
+ PkgConfig::QtWebApp
|
|
)
|
|
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
|
|
index 512e57457f..787f334698 100644
|
|
--- a/third_party/CMakeLists.txt
|
|
+++ b/third_party/CMakeLists.txt
|
|
@@ -31,45 +31,8 @@
|
|
target_include_directories(QrCode PUBLIC QrCode)
|
|
|
|
# --- QtWebApp HTTP server ---
|
|
-add_library(QtWebApp_httpserver STATIC
|
|
- QtWebApp/httpserver/httpglobal.cpp
|
|
- QtWebApp/httpserver/httplistener.cpp
|
|
- QtWebApp/httpserver/httpconnectionhandler.cpp
|
|
- QtWebApp/httpserver/httpconnectionhandlerpool.cpp
|
|
- QtWebApp/httpserver/httprequest.cpp
|
|
- QtWebApp/httpserver/httpresponse.cpp
|
|
- QtWebApp/httpserver/httpcookie.cpp
|
|
- QtWebApp/httpserver/httprequesthandler.cpp
|
|
- QtWebApp/httpserver/httpsession.cpp
|
|
- QtWebApp/httpserver/httpsessionstore.cpp
|
|
- QtWebApp/httpserver/staticfilecontroller.cpp
|
|
- QtWebApp/httpserver/httpglobal.h
|
|
- QtWebApp/httpserver/httplistener.h
|
|
- QtWebApp/httpserver/httpconnectionhandler.h
|
|
- QtWebApp/httpserver/httpconnectionhandlerpool.h
|
|
- QtWebApp/httpserver/httprequest.h
|
|
- QtWebApp/httpserver/httpresponse.h
|
|
- QtWebApp/httpserver/httpcookie.h
|
|
- QtWebApp/httpserver/httprequesthandler.h
|
|
- QtWebApp/httpserver/httpsession.h
|
|
- QtWebApp/httpserver/httpsessionstore.h
|
|
- QtWebApp/httpserver/staticfilecontroller.h
|
|
-)
|
|
-target_include_directories(QtWebApp_httpserver PUBLIC QtWebApp/httpserver)
|
|
-target_link_libraries(QtWebApp_httpserver PUBLIC Qt6::Network)
|
|
-
|
|
-# --- QtWebApp template engine ---
|
|
-add_library(QtWebApp_templateengine STATIC
|
|
- QtWebApp/templateengine/template.cpp
|
|
- QtWebApp/templateengine/templateloader.cpp
|
|
- QtWebApp/templateengine/templatecache.cpp
|
|
- QtWebApp/templateengine/templateglobal.h
|
|
- QtWebApp/templateengine/template.h
|
|
- QtWebApp/templateengine/templateloader.h
|
|
- QtWebApp/templateengine/templatecache.h
|
|
-)
|
|
-target_include_directories(QtWebApp_templateengine PUBLIC QtWebApp/templateengine)
|
|
-target_link_libraries(QtWebApp_templateengine PUBLIC Qt6::Core5Compat)
|
|
+find_package(PkgConfig REQUIRED)
|
|
+pkg_check_modules(QtWebApp REQUIRED IMPORTED_TARGET GLOBAL QtWebApp)
|
|
|
|
# --- KDSignalThrottler (from KDToolBox) ---
|
|
add_library(KDSignalThrottler STATIC
|