From f48ea7318ef8bd0e69f55b40911fd4f63f1d7373 Mon Sep 17 00:00:00 2001
From: thomasl <thomasl@eurecom.fr>
Date: Wed, 1 Apr 2015 15:02:42 +0000
Subject: [PATCH] #if USRP fix
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6984 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
cmake_targets/CMakeLists.txt | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt
index 1d3ac131c9c..b30d6001368 100644
--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -325,7 +325,7 @@ add_list1_option(NB_ANTENNAS_RX "2" "Number of antennas in reception" "1" "2" "4
add_list1_option(NB_ANTENNAS_TX "2" "Number of antennas in transmission" "1" "2" "4")
add_list1_option(NB_ANTENNAS_TXRX "2" "Number of antennas in ????" "1" "2" "4")
-add_list2_option(RF_BOARD "EXMIMO" "RF head type" "False" "EXMIMO" "OAI_USRP" "ETHERNET" "CPRIGW")
+add_list2_option(RF_BOARD "EXMIMO" "RF head type" "False" "EXMIMO" "USRP" "ETHERNET" "CPRIGW")
if (${RF_BOARD} STREQUAL "EXMIMO")
set(DRIVER2013)
@@ -335,7 +335,7 @@ if (${RF_BOARD} STREQUAL "EXMIMO")
${OPENAIR_TARGETS}/ARCH/EXMIMO/USERSPACE/LIB/openair0_lib.c
${OPENAIR_TARGETS}/ARCH/EXMIMO/USERSPACE/LIB/gain_control.c)
-elseif (${RF_BOARD} STREQUAL "OAI_USRP")
+elseif (${RF_BOARD} STREQUAL "USRP")
include_directories("${OPENAIR_TARGETS}/ARCH/USRP/USERSPACE/LIB/")
include_directories("/opt/include/uhd")
set(HW_SOURCE ${HW_SOURCE}
@@ -1395,10 +1395,10 @@ pkg_search_module(CRYPTO libcrypto REQUIRED)
include_directories(${CRYPTO_INCLUDE_DIRS})
#use native cmake method as this package is not in pkg-config
-if (${RF_BOARD} STREQUAL "OAI_USRP")
+if (${RF_BOARD} STREQUAL "USRP")
find_package(Boost REQUIRED)
include_directories(${LIBBOOST_INCLUDE_DIR})
-endif (${RF_BOARD} STREQUAL "OAI_USRP")
+endif (${RF_BOARD} STREQUAL "USRP")
pkg_search_module(OPENPGM openpgm-5.1)
if(NOT ${OPENPGM_FOUND})
--
GitLab