From 9f81f5746b4def20a72123a1bce976924c0c887a Mon Sep 17 00:00:00 2001
From: Raymond Knopp <raymond.knopp@eurecom.fr>
Date: Thu, 10 Jun 2021 09:34:26 +0200
Subject: [PATCH] small changes in CMakeLists.txt

---
 cmake_targets/CMakeLists.txt | 19 +++++++++++--------
 cmake_targets/build_oai      |  7 +++++--
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt
index 80e7af8a74..5a74380795 100644
--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -64,7 +64,8 @@ elseif (${RF_BOARD} STREQUAL "OAI_AW2SORI")
     include_directories("${OPENAIR_TARGETS}/ARCH/AW2SORI")
     set(HW_SOURCE ${HW_SOURCE}
 	    ${OPENAIR_TARGETS}/ARCH/AW2SORI/ARCH/AW2SORI/oaiori.c)
-    set(openair_HW_lib "-shared -fPIC oaiori.c -msse4 -g -ggdb -lori")
+    LINK_DIRECTORIES("/usr/local/lib")
+    set(openair_HW_lib "-shared -fPIC -msse4 -g -ggdb -lori")
 
 endif (${RF_BOARD} STREQUAL "OAI_USRP")
 
@@ -922,13 +923,6 @@ add_library(oai_lmssdrdevif MODULE ${HWLIB_LMSSDR_SOURCE} )
 target_include_directories(oai_lmssdrdevif PRIVATE /usr/local/include/lime)
 target_link_libraries(oai_lmssdrdevif LimeSuite )
 
-include_directories("${OPENAIR_TARGETS}/ARCH/AW2SORI/")
-
-set(HWLIB_AW2SORI_SOURCE
-  ${OPENAIR_TARGETS}/ARCH/AW2SORI/oaiori.c
-  )
-add_library(thirdparty_transpro MODULE ${HWLIB_AW2SORI_SOURCE} )
-target_link_libraries(thirdparty_transpro)
 
 include_directories("${OPENAIR_TARGETS}/ARCH/ETHERNET/USERSPACE/LIB/")
 set(TPLIB_ETHERNET_SOURCE
@@ -938,6 +932,15 @@ set(TPLIB_ETHERNET_SOURCE
   )
 add_library(oai_eth_transpro MODULE ${TPLIB_ETHERNET_SOURCE} )
 
+include_directories("${OPENAIR_TARGETS}/ARCH/AW2SORI/")
+link_directories("/usr/local/lib")
+set(HWLIB_AW2SORI_SOURCE
+  ${OPENAIR_TARGETS}/ARCH/AW2SORI/oaiori.c
+  )
+add_library(aw2sori_transpro MODULE ${HWLIB_AW2SORI_SOURCE})
+target_compile_options(aw2sori_transpro PRIVATE -shared -fPIC -msse4 -g -ggdb -DLITE_COMPILATION)
+target_link_libraries(aw2sori_transpro libori.so)
+
 include_directories("${OPENAIR_TARGETS}/ARCH/IRIS/USERSPACE/LIB/")
 set(option_HWIRISLIB_lib "-l SoapySDR")
 set(HWLIB_IRIS_SOURCE
diff --git a/cmake_targets/build_oai b/cmake_targets/build_oai
index 33fc689ab1..2605d70e3d 100755
--- a/cmake_targets/build_oai
+++ b/cmake_targets/build_oai
@@ -946,8 +946,11 @@ function main() {
               echo_info "liboai_device.so is linked to ADRV9371_ZC706 device library for Kernel $SYRIQ_KMAJ.$SYRIQ_KMIN"
           elif [ "$HW" == "OAI_AW2SORI" ] ; then
 	      compilations \
-		  $build_dir thirdparty_transpro 
-		  $build_dir oai_eth_transpro
+		  $build_dir aw2sori_transpro \
+                  libaw2sori_transpro.so $dbin/libaw2sori_transpro.so.$REL 
+
+              ln -sf libaw2sori_transpro.so libthirdparty_transpro.so
+              ln -sf $dbin/libaw2sori_transpro.so.$REL $dbin/libaw2sori_transpro.so
               echo_info "build libthirdparty_transpro.so for AW2SORI fronthaul"
           else
               echo_info "liboai_device.so is not linked to any device library"