X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=RIC-E2-TERMINATION%2FCMakeLists.txt;h=bbf34267642efad6acb4f04f92b9965449a4f958;hb=c5a1520037d77e6ba66662de967c6f7a34f7b530;hp=54975c4762dad606f835b5178f8473008e0f8c85;hpb=a8a819f0ab3b5841bfdfb967291b0580351baf43;p=ric-plt%2Fe2.git

diff --git a/RIC-E2-TERMINATION/CMakeLists.txt b/RIC-E2-TERMINATION/CMakeLists.txt
index 54975c4..bbf3426 100644
--- a/RIC-E2-TERMINATION/CMakeLists.txt
+++ b/RIC-E2-TERMINATION/CMakeLists.txt
@@ -39,18 +39,37 @@ else ()
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DASN_DISABLE_OER_SUPPORT -DASN_PDU_COLLECTION -L. -ggdb3 -L/usr/lib  -L/usr/local/lib -Wall -W -Wpedantic")
 
 endif ()
+
 include_directories(RIC-E2-TERMINATION
         RIC-E2-TERMINATION/3rdparty/oranE2
+        RIC-E2-TERMINATION/3rdparty/oranE2SM
+        RIC-E2-TERMINATION/3rdparty/cxxopts/include
         RIC-E2-TERMINATION/3rdparty
         cmake-modules)
 
-file(GLOB ASN_MODULE_SRCS "RIC-E2-TERMINATION/3rdparty/oranE2/*.c")
-file(GLOB ASN_MODULE_HDRS "RIC-E2-TERMINATION/3rdparty/oranE2/*.h")
-
-add_library(asn1codec ${ASN_MODULE_SRCS} ${ASN_MODULE_HDRS})
+#E2AP library
+file(GLOB E2AP_ASN_MODULE_SRCS "RIC-E2-TERMINATION/3rdparty/oranE2/*.c")
+file(GLOB E2AP_ASN_MODULE_HDRS "RIC-E2-TERMINATION/3rdparty/oranE2/*.h")
 
+add_library(asn1codec ${E2AP_ASN_MODULE_SRCS} ${E2AP_ASN_MODULE_HDRS})
 install(TARGETS asn1codec DESTINATION /usr/lib)
-install(FILES ${ASN_MODULE_HDRS} DESTINATION /usr/include/asn1c)
+install(FILES ${E2AP_E2AP_ASN_MODULE_HDRS} DESTINATION /usr/include/asn1c)
+
+
+#E2SM library
+file(GLOB E2SM_ASN_MODULE_SRCS "RIC-E2-TERMINATION/3rdparty/oranE2SM/*.c")
+file(GLOB E2SM_ASN_MODULE_HDRS "RIC-E2-TERMINATION/3rdparty/oranE2SM/*.h")
+
+add_library(asn1ce2smcodec ${E2SM_ASN_MODULE_SRCS} ${E2SM_ASN_MODULE_HDRS})
+#add_custom_command(
+#        TARGET asn1ce2smcodec
+#        POST_BUILD
+#        COMMAND objcopy
+#        ARGS --prefix-symbols=e2sm_ libasn1ce2smcodec.a
+#)
+
+install(TARGETS asn1ce2smcodec DESTINATION /usr/lib)
+install(FILES ${E2SM_ASN_MODULE_HDRS} DESTINATION /usr/include/asn1c)
 
 include_directories(RIC-E2-TERMINATION/TEST)
 include_directories(RIC-E2-TERMINATION/TEST/e2smTest)
@@ -67,9 +86,9 @@ link_libraries(nsl
         m
         dl
         mdclog
-        rmr_nng
-        nng
+        rmr_si
         asn1codec
+        asn1ce2smcodec
         boost_system
         boost_log_setup
         boost_log
@@ -77,6 +96,7 @@ link_libraries(nsl
         boost_thread
         boost_system
         rt
+        tbb
         boost_filesystem
         cgreen
         pthread)
@@ -88,7 +108,13 @@ add_executable(e2 RIC-E2-TERMINATION/sctpThread.cpp
         RIC-E2-TERMINATION/base64.h
         RIC-E2-TERMINATION/base64.cpp
         RIC-E2-TERMINATION/ReadConfigFile.h
-        RIC-E2-TERMINATION/BuildRunName.h)
+        RIC-E2-TERMINATION/BuildRunName.h
+        RIC-E2-TERMINATION/statCollector.h
+        RIC-E2-TERMINATION/3rdparty/pugixml/src/pugiconfig.hpp
+        RIC-E2-TERMINATION/3rdparty/pugixml/src/pugixml.cpp
+        RIC-E2-TERMINATION/3rdparty/pugixml/src/pugixml.hpp
+        RIC-E2-TERMINATION/BuildXml.h)
+target_link_libraries(e2 libasn1ce2smcodec.a)
 target_link_libraries(e2 librmr_nng.a)
 target_link_libraries(e2 librmr_si.a)
 target_link_libraries(e2 libicui18n.a)
@@ -108,11 +134,11 @@ add_executable(b64Test
 
 
 add_executable(sctpClient
-        RIC-E2-TERMINATION/TEST/sctpClient/sctpClient.cpp
-        RIC-E2-TERMINATION/TEST/sctpClient/sctpClient.h
-        RIC-E2-TERMINATION/TEST/rmrClient/rmrClient.h
-        RIC-E2-TERMINATION/TEST/httpServer/HttpServer.cpp
-        RIC-E2-TERMINATION/TEST/httpServer/HttpServer.h
+        RIC-E2-TERMINATION/TEST/testAsn/sctpClient/sctpClient.cpp
+        RIC-E2-TERMINATION/TEST/testAsn/sctpClient/sctpClient.h
+        RIC-E2-TERMINATION/TEST/testAsn/rmrClient/rmrClient.h
+        RIC-E2-TERMINATION/TEST/testAsn/httpServer/HttpServer.cpp
+        RIC-E2-TERMINATION/TEST/testAsn/httpServer/HttpServer.h
         RIC-E2-TERMINATION/base64.h
         RIC-E2-TERMINATION/base64.cpp
         RIC-E2-TERMINATION/TEST/T1/E2Builder.h
@@ -126,7 +152,7 @@ target_link_libraries(sctpClient librmr_si.a)
 #target_link_libraries(sctpClient libnng.a)
 
 add_executable(setUpMessages
-        RIC-E2-TERMINATION/TEST/setUpMessages/SetUpMessages.cpp
+        RIC-E2-TERMINATION/TEST/testAsn/setUpMessages/SetUpMessages.cpp
         RIC-E2-TERMINATION/BuildRunName.h
         )