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
988b483a
Commit
988b483a
authored
Dec 16, 2015
by
Navid Nikaein
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* automatic generation of protobuf messages in CMakeList.txt
parent
bd1de293
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
9 deletions
+13
-9
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+4
-4
cmake_targets/tools/generate_protobuf
cmake_targets/tools/generate_protobuf
+8
-4
openair2/ENB_APP/MESSAGES/V2/progran.proto
openair2/ENB_APP/MESSAGES/V2/progran.proto
+1
-1
No files found.
cmake_targets/CMakeLists.txt
View file @
988b483a
...
...
@@ -712,8 +712,8 @@ if (ENB_AGENT)
)
set
(
PRPT_C_DIR
${
protobuf_generated_dir
}
/
${
PRPTDIR
}
)
message
(
"calling
${
protoc_call
}
${
PRPT_C_DIR
}
${
PRPT_MSG_FILES
}
"
)
execute_process
(
COMMAND
${
protoc_call
}
${
PRPT_C_DIR
}
${
PRPT_MSG_FILES
}
)
#message("calling protoc_call=${protoc_call} PRPT_C_DIR=${PRPT_C_DIR} PRPT_MSG_FILES=
${PRPT_MSG_FILES}")
execute_process
(
COMMAND
${
protoc_call
}
${
PRPT_C_DIR
}
${
PRPT_MSG_
DIR
}
${
PRPT_MSG_
FILES
}
)
file
(
GLOB PRPT_source
${
PRPT_C_DIR
}
/*.c
)
set
(
PRPT_OAI_generated
${
PRPT_C_DIR
}
/header.pb-c.c
...
...
@@ -729,7 +729,7 @@ if (ENB_AGENT)
${
PRPT_OAI_generated
}
${
PRPT_source
}
)
set
(
PRPT_MSG_LIB PRPT_MSG
)
include_directories
(
"
${
PRPT_C_DIR
}
"
)
add_library
(
ASYNC_IF
...
...
@@ -1647,7 +1647,7 @@ add_executable(oaisim_nos1
target_include_directories
(
oaisim_nos1 PUBLIC
${
OPENAIR_TARGETS
}
/SIMU/USER
)
target_link_libraries
(
oaisim_nos1
-Wl,--start-group
RRC_LIB X2AP_LIB SECU_CN UTIL HASHTABLE SCHED_LIB PHY LFDS
${
MSC_LIB
}
L2
${
RAL_LIB
}
SIMU SIMU_ETH SECU_OSA
${
ITTI_LIB
}
${
MIH_LIB
}
${
ASYNC_IF_LIB
}
RRC_LIB X2AP_LIB SECU_CN UTIL HASHTABLE SCHED_LIB PHY LFDS
${
MSC_LIB
}
L2
${
RAL_LIB
}
SIMU SIMU_ETH SECU_OSA
${
ITTI_LIB
}
${
MIH_LIB
}
${
PRPT_MSG_LIB
}
${
ASYNC_IF_LIB
}
-Wl,--end-group
)
target_link_libraries
(
oaisim_nos1
${
LIBXML2_LIBRARIES
}
${
LAPACK_LIBRARIES
}
)
...
...
cmake_targets/tools/generate_protobuf
View file @
988b483a
...
...
@@ -3,12 +3,16 @@
function
main
()
{
mkdir
-p
$1
cd
$1
echo
generate protobuf messages inside
$1
$2
#
echo generate protobuf messages inside $1 $2
protoc-c
--c_out
=
$1
$2
protoc
--cpp_out
=
$1
$2
c_out
=
$1
shift
proto_path
=
$1
shift
protoc-c
--c_out
=
$c_out
--proto_path
=
$proto_path
$*
#protoc --cpp_out=$c_out --proto_path=$proto_path $*
}
...
...
openair2/ENB_APP/MESSAGES/V2/progran.proto
View file @
988b483a
package
protocol
;
import
"stats_messages.proto"
;
import
"header.proto"
import
"header.proto"
;
message
progran_message
{
oneof
msg
{
...
...
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