diff options
| author | Julian Andres Klode <jak@debian.org> | 2024-12-22 22:47:05 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2024-12-22 22:47:05 +0000 |
| commit | b85dd910dcc68b710e1843e8b67935cc96c2a4c9 (patch) | |
| tree | 0c20cecf6451fa20e5ede1ba38f0ac1873860549 /methods/CMakeLists.txt | |
| parent | c898f8cc7790d5b935523a50ebb28d4549840062 (diff) | |
| parent | 7b1fb90b93ced7c0772d726e512da01fad456852 (diff) | |
Merge branch 'refactor-hashes' into 'main'
Switch to OpenSSL in a convoluted path of commits
See merge request apt-team/apt!412
Diffstat (limited to 'methods/CMakeLists.txt')
| -rw-r--r-- | methods/CMakeLists.txt | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/methods/CMakeLists.txt b/methods/CMakeLists.txt index 548d867dc..beb08a81d 100644 --- a/methods/CMakeLists.txt +++ b/methods/CMakeLists.txt @@ -13,14 +13,12 @@ add_executable(http http.cc basehttp.cc $<TARGET_OBJECTS:connectlib>) add_executable(mirror mirror.cc) add_executable(rred rred.cc) -if (HAVE_GNUTLS) - target_compile_definitions(connectlib PRIVATE ${GNUTLS_DEFINITIONS}) - target_include_directories(connectlib PRIVATE ${GNUTLS_INCLUDE_DIR}) -endif() +target_compile_definitions(connectlib PRIVATE ${OPENSSL_DEFINITIONS}) +target_include_directories(connectlib PRIVATE ${OPENSSL_INCLUDE_DIR}) target_include_directories(http PRIVATE $<$<BOOL:${SYSTEMD_FOUND}>:${SYSTEMD_INCLUDE_DIRS}>) # Additional libraries to link against for networked stuff -target_link_libraries(http $<$<BOOL:${GNUTLS_FOUND}>:${GNUTLS_LIBRARIES}> $<$<BOOL:${SYSTEMD_FOUND}>:${SYSTEMD_LIBRARIES}>) +target_link_libraries(http OpenSSL::SSL $<$<BOOL:${SYSTEMD_FOUND}>:${SYSTEMD_LIBRARIES}>) target_link_libraries(rred apt-private) |