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
77a3dd7e
Commit
77a3dd7e
authored
Apr 04, 2021
by
hardy
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/sanitize-address' into integration_2021_wk14_a
parents
dac2388e
2f4767a7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
0 deletions
+10
-0
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+5
-0
cmake_targets/build_oai
cmake_targets/build_oai
+5
-0
No files found.
cmake_targets/CMakeLists.txt
View file @
77a3dd7e
...
@@ -333,6 +333,11 @@ else (CUDA_FOUND)
...
@@ -333,6 +333,11 @@ else (CUDA_FOUND)
)
)
endif
()
endif
()
if
(
SANITIZE_ADDRESS
)
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-fsanitize=address"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-fsanitize=address"
)
endif
()
add_definitions
(
"-DASN_DISABLE_OER_SUPPORT"
)
add_definitions
(
"-DASN_DISABLE_OER_SUPPORT"
)
#########################
#########################
...
...
cmake_targets/build_oai
View file @
77a3dd7e
...
@@ -68,6 +68,7 @@ USRP_REC_PLAY="False"
...
@@ -68,6 +68,7 @@ USRP_REC_PLAY="False"
BUILD_ECLIPSE
=
0
BUILD_ECLIPSE
=
0
NR
=
"False"
NR
=
"False"
ITTI_SIM
=
"False"
ITTI_SIM
=
"False"
SANITIZE_ADDRESS
=
"False"
OPTIONAL_LIBRARIES
=
"telnetsrv enbscope uescope nrscope msc"
OPTIONAL_LIBRARIES
=
"telnetsrv enbscope uescope nrscope msc"
trap
handle_ctrl_c INT
trap
handle_ctrl_c INT
...
@@ -424,6 +425,9 @@ function main() {
...
@@ -424,6 +425,9 @@ function main() {
CMAKE_CMD
=
"
$CMAKE_CMD
-GNinja"
CMAKE_CMD
=
"
$CMAKE_CMD
-GNinja"
MAKE_CMD
=
ninja
MAKE_CMD
=
ninja
shift
;;
shift
;;
--sanitize-address
|
-fsanitize
=
address
)
SANITIZE_ADDRESS
=
True
shift
;;
--ittiSIM
)
--ittiSIM
)
ittiSIM
=
1
ittiSIM
=
1
ITTI_SIM
=
"True"
ITTI_SIM
=
"True"
...
@@ -612,6 +616,7 @@ function main() {
...
@@ -612,6 +616,7 @@ function main() {
echo
"set ( USRP_REC_PLAY
$USRP_REC_PLAY
)"
>>
$cmake_file
echo
"set ( USRP_REC_PLAY
$USRP_REC_PLAY
)"
>>
$cmake_file
echo
"set ( SKIP_SHARED_LIB_FLAG
$SKIP_SHARED_LIB_FLAG
)"
>>
$cmake_file
echo
"set ( SKIP_SHARED_LIB_FLAG
$SKIP_SHARED_LIB_FLAG
)"
>>
$cmake_file
echo
"set ( ITTI_SIM
$ITTI_SIM
)"
>>
$cmake_file
echo
"set ( ITTI_SIM
$ITTI_SIM
)"
>>
$cmake_file
echo
"set ( SANITIZE_ADDRESS
$SANITIZE_ADDRESS
)"
>>
$cmake_file
echo
'include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)'
>>
$cmake_file
echo
'include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)'
>>
$cmake_file
cd
$DIR
/
$build_dir
/build
cd
$DIR
/
$build_dir
/build
eval
$CMAKE_CMD
eval
$CMAKE_CMD
...
...
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