Skip to content

ci: Fix find_package(Boost) for Ubuntu 26.04 #2296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Andrei-Fabian-Pop wants to merge 1 commit into
base: main
Choose a base branch
from
Open

ci: Fix find_package(Boost) for Ubuntu 26.04 #2296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion gui/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,9 @@ find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets Xml Svg REQUIRED)
find_package(KDDockWidgets QUIET)

add_definitions(-DBOOST_ALL_DYN_LINK)
find_package(Boost COMPONENTS system filesystem thread chrono REQUIRED)
# Boost.System is header-only since Boost 1.69 and its compiled library was removed in Boost 1.89, so it must not be
# requested as a component.
find_package(Boost 1.69 COMPONENTS filesystem thread chrono REQUIRED)

message(STATUS "Building: " ${PROJECT_NAME})
add_library(${PROJECT_NAME} SHARED ${PROJECT_SOURCES} ${PROJECT_RESOURCES})
Expand Down
5 changes: 3 additions & 2 deletions packages/m2k/plugins/m2k/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,9 @@ set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH};/usr/local/lib/cmake)
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS ${SCOPY_QT_COMPONENTS} REQUIRED)
find_package(libm2k REQUIRED)

find_package(Boost COMPONENTS system filesystem thread chrono REQUIRED) # workaround for Gnuradio not finding
# Boost::chrono
# Boost.System is header-only since Boost 1.69 and its compiled library was removed in Boost 1.89, so it must not be
# requested as a component.
find_package(Boost 1.69 COMPONENTS filesystem thread chrono REQUIRED)
find_package(
Gnuradio "3.10" REQUIRED
COMPONENTS runtime
Expand Down
4 changes: 3 additions & 1 deletion packages/m2k/plugins/m2k/m2k-gui/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,9 @@ if(SCOPY_ENABLE_SIGROK_GUI)
endif()

add_definitions(-DBOOST_ALL_DYN_LINK)
find_package(Boost COMPONENTS system filesystem thread chrono REQUIRED)
# Boost.System is header-only since Boost 1.69 and its compiled library was removed in Boost 1.89, so it must not be
# requested as a component.
find_package(Boost 1.69 COMPONENTS filesystem thread chrono REQUIRED)

message(STATUS "Building " ${PROJECT_NAME})
add_library(${PROJECT_NAME} SHARED ${PROJECT_SOURCES})
Expand Down
Loading