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
wangjie
OpenXG-RAN
Commits
cf4e07b1
Commit
cf4e07b1
authored
Nov 24, 2020
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move CMakeLists.txt into root
parent
afa1aa56
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
CMakeLists.txt
CMakeLists.txt
+1
-1
cmake_targets/build_oai
cmake_targets/build_oai
+5
-5
No files found.
cmake_targets/
CMakeLists.txt
→
CMakeLists.txt
View file @
cf4e07b1
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
cmake_minimum_required
(
VERSION 3.5
)
cmake_minimum_required
(
VERSION 3.5
)
project
(
OpenAirInterface VERSION 1.2.2 LANGUAGES C CXX
)
project
(
OpenAirInterface VERSION 1.2.2 LANGUAGES C CXX
)
include
(
"macros.cmake"
)
include
(
"
cmake_targets/
macros.cmake"
)
# System packages that are required
# System packages that are required
# We use either the cmake buildin, in ubuntu are in: /usr/share/cmake*/Modules/
# We use either the cmake buildin, in ubuntu are in: /usr/share/cmake*/Modules/
...
...
cmake_targets/build_oai
View file @
cf4e07b1
...
@@ -445,11 +445,6 @@ function main() {
...
@@ -445,11 +445,6 @@ function main() {
fi
fi
fi
fi
# We use the CMakeLists.txt in cmake_targets, but (for historical reasons)
# build in a subdirectory XYZ/build, e.g., ran_build/build, hence the ../..
CMAKE_CMD
=
"
$CMAKE_CMD
../.."
echo_info
"CMAKE_CMD=
$CMAKE_CMD
"
########################################################
########################################################
# Check validity of HW and TP parameters for eNB / gNB #
# Check validity of HW and TP parameters for eNB / gNB #
########################################################
########################################################
...
@@ -521,6 +516,11 @@ function main() {
...
@@ -521,6 +516,11 @@ function main() {
echo_info
"Erased all previously producted files"
echo_info
"Erased all previously producted files"
fi
fi
# for historical reasons we build in a subdirectory cmake_targets/XYZ/build,
# e.g., cmake_targets/ran_build/build, hence the ../../..
CMAKE_CMD
=
"
$CMAKE_CMD
../../.."
echo_info
"CMAKE_CMD=
$CMAKE_CMD
"
dbin
=
$OPENAIR_DIR
/targets/bin
dbin
=
$OPENAIR_DIR
/targets/bin
dlog
=
$OPENAIR_DIR
/cmake_targets/log
dlog
=
$OPENAIR_DIR
/cmake_targets/log
mkdir
-p
$dbin
$dlog
mkdir
-p
$dbin
$dlog
...
...
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