From 1c268dff55c0b8963a7fe5e54218d12d1c998b7e Mon Sep 17 00:00:00 2001 From: Shail Patel Date: Fri, 5 Jan 2024 16:49:05 -0500 Subject: [PATCH 1/2] use imported target instead Instead of relying on the variables set by find_package this uses an imported target from the curl cmake files to ensure libcurl is available --- CMakeLists.txt | 2 +- src/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0fce58be..98608bee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8.12) +cmake_minimum_required (VERSION 3.12) project (kcov) set (PROJECT_VERSION_MAJOR 39) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f7d76a5f..a23d1c97 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -453,7 +453,7 @@ if (LIBELF_FOUND) target_link_libraries(${KCOV} stdc++ ${CMAKE_THREAD_LIBS_INIT} - ${CURL_LIBRARIES} + CURL::libcurl "${DL_LIBRARY}" "${INTL_LIBRARY}" ${DISASSEMBLER_LIBRARIES} @@ -474,7 +474,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux") ${CMAKE_THREAD_LIBS_INIT} "${DL_LIBRARY}" "${M_LIBRARY}" - ${CURL_LIBRARIES} + CURL::libcurl ${ZLIB_LIBRARIES} ) install (TARGETS kcov-system-daemon DESTINATION "${KCOV_INSTALL_BINDIR}") From 7441d8207a98e558aa7cb8244f0c9bb0f10ea858 Mon Sep 17 00:00:00 2001 From: Shail Patel Date: Sat, 6 Jan 2024 21:36:25 -0500 Subject: [PATCH 2/2] bump ubuntu version and disable osx big sur --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9946406c..be21ee5c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,10 +33,10 @@ jobs: - name: Build for matrix.arch == armv7, aarch64, ppc64le if: ${{ matrix.arch == 'armv7' || matrix.arch == 'aarch64' || matrix.arch == 'ppc64le' }} - uses: uraimo/run-on-arch-action@v1.0.9 + uses: uraimo/run-on-arch-action@v2.6.0 with: architecture: ${{ matrix.arch }} - distribution: ubuntu18.04 + distribution: ubuntu22.04 run: | .github/workflows/generic-build.sh ${{ matrix.arch }} @@ -62,6 +62,7 @@ jobs: build-osx-big-sur: + if: false name: Build and test OSX executable (Big Sur) runs-on: macOS-11 env: