Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zzha zzha
OpenXG-RAN
Commits
d4afd251
Commit
d4afd251
authored
Aug 04, 2022
by
Manish
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolved the compilation error caused due to xran library linking
parent
173e57d6
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
9 deletions
+2
-9
CMakeLists.txt
CMakeLists.txt
+2
-9
No files found.
CMakeLists.txt
View file @
d4afd251
...
@@ -161,7 +161,6 @@ set (OPENAIR_CMAKE ${OPENAIR_DIR}/cmake_targets)
...
@@ -161,7 +161,6 @@ set (OPENAIR_CMAKE ${OPENAIR_DIR}/cmake_targets)
set
(
OPENAIR_BIN_DIR
${
CMAKE_CURRENT_BINARY_DIR
}${
CMAKE_FILES_DIRECTORY
}
)
set
(
OPENAIR_BIN_DIR
${
CMAKE_CURRENT_BINARY_DIR
}${
CMAKE_FILES_DIRECTORY
}
)
set
(
XRAN_DIR
${
OPENAIR_DIR
}
/targets/ARCH/ORAN_FHI/lib
)
set
(
XRAN_DIR
${
OPENAIR_DIR
}
/targets/ARCH/ORAN_FHI/lib
)
set
(
XRAN_LIB_DIR /usr/local/xran
)
set
(
XRAN_LIB_DIR /usr/local/xran
)
set
(
INTEL_LIB_DIR /usr/local/intel64
)
set
(
INTEL_LIB /usr/local/intel64
)
set
(
INTEL_LIB /usr/local/intel64
)
set
(
DPDK_DIR /usr/local/dpdk_19_11/include/dpdk
)
set
(
DPDK_DIR /usr/local/dpdk_19_11/include/dpdk
)
...
@@ -675,8 +674,7 @@ target_link_libraries(benetel_5g PRIVATE asn1_nr_rrc asn1_lte_rrc)
...
@@ -675,8 +674,7 @@ target_link_libraries(benetel_5g PRIVATE asn1_nr_rrc asn1_lte_rrc)
include_directories
(
"
${
XRAN_DIR
}
"
)
include_directories
(
"
${
XRAN_DIR
}
"
)
include_directories
(
"
${
DPDK_DIR
}
"
)
include_directories
(
"
${
DPDK_DIR
}
"
)
include_directories
(
"
${
INTEL_LIB_DIR
}
"
)
include_directories
(
"
${
INTEL_LIB
}
"
)
include_directories
(
"
${
XRAN_LIB_DIR
}
"
)
set
(
ORAN_FHLIB_5G_SOURCE
set
(
ORAN_FHLIB_5G_SOURCE
${
OPENAIR_TARGETS
}
/ARCH/ETHERNET/oran/5g/oran.cpp
${
OPENAIR_TARGETS
}
/ARCH/ETHERNET/oran/5g/oran.cpp
...
@@ -685,17 +683,12 @@ set(ORAN_FHLIB_5G_SOURCE
...
@@ -685,17 +683,12 @@ set(ORAN_FHLIB_5G_SOURCE
)
)
add_library
(
oran_fhlib_5g MODULE
${
ORAN_FHLIB_5G_SOURCE
}
)
add_library
(
oran_fhlib_5g MODULE
${
ORAN_FHLIB_5G_SOURCE
}
)
find_library
(
XRANFHI xran HINTS
${
XRAN_LIB_DIR
}
)
find_library
(
INTELIRC irc HINTS
${
INTEL_LIB_DIR
}
)
set_target_properties
(
oran_fhlib_5g PROPERTIES COMPILE_FLAGS
"-fvisibility=hidden -march=native -I$ENV{RTE_SDK}/$ENV{RTE_TARGET}/include"
)
set_target_properties
(
oran_fhlib_5g PROPERTIES COMPILE_FLAGS
"-fvisibility=hidden -march=native -I$ENV{RTE_SDK}/$ENV{RTE_TARGET}/include"
)
SET
(
DPDK_LIBS
"-Wl,-rpath,$ENV{RTE_SDK}/$ENV{RTE_TARGET}/lib -Wl,--whole-archive -L$ENV{RTE_SDK}/$ENV{RTE_TARGET}/lib -ldpdk -Wl,--no-whole-archive"
)
SET
(
DPDK_LIBS
"-Wl,-rpath,$ENV{RTE_SDK}/$ENV{RTE_TARGET}/lib -Wl,--whole-archive -L$ENV{RTE_SDK}/$ENV{RTE_TARGET}/lib -ldpdk -Wl,--no-whole-archive"
)
TARGET_LINK_LIBRARIES
(
oran_fhlib_5g
${
DPDK_LIBS
}
)
TARGET_LINK_LIBRARIES
(
oran_fhlib_5g
${
DPDK_LIBS
}
)
#TARGET_LINK_LIBRARIES(oran_fhlib_5g -L${XRAN_LIB_DIR} -lxran)
TARGET_LINK_LIBRARIES
(
oran_fhlib_5g -L
${
XRAN_LIB_DIR
}
-lxran
)
TARGET_LINK_LIBRARIES
(
oran_fhlib_5g
${
XRANFHI
}
)
#TARGET_LINK_LIBRARIES(oran_fhlib_5g -L${INTEL_LIB} -lirc)
#TARGET_LINK_LIBRARIES(oran_fhlib_5g -L${INTEL_LIB} -lirc)
TARGET_LINK_LIBRARIES
(
oran_fhlib_5g
${
INTELIRC
}
)
TARGET_LINK_LIBRARIES
(
oran_fhlib_5g pthread dl rt m numa
)
TARGET_LINK_LIBRARIES
(
oran_fhlib_5g pthread dl rt m numa
)
##########################################################
##########################################################
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment