Move inclusion of nfapi CMakeLists.txt to allow inclusion of test targets in...

Move inclusion of nfapi CMakeLists.txt to allow inclusion of test targets in nfapi/CMakeLists.txt instead of including only test subdirectory

CMakeLists.txt

@@ -2072,8 +2072,6 @@ add_executable(nr-softmodem
   ${OPENAIR1_DIR}/PHY/TOOLS/phy_scope_interface.c
   )
 
-include(${OPENAIR_DIR}/nfapi/CMakeLists.txt)
-
 target_link_libraries(nr-softmodem PRIVATE
   -Wl,--start-group
   UTIL HASHTABLE SCTP_CLIENT SCHED_LIB SCHED_RU_LIB SCHED_NR_LIB PHY_NR PHY PHY_COMMON PHY_NR_COMMON PHY_RU GTPV1U SECURITY
@@ -2483,4 +2481,4 @@ add_subdirectory(openair1)
 add_subdirectory(openair2)
 add_subdirectory(openair3)
 add_subdirectory(radio)
-add_subdirectory(nfapi/tests)
+add_subdirectory(nfapi)

nfapi/CMakeLists.txt

 include(${OPENAIR_DIR}/nfapi/oai_integration/aerial/CMakeLists.txt)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tests)