Skip to content

Commit 75a63b8

Browse files
committed
fix: Remove boost system dependencies since it's a deprecated empty shim that was removed in newer boost packaging
1 parent d714452 commit 75a63b8

3 files changed

Lines changed: 3 additions & 9 deletions

File tree

src/runtime_src/core/pcie/emulation/hw_emu/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ set_target_properties(xrt_hwemu_static PROPERTIES OUTPUT_NAME "xrt_hwemu")
4747

4848
target_link_libraries(xrt_hwemu
4949
PRIVATE
50-
${Boost_SYSTEM_LIBRARY}
5150
${PROTOBUF_LIBRARY}
5251
xrt_coreutil
5352
common_em
@@ -57,7 +56,6 @@ target_link_libraries(xrt_hwemu
5756

5857
target_link_libraries(xrt_hwemu_static
5958
INTERFACE
60-
boost_system
6159
${PROTOBUF_LIBRARY}
6260
xrt_coreutil_static
6361
rt

src/runtime_src/core/tools/xbmgmt2/CMakeLists.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,10 @@ if (XRT_STATIC_BUILD)
7474
target_link_options(${XBMGMT2_NAME}_static PRIVATE "-static" "-L${Boost_LIBRARY_DIRS}")
7575
target_compile_definitions(${XBMGMT2_NAME}_static PRIVATE ENABLE_NATIVE_SUBCMDS_AND_REPORTS)
7676
# Bypass FindBoost versions and just link explicitly with boost libraries
77-
# The -static link option will pick the static libraries.
77+
# The -static link option will pick the static libraries.
7878
target_link_libraries(${XBMGMT2_NAME}_static
7979
PRIVATE
8080
xrt_coreutil_static
81-
boost_system
8281
boost_program_options
8382
-Wl,--whole-archive rt pthread -Wl,--no-whole-archive
8483
uuid
@@ -93,10 +92,9 @@ target_link_libraries(${XBMGMT2_NAME}
9392
PRIVATE
9493
xrt_coreutil
9594
${Boost_FILESYSTEM_LIBRARY}
96-
${Boost_SYSTEM_LIBRARY}
9795
${Boost_PROGRAM_OPTIONS_LIBRARY}
9896
)
99-
97+
10098
# Add the supporting libraries
10199
if(WIN32)
102100
target_link_libraries(${XBMGMT2_NAME} PRIVATE ws2_32)

src/runtime_src/core/tools/xbutil2/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ add_subdirectory(FirmwareLogging)
5959
# Merge the files into one collection
6060
set(XBUTIL_V2_SRCS ${XBUTIL_V2_BASE_FILES} ${XBUTIL_V2_SUBCMD_FILES})
6161

62-
set(XBUTIL2_NAME "xrt-smi")
62+
set(XBUTIL2_NAME "xrt-smi")
6363
# Determine any helper scripts
6464
if(WIN32)
6565
set(XRT_HELPER_SCRIPTS "xrt-smi" "xrt-smi.bat")
@@ -87,7 +87,6 @@ if (XRT_STATIC_BUILD)
8787
target_link_libraries(${XBUTIL2_NAME}_static
8888
PRIVATE
8989
xrt_coreutil_static
90-
boost_system
9190
boost_program_options
9291
-Wl,--whole-archive rt pthread -Wl,--no-whole-archive
9392
uuid
@@ -102,7 +101,6 @@ target_link_libraries(${XBUTIL2_NAME}
102101
PRIVATE
103102
xrt_coreutil
104103
${Boost_FILESYSTEM_LIBRARY}
105-
${Boost_SYSTEM_LIBRARY}
106104
${Boost_PROGRAM_OPTIONS_LIBRARY}
107105
)
108106

0 commit comments

Comments
 (0)