Skip to content

O
OpenXG-RAN
Commit b0b3c7ee authored by Robert Schmidt's avatar Robert Schmidt
Browse files
Options

Merge remote-tracking branch 'origin/t-tools-dependency-fix' into integration_2023_w29

parents 169b026b 0ba050f4
Show whitespace changes
Inline Side-by-side
Showing with 45 additions and 39 deletions
cmake_targets/tools/build_helper
View file @ b0b3c7ee
...@@ -563,6 +563,7 @@ check_install_additional_tools (){ ...@@ -563,6 +563,7 @@ check_install_additional_tools (){
iperf3 \ iperf3 \
libforms-bin \ libforms-bin \
libforms-dev \ libforms-dev \
libxft-dev \
xmlstarlet" xmlstarlet"
elif [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "centos" ]] || [[ "$OS_DISTRO" == "rocky" ]] || [[ "$OS_DISTRO" == "fedora" ]]; then elif [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "centos" ]] || [[ "$OS_DISTRO" == "rocky" ]] || [[ "$OS_DISTRO" == "fedora" ]]; then
PACKAGE_LIST="\ PACKAGE_LIST="\
...@@ -570,6 +571,7 @@ check_install_additional_tools (){ ...@@ -570,6 +571,7 @@ check_install_additional_tools (){
ctags \ ctags \
iperf3 \ iperf3 \
gnutls-devel \ gnutls-devel \
libXft-devel \
xforms \ xforms \
xforms-devel \ xforms-devel \
xmlstarlet" xmlstarlet"
...@@ -612,7 +614,6 @@ check_install_oai_software() { ...@@ -612,7 +614,6 @@ check_install_oai_software() {
libsctp-dev \ libsctp-dev \
libssl-dev \ libssl-dev \
libtool \ libtool \
libxft-dev \
patch \ patch \
openssl \ openssl \
zlib1g-dev \ zlib1g-dev \
...@@ -641,7 +642,6 @@ check_install_oai_software() { ...@@ -641,7 +642,6 @@ check_install_oai_software() {
lksctp-tools \ lksctp-tools \
lksctp-tools-devel \ lksctp-tools-devel \
libtool \ libtool \
libXft-devel \
ninja-build \ ninja-build \
make \ make \
openssl \ openssl \
......
common/utils/T/tracer/CMakeLists.txt
View file @ b0b3c7ee
...@@ -21,53 +21,59 @@ target_link_libraries(extract_output_subframe PRIVATE tracer_utils) ...@@ -21,53 +21,59 @@ target_link_libraries(extract_output_subframe PRIVATE tracer_utils)
add_executable(extract extract.c) add_executable(extract extract.c)
target_link_libraries(extract PRIVATE tracer_utils) target_link_libraries(extract PRIVATE tracer_utils)
add_executable(textlog textlog.c) add_executable(macpdu2wireshark macpdu2wireshark.c)
target_link_libraries(textlog PRIVATE tracer_utils tracer_filter tracer_gui target_link_libraries(macpdu2wireshark PRIVATE tracer_utils)
tracer_logger tracer_view tracer_events)
add_executable(multi multi.c)
target_link_libraries(multi PRIVATE tracer_utils T)
target_include_directories(multi PRIVATE ..)
find_library(png png REQUIRED) add_custom_target(T_tools)
add_executable(enb enb.c) add_dependencies(T_tools
target_link_libraries(enb PRIVATE tracer_utils tracer_filter tracer_gui record replay extract_config extract_input_subframe
tracer_logger tracer_view tracer_events) extract_output_subframe extract macpdu2wireshark multi)
target_link_libraries(enb PRIVATE png) add_dependencies(nr-softmodem T_tools)
add_dependencies(nr-uesoftmodem T_tools)
add_dependencies(lte-softmodem T_tools)
add_dependencies(lte-uesoftmodem T_tools)
add_executable(ue ue.c) # Some T tracer tools need additional libraries (Xft, also PNG) that come with
target_link_libraries(ue PRIVATE tracer_utils tracer_filter tracer_gui # a long list of dependencies. We put it behind a separate option for
# GUI-related tools so they can be added on demand, if necessary.
add_boolean_option(T_TRACER_GUI OFF "Compile T tracer GUI tools" OFF)
if(T_TRACER_GUI)
add_executable(textlog textlog.c)
target_link_libraries(textlog PRIVATE tracer_utils tracer_filter tracer_gui
tracer_logger tracer_view tracer_events) tracer_logger tracer_view tracer_events)
target_link_libraries(ue PRIVATE png)
add_executable(vcd vcd.c) find_library(png png REQUIRED)
target_link_libraries(vcd PRIVATE tracer_utils tracer_filter tracer_gui add_executable(enb enb.c)
target_link_libraries(enb PRIVATE tracer_utils tracer_filter tracer_gui
tracer_logger tracer_view tracer_events) tracer_logger tracer_view tracer_events)
target_link_libraries(enb PRIVATE png)
add_executable(to_vcd to_vcd.c) add_executable(gnb gnb.c)
target_link_libraries(to_vcd PRIVATE tracer_utils tracer_filter tracer_gui target_link_libraries(gnb PRIVATE tracer_utils tracer_filter tracer_gui
tracer_logger tracer_view tracer_events) tracer_logger tracer_view tracer_events)
target_link_libraries(gnb PRIVATE png)
add_executable(macpdu2wireshark macpdu2wireshark.c) add_executable(ue ue.c)
target_link_libraries(macpdu2wireshark PRIVATE tracer_utils) target_link_libraries(ue PRIVATE tracer_utils tracer_filter tracer_gui
tracer_logger tracer_view tracer_events)
target_link_libraries(ue PRIVATE png)
add_executable(multi multi.c) add_executable(vcd vcd.c)
target_link_libraries(multi PRIVATE tracer_utils T) target_link_libraries(vcd PRIVATE tracer_utils tracer_filter tracer_gui
target_include_directories(multi PRIVATE ..) tracer_logger tracer_view tracer_events)
add_executable(gnb gnb.c) add_executable(to_vcd to_vcd.c)
target_link_libraries(gnb PRIVATE tracer_utils tracer_filter tracer_gui target_link_libraries(to_vcd PRIVATE tracer_utils tracer_filter tracer_gui
tracer_logger tracer_view tracer_events) tracer_logger tracer_view tracer_events)
target_link_libraries(gnb PRIVATE png)
add_subdirectory(filter) add_subdirectory(gui)
add_subdirectory(gui) add_subdirectory(filter)
add_subdirectory(logger) add_subdirectory(logger)
add_subdirectory(view) add_subdirectory(view)
add_custom_target(T_tools) add_dependencies(T_tools textlog enb gnb ue vcd to_vcd)
add_dependencies(T_tools endif()
record replay extract_config textlog enb ue vcd macpdu2wireshark
extract_input_subframe extract_output_subframe to_vcd extract multi
gnb)
add_dependencies(nr-softmodem T_tools)
add_dependencies(nr-uesoftmodem T_tools)
add_dependencies(lte-softmodem T_tools)
add_dependencies(lte-uesoftmodem T_tools)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment