diff --git a/fetch-indexes-cpp/CMakeLists.txt b/fetch-indexes-cpp/CMakeLists.txt index b4b826c..f456784 100644 --- a/fetch-indexes-cpp/CMakeLists.txt +++ b/fetch-indexes-cpp/CMakeLists.txt @@ -7,6 +7,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED True) find_package(CURL REQUIRED) find_package(ZLIB REQUIRED) find_package(YAML-CPP REQUIRED) +find_package(launchpadlib-cpp REQUIRED CONFIG) include_directories(${CURL_INCLUDE_DIRS}) include_directories(${ZLIB_INCLUDE_DIRS}) @@ -14,4 +15,4 @@ include_directories(${YAML_CPP_INCLUDE_DIR}) add_executable(fetch-indexes main.cpp utilities.cpp) -target_link_libraries(fetch-indexes ${CURL_LIBRARIES} ${ZLIB_LIBRARIES} yaml-cpp) +target_link_libraries(fetch-indexes ${CURL_LIBRARIES} ${ZLIB_LIBRARIES} yaml-cpp launchpad::launchpad) diff --git a/pull-and-compile-tooling b/pull-and-compile-tooling index 02cbd3c..466e9f7 100755 --- a/pull-and-compile-tooling +++ b/pull-and-compile-tooling @@ -2,12 +2,19 @@ git pull +(cd ../launchpadlib-cpp && git pull +rm -rf build; mkdir build && (cd build && +cmake .. -DCMAKE_INSTALL_PREFIX=/srv/lubuntu-ci/repos/ci-tools && +make -j$(nproc)) && +cmake --install . --prefix /srv/lubuntu-ci/repos/ci-tools && +mv build/build-packages ../ && rm -rf build) + (cd fetch-indexes-cpp && rm -rf build; mkdir build && (cd build && -cmake .. && make -j$(nproc)) && +cmake .. -DCMAKE_PREFIX_PATH="/srv/lubuntu-ci/repos/ci-tools;${CMAKE_PREFIX_PATH}" && make -j$(nproc)) && mv build/fetch-indexes ../ && rm -rf build) (cd build-packages-cpp && rm -rf build; mkdir build && (cd build && -cmake .. && make -j$(nproc)) && +cmake .. -DCMAKE_PREFIX_PATH="/srv/lubuntu-ci/repos/ci-tools;${CMAKE_PREFIX_PATH}" && make -j$(nproc)) && mv build/build-packages ../ && rm -rf build)