Skip to content

fix: Remove boost system dependencies #9492

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
X-Ryl669 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: Remove boost system dependencies #9492

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
2 changes: 0 additions & 2 deletions src/runtime_src/core/pcie/emulation/hw_emu/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ set_target_properties(xrt_hwemu_static PROPERTIES OUTPUT_NAME "xrt_hwemu")

target_link_libraries(xrt_hwemu
PRIVATE
${Boost_SYSTEM_LIBRARY}
${PROTOBUF_LIBRARY}
xrt_coreutil
common_em
Expand All @@ -57,7 +56,6 @@ target_link_libraries(xrt_hwemu

target_link_libraries(xrt_hwemu_static
INTERFACE
boost_system
${PROTOBUF_LIBRARY}
xrt_coreutil_static
rt
Expand Down
6 changes: 2 additions & 4 deletions src/runtime_src/core/tools/xbmgmt2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,10 @@ if (XRT_STATIC_BUILD)
target_link_options(${XBMGMT2_NAME}_static PRIVATE "-static" "-L${Boost_LIBRARY_DIRS}")
target_compile_definitions(${XBMGMT2_NAME}_static PRIVATE ENABLE_NATIVE_SUBCMDS_AND_REPORTS)
# Bypass FindBoost versions and just link explicitly with boost libraries
# The -static link option will pick the static libraries.
# The -static link option will pick the static libraries.
target_link_libraries(${XBMGMT2_NAME}_static
PRIVATE
xrt_coreutil_static
boost_system
boost_program_options
-Wl,--whole-archive rt pthread -Wl,--no-whole-archive
uuid
Expand All @@ -93,10 +92,9 @@ target_link_libraries(${XBMGMT2_NAME}
PRIVATE
xrt_coreutil
${Boost_FILESYSTEM_LIBRARY}
${Boost_SYSTEM_LIBRARY}
${Boost_PROGRAM_OPTIONS_LIBRARY}
)

# Add the supporting libraries
if(WIN32)
target_link_libraries(${XBMGMT2_NAME} PRIVATE ws2_32)
Expand Down
4 changes: 1 addition & 3 deletions src/runtime_src/core/tools/xbutil2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ add_subdirectory(FirmwareLogging)
# Merge the files into one collection
set(XBUTIL_V2_SRCS ${XBUTIL_V2_BASE_FILES} ${XBUTIL_V2_SUBCMD_FILES})

set(XBUTIL2_NAME "xrt-smi")
set(XBUTIL2_NAME "xrt-smi")
# Determine any helper scripts
if(WIN32)
set(XRT_HELPER_SCRIPTS "xrt-smi" "xrt-smi.bat")
Expand Down Expand Up @@ -87,7 +87,6 @@ if (XRT_STATIC_BUILD)
target_link_libraries(${XBUTIL2_NAME}_static
PRIVATE
xrt_coreutil_static
boost_system
boost_program_options
-Wl,--whole-archive rt pthread -Wl,--no-whole-archive
uuid
Expand All @@ -102,7 +101,6 @@ target_link_libraries(${XBUTIL2_NAME}
PRIVATE
xrt_coreutil
${Boost_FILESYSTEM_LIBRARY}
${Boost_SYSTEM_LIBRARY}
${Boost_PROGRAM_OPTIONS_LIBRARY}
)

Expand Down
Loading