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
Michael Black
OpenXG-RAN
Commits
6cd72e4e
Commit
6cd72e4e
authored
2 years ago
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Create INTERFACE libraries to link to RRC ASN.1 target with headers only
parent
c67a6121
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
2 deletions
+32
-2
openair2/RRC/LTE/MESSAGES/CMakeLists.txt
openair2/RRC/LTE/MESSAGES/CMakeLists.txt
+16
-1
openair2/RRC/NR/MESSAGES/CMakeLists.txt
openair2/RRC/NR/MESSAGES/CMakeLists.txt
+16
-1
No files found.
openair2/RRC/LTE/MESSAGES/CMakeLists.txt
View file @
6cd72e4e
...
@@ -14,8 +14,23 @@ add_custom_command(OUTPUT ${lte_rrc_source} ${lte_rrc_headers}
...
@@ -14,8 +14,23 @@ add_custom_command(OUTPUT ${lte_rrc_source} ${lte_rrc_headers}
COMMENT
"Generating LTE RRC source file from
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
LTE_RRC_GRAMMAR
}
"
COMMENT
"Generating LTE RRC source file from
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
LTE_RRC_GRAMMAR
}
"
)
)
# Many other targets include LTE RRC ASN.1 headers, without actually needing
# the actual library (asn1_lte_rrc). Therefore, below we create the INTERFACE
# library asn1_lte_rrc_hdrs that only contains these headers. To actually wait
# that the headers are created in add_custom_command, we use an intermediary
# add_custom_target which create a target that waits for the headers, and make
# a dependency from asn1_lte_rrc_hdrs to gen_lte_rrc_hdrs, which is the
# recommended way, see https://gitlab.kitware.com/cmake/cmake/-/issues/17366.
# In newer cmake version (e.g., 3.20), it is also possible to have
# ${lte_rrc_headers} directly in the add_library(asn1_lte_rrc_hdrs) statement,
# without the need for asn1_lte_rrc_hdrs
add_custom_target
(
gen_lte_rrc_hdrs DEPENDS
${
lte_rrc_headers
}
)
add_library
(
asn1_lte_rrc_hdrs INTERFACE
)
add_dependencies
(
asn1_lte_rrc_hdrs gen_lte_rrc_hdrs
)
target_include_directories
(
asn1_lte_rrc_hdrs INTERFACE
"
${
CMAKE_CURRENT_BINARY_DIR
}
"
)
add_library
(
asn1_lte_rrc
${
lte_rrc_source
}
)
add_library
(
asn1_lte_rrc
${
lte_rrc_source
}
)
target_
include_directories
(
asn1_lte_rrc PUBLIC
"
${
CMAKE_CURRENT_BINARY_DIR
}
"
)
target_
link_libraries
(
asn1_lte_rrc PUBLIC asn1_lte_rrc_hdrs
)
target_compile_options
(
asn1_lte_rrc
target_compile_options
(
asn1_lte_rrc
PRIVATE -DASN_DISABLE_OER_SUPPORT -w
PRIVATE -DASN_DISABLE_OER_SUPPORT -w
PUBLIC -DLTE_RRC_VERSION=
${
LTE_RRC_RELEASE
}
)
PUBLIC -DLTE_RRC_VERSION=
${
LTE_RRC_RELEASE
}
)
This diff is collapsed.
Click to expand it.
openair2/RRC/NR/MESSAGES/CMakeLists.txt
View file @
6cd72e4e
...
@@ -14,8 +14,23 @@ add_custom_command(OUTPUT ${nr_rrc_source} ${nr_rrc_headers}
...
@@ -14,8 +14,23 @@ add_custom_command(OUTPUT ${nr_rrc_source} ${nr_rrc_headers}
COMMENT
"Generating NR RRC source file from
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
NR_RRC_GRAMMAR
}
"
COMMENT
"Generating NR RRC source file from
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
NR_RRC_GRAMMAR
}
"
)
)
# Many other targets include NR RRC ASN.1 headers, without actually needing the
# actual library (asn1_nr_rrc). Therefore, below we create the INTERFACE
# library asn1_nr_rrc_hdrs that only contains these headers. To actually wait
# that the headers are created in add_custom_command, we use an intermediary
# add_custom_target which create a target that waits for the headers, and make
# a dependency from asn1_nr_rrc_hdrs to gen_nr_rrc_hdrs, which is the
# recommended way, see https://gitlab.kitware.com/cmake/cmake/-/issues/17366.
# In newer cmake version (e.g., 3.20), it is also possible to have
# ${nr_rrc_headers} directly in the add_library(asn1_nr_rrc_hdrs) statement,
# without the need for asn1_lte_rrc_hdrs
add_custom_target
(
gen_nr_rrc_hdrs DEPENDS
${
nr_rrc_headers
}
)
add_library
(
asn1_nr_rrc_hdrs INTERFACE
)
add_dependencies
(
asn1_nr_rrc_hdrs gen_nr_rrc_hdrs
)
target_include_directories
(
asn1_nr_rrc_hdrs INTERFACE
"
${
CMAKE_CURRENT_BINARY_DIR
}
"
)
add_library
(
asn1_nr_rrc
${
nr_rrc_source
}
)
add_library
(
asn1_nr_rrc
${
nr_rrc_source
}
)
target_
include_directories
(
asn1_nr_rrc PUBLIC
"
${
CMAKE_CURRENT_BINARY_DIR
}
"
)
target_
link_libraries
(
asn1_nr_rrc PUBLIC asn1_nr_rrc_hdrs
)
target_compile_options
(
asn1_nr_rrc
target_compile_options
(
asn1_nr_rrc
PRIVATE -DASN_DISABLE_OER_SUPPORT -w
PRIVATE -DASN_DISABLE_OER_SUPPORT -w
PUBLIC -DNR_RRC_VERSION=
${
NR_RRC_RELEASE
}
)
PUBLIC -DNR_RRC_VERSION=
${
NR_RRC_RELEASE
}
)
This diff is collapsed.
Click to expand it.
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