Code Review / ric-plt / e2.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
5.0.4 Fix Prometheus bug in number of bytes.
[ric-plt/e2.git] / RIC-E2-TERMINATION / CMakeLists.txt
diff --git a/RIC-E2-TERMINATION/CMakeLists.txt b/RIC-E2-TERMINATION/CMakeLists.txt
index b941163..95986fe 100644 (file)
--- a/RIC-E2-TERMINATION/CMakeLists.txt
+++ b/RIC-E2-TERMINATION/CMakeLists.txt
@@ -30,36 +30,48 @@ set(PROJECT_TEST_NAME "e2")
 
 if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
     #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DASN_DISABLE_OER_SUPPORT -DASN_PDU_COLLECTION -L. -LRIC-E2-TERMINATION/tracelibcpp/build -ggdb3 -Wall -W -Wpedantic")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DASN_DISABLE_OER_SUPPORT -DASN_PDU_COLLECTION -L. -O3 -L/usr/lib -Wall -Wpedantic")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DASN_DISABLE_OER_SUPPORT -DASN_PDU_COLLECTION -L. -g -ggdb3 -O3 -L/usr/lib -L/usr/local/lib -Wall -Wpedantic")
     #only c code with -O3
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DASN_DISABLE_OER_SUPPORT -DASN_PDU_COLLECTION -L. -O3 -L/usr/lib -Wall -W -Wpedantic")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DASN_DISABLE_OER_SUPPORT -DASN_PDU_COLLECTION -L. -O3 -L/usr/lib -L/usr/local/lib -Wall -W -Wpedantic")
 else ()
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DASN_DISABLE_OER_SUPPORT -DASN_PDU_COLLECTION -L. -ggdb3 --coverage -L/usr/lib -Wall -Wpedantic")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DASN_DISABLE_OER_SUPPORT -DASN_PDU_COLLECTION -L. -ggdb3 --coverage -L/usr/lib  -L/usr/local/lib -Wall -Wpedantic")
     #only c code with -O3
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DASN_DISABLE_OER_SUPPORT -DASN_PDU_COLLECTION -L. -ggdb3 -L/usr/lib -Wall -W -Wpedantic")
+    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/asn1cFiles
+        RIC-E2-TERMINATION/3rdparty/oranE2
+        RIC-E2-TERMINATION/3rdparty/oranE2SM
+        RIC-E2-TERMINATION/3rdparty/cxxopts/include
+        RIC-E2-TERMINATION/3rdparty/prometheus-cpp
+        RIC-E2-TERMINATION/3rdparty/prometheus-cpp/core/include
         RIC-E2-TERMINATION/3rdparty
         cmake-modules)
 
