From e2bc95c33d37046d2f70e10be206842cbcf86a9e Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Mon, 16 Dec 2024 12:04:16 -0600 Subject: [PATCH] Reorganize headers and explicitly link against launchpadlib --- cpp/CMakeLists.txt | 2 +- cpp/fetch-indexes.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 24003b1..885f61c 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -33,7 +33,7 @@ target_link_libraries(build-packages PRIVATE lubuntuci PkgConfig::LIBGIT2 update add_executable(fetch-indexes fetch-indexes.cpp utilities.cpp) target_include_directories(fetch-indexes PRIVATE /srv/lubuntu-ci/repos/ci-tools/include/launchpadlib-cpp) -target_link_libraries(fetch-indexes PRIVATE lubuntuci CURL::libcurl yaml-cpp::yaml-cpp ZLIB::ZLIB) +target_link_libraries(fetch-indexes PRIVATE lubuntuci CURL::libcurl yaml-cpp::yaml-cpp ZLIB::ZLIB /srv/lubuntu-ci/repos/ci-tools/lib/liblaunchpad.so) set_target_properties(lubuntuci build-packages fetch-indexes update-maintainer PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE diff --git a/cpp/fetch-indexes.cpp b/cpp/fetch-indexes.cpp index 35dc457..ad337f5 100644 --- a/cpp/fetch-indexes.cpp +++ b/cpp/fetch-indexes.cpp @@ -16,13 +16,13 @@ #include "utilities.h" #include "launchpad.h" -#include "archive.h" -#include "distro_series.h" -#include "build.h" -#include "distribution.h" #include "person.h" +#include "distribution.h" +#include "distro_series.h" #include "source_package_publishing_history.h" +#include "build.h" #include "binary_package_publishing_history.h" +#include "archive.h" #include #include