Move CMakeLists.txt into root

cmake_targets/CMakeLists.txt → CMakeLists.txt

@@ -25,7 +25,7 @@
 cmake_minimum_required (VERSION 3.5)
 project (OpenAirInterface VERSION 1.2.2 LANGUAGES C CXX)
 
-include("macros.cmake")
+include("cmake_targets/macros.cmake")
 
 # System packages that are required
 # We use either the cmake buildin, in ubuntu are in: /usr/share/cmake*/Modules/

cmake_targets/build_oai

@@ -445,11 +445,6 @@ function main() {
       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 #
   ########################################################
@@ -521,6 +516,11 @@ function main() {
     echo_info "Erased all previously producted files"
   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
   dlog=$OPENAIR_DIR/cmake_targets/log
   mkdir -p $dbin $dlog