-file(GLOB ASN_MODULE_SRCS "RIC-E2-TERMINATION/3rdparty/asn1cFiles/*.c")
-file(GLOB ASN_MODULE_HDRS "RIC-E2-TERMINATION/3rdparty/asn1cFiles/*.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)
 
 
-#include_directories(RIC-E2-TERMINATION/TEST/asn1c)
-#
-#file(GLOB ASNE2SMC "RIC-E2-TERMINATION/TEST/asn1c/*.c")
-#file(GLOB ASNE2SMH "RIC-E2-TERMINATION/TEST/asn1c/*.h")
-#RIC-E2-TERMINATION/
-#add_library(asne2smcodec ${ASNE2SMC})
+#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,11 +79,6 @@ include_directories(RIC-E2-TERMINATION/TEST/T1)
 include_directories(RIC-E2-TERMINATION/TEST/T2)
 
 
-add_library(e2sm
-        RIC-E2-TERMINATION/TEST/e2sm.c
-        RIC-E2-TERMINATION/TEST/e2sm.h
-        ${ASN_MODULE_HDRS})
-
 add_definitions(-DBOOST_LOG_DYN_LINK)
 
 link_libraries(nsl
@@ -81,10 +88,9 @@ link_libraries(nsl
         m
         dl
         mdclog
-        rmr_nng
-        nng
-        e2sm
+        rmr_si
         asn1codec
+        asn1ce2smcodec
         boost_system
         boost_log_setup
         boost_log
@@ -92,8 +98,14 @@ link_libraries(nsl
         boost_thread
         boost_system
         rt
+        tbb
         boost_filesystem
         cgreen
+        prometheus-cpp-core
+        prometheus-cpp-pull
+        prometheus-cpp-push
+        z
+        curl
         pthread)
 
 add_executable(e2 RIC-E2-TERMINATION/sctpThread.cpp
@@ -103,10 +115,22 @@ 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/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_si.a)
+target_link_libraries(e2 libicui18n.a)
+target_link_libraries(e2 libicuuc.a)
+target_link_libraries(e2 libicudata.a)
+target_link_libraries(e2 prometheus-cpp-core.a)
+target_link_libraries(e2 prometheus-cpp-pull.a)
+target_link_libraries(e2 prometheus-cpp-push.a)
 
-add_executable(e2smtest
-        RIC-E2-TERMINATION/TEST/e2smTest/e2smtest.cpp)
+#target_link_libraries(e2 libnng.a)
 
 add_executable(testConfigFile
         RIC-E2-TERMINATION/ReadConfigFile.h
@@ -117,19 +141,29 @@ add_executable(b64Test
         RIC-E2-TERMINATION/base64.h
         RIC-E2-TERMINATION/TEST/base64/testBase64.cpp)
 
-add_executable(T1
+
+add_executable(sctpClient
+        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
-        RIC-E2-TERMINATION/TEST/T1/E2Setup.cpp
+
         #RIC-E2-TERMINATION/TEST/T1/Test1.cpp
         #RIC-E2-TERMINATION/TEST/T1/
         )
+target_link_libraries(sctpClient libpistache.a)
+target_link_libraries(sctpClient librmr_si.a)
 
+add_executable(setUpMessages
+        RIC-E2-TERMINATION/TEST/testAsn/setUpMessages/SetUpMessages.cpp
+        RIC-E2-TERMINATION/BuildRunName.h
+        )
 
-find_package(RapidJSON)
-
-add_executable(logTest
-        RIC-E2-TERMINATION/TEST/ASN_LOG/LogTest.h
-        RIC-E2-TERMINATION/TEST/ASN_LOG/LogTest.cpp)
+#find_package(RapidJSON)
 
 add_executable(teste2
         RIC-E2-TERMINATION/TEST/e2test.h
@@ -149,7 +183,7 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
             ${PROJECT_SOURCE_DIR}/log'
             '${PROJECT_SOURCE_DIR}/docs'
             '${PROJECT_SOURCE_DIR}/RIC-E2-TERMINATION/3rdparty'
-            '${PROJECT_SOURCE_DIR}/RIC-E2-TERMINATION/asn1cFiles'
+            '${PROJECT_SOURCE_DIR}/RIC-E2-TERMINATION/oranE2'
             '${PROJECT_SOURCE_DIR}/RIC-E2-TERMINATION/TEST'
             '${PROJECT_SOURCE_DIR}/RIC-E2-TERMINATION/config')
 
@@ -157,7 +191,7 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
             ${PROJECT_SOURCE_DIR}/log'
             '${PROJECT_SOURCE_DIR}/docs'
             '${PROJECT_SOURCE_DIR}/RIC-E2-TERMINATION/3rdparty'
-            '${PROJECT_SOURCE_DIR}/RIC-E2-TERMINATION/asn1cFiles'
+            '${PROJECT_SOURCE_DIR}/RIC-E2-TERMINATION/oranE2'
             '${PROJECT_SOURCE_DIR}/RIC-E2-TERMINATION/TEST'
             '${PROJECT_SOURCE_DIR}/RIC-E2-TERMINATION/config')
     append_coverage_compiler_flags()