Fix CI build issues
The externalproject approach doesn't work with the latest, so update to
get boost and sdbusplus from packages instead.
Update to C++23 which is required for some dependencies
Change-Id: I83771c7c744632770c7a8f4ac0fc58561cc3fb01
Signed-off-by: Jason M. Bills <jason.m.bills@intel.com>
diff --git a/callback-manager/CMakeLists.txt b/callback-manager/CMakeLists.txt
index 3754f03..44289ef 100644
--- a/callback-manager/CMakeLists.txt
+++ b/callback-manager/CMakeLists.txt
@@ -1,7 +1,7 @@
cmake_minimum_required (VERSION 3.1 FATAL_ERROR)
set (BUILD_SHARED_LIBRARIES OFF)
include (ExternalProject)
-set (CMAKE_CXX_STANDARD 20)
+set (CMAKE_CXX_STANDARD 23)
set (CMAKE_CXX_STANDARD_REQUIRED ON)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-rtti")
diff --git a/hsbp-manager/CMakeLists.txt b/hsbp-manager/CMakeLists.txt
index becd0dd..9146d91 100644
--- a/hsbp-manager/CMakeLists.txt
+++ b/hsbp-manager/CMakeLists.txt
@@ -1,7 +1,7 @@
cmake_minimum_required (VERSION 3.1 FATAL_ERROR)
set (BUILD_SHARED_LIBRARIES OFF)
include (ExternalProject)
-set (CMAKE_CXX_STANDARD 20)
+set (CMAKE_CXX_STANDARD 23)
set (CMAKE_CXX_STANDARD_REQUIRED ON)
project (hsbp-manager CXX)
@@ -31,35 +31,7 @@
-fno-rtti"
)
-option (YOCTO "Enable Building in Yocto" OFF)
-
-if (NOT YOCTO)
- externalproject_add (
- Boost URL
- https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.tar.gz
- URL_MD5 e425bf1f1d8c36a3cd464884e74f007a SOURCE_DIR
- "${CMAKE_BINARY_DIR}/boost-src" BINARY_DIR
- "${CMAKE_BINARY_DIR}/boost-build" CONFIGURE_COMMAND "" BUILD_COMMAND ""
- INSTALL_COMMAND mkdir -p "${CMAKE_BINARY_DIR}/prefix/include/" && cp -R
- ${CMAKE_BINARY_DIR}/boost-src/boost ${CMAKE_BINARY_DIR}/prefix/include
- ) # requires apt install autoconf-archive and autoconf
- externalproject_add (sdbusplus-project PREFIX
- ${CMAKE_BINARY_DIR}/sdbusplus-project GIT_REPOSITORY
- https://github.com/openbmc/sdbusplus.git GIT_TAG
- 757e1ad55c93e1c5a105e795d3bf87538072c238 SOURCE_DIR
- ${CMAKE_BINARY_DIR}/sdbusplus-src BINARY_DIR
- ${CMAKE_BINARY_DIR}/sdbusplus-build CONFIGURE_COMMAND
- "" BUILD_COMMAND cd ${CMAKE_BINARY_DIR}/sdbusplus-src
- && meson build -Ddefault_library=static && ninja -C
- build libsdbusplus.a INSTALL_COMMAND ""
- LOG_DOWNLOAD ON)
-
- include_directories (SYSTEM ${CMAKE_BINARY_DIR}/sdbusplus-src)
- link_directories (${CMAKE_BINARY_DIR}/sdbusplus-src/build)
-
- include_directories (SYSTEM ${CMAKE_BINARY_DIR}/boost-src)
- set (CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR}/boost-src ${CMAKE_PREFIX_PATH})
-endif ()
+find_package(Boost REQUIRED)
add_definitions (-DBOOST_ERROR_CODE_HEADER_ONLY)
add_definitions (-DBOOST_SYSTEM_NO_DEPRECATED)
@@ -79,13 +51,10 @@
target_link_libraries (hsbp-manager stdc++fs)
target_link_libraries (hsbp-manager gpiodcxx)
-if (NOT YOCTO)
- add_dependencies (hsbp-manager sdbusplus-project)
-endif ()
-
find_package (PkgConfig REQUIRED)
pkg_get_variable(SYSTEMD_SYSTEM_UNIT_DIR systemd systemdsystemunitdir)
+pkg_check_modules(SDBUSPLUSPLUS sdbusplus REQUIRED)
set (SERVICE_FILES ${PROJECT_SOURCE_DIR}/service_files/hsbp-manager.service)