Updating RMR version to 4.8.5

[ric-plt/xapp-frame-cpp.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc913fa..01f8da0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,9 +28,9 @@
 project( ricxfcpp )
 cmake_minimum_required( VERSION 3.5 )
 
-set( major_version "1" )               # should be automatically populated from git tag later, but until CI process sets a tag we use this
-set( minor_version "2" )
-set( patch_level "1" )
+set( major_version "2" )               # should be automatically populated from git tag later, but until CI process sets a tag we use this
+set( minor_version "3" )
+set( patch_level "7" )
 
 set( install_root "${CMAKE_INSTALL_PREFIX}" )
 set( install_inc "include/ricxfcpp" )
@@ -149,17 +149,21 @@ endif()
 
 
 
+# bleeding cmake names are short novels; and when lines cannot be split they're a pain
+set ( srcd "${CMAKE_CURRENT_SOURCE_DIR}" )
+
 # this gets us round a chicken/egg problem. include files don't exist until make is run
 # but Cmake insists on having these exist when we add them to include directories to
 # enable code to find them after we build them.
 #
-include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/src/messaging;${CMAKE_CURRENT_SOURCE_DIR}/src/json;${CMAKE_CURRENT_SOURCE_DIR}/ext/jsmn" )
+include_directories("${srcd}/src/messaging;${srcd}/src/json;${srcd}/src/alarm;${srcd}/src/metrics;${srcd}/src/config;${srcd}/src/rest/model;${srcd}/ext/jsmn")
 
 # Compiler flags
 #
 set( CMAKE_POSITION_INDEPENDENT_CODE ON )
 set( CMAKE_C_FLAGS "-g " )
 set( CMAKE_CPP_FLAGS "-g " )
+set( CMAKE_CXX_FLAGS "-g " )
 if( GPROF )                                    # if set, we'll set profiling flag on compiles
        message( "+++ profiling is on" )
        set( CMAKE_C_FLAGS "-pg " )
@@ -181,12 +185,16 @@ execute_process( COMMAND  git submodule update --init -- ext/jsmn
 add_subdirectory( src/json )
 add_subdirectory( src/messaging )
 add_subdirectory( src/xapp )
+add_subdirectory( src/alarm )
+add_subdirectory( src/metrics )
+add_subdirectory( src/config )
+add_subdirectory( src/rest )
 #add_subdirectory( doc )                               # this will auto skip if {X}fm is not available
 
 # shared and static libraries are built from the same object files.
 #
 add_library( ricxfcpp_shared SHARED
-       "$<TARGET_OBJECTS:message_objects>;$<TARGET_OBJECTS:json_objects>;$<TARGET_OBJECTS:xapp_objects>"
+       "$<TARGET_OBJECTS:message_objects>;$<TARGET_OBJECTS:json_objects>;$<TARGET_OBJECTS:alarm_objects>;$<TARGET_OBJECTS:metrics_objects>;$<TARGET_OBJECTS:config_objects>;$<TARGET_OBJECTS:xapp_objects>"
 )
 set_target_properties( ricxfcpp_shared
        PROPERTIES
@@ -194,12 +202,12 @@ set_target_properties( ricxfcpp_shared
        SOVERSION ${major_version}
        VERSION ${major_version}.${minor_version}.${patch_level}
 )
-target_include_directories( ricxfcpp_shared PUBLIC "src/messenger" "src/xapp" )
+#target_include_directories( ricxfcpp_shared PUBLIC "src/alarm" "src/metrics" "src/messenger" "src/xapp" )
 
 # we only build/export the static archive (.a) if generating a dev package
 if( DEV_PKG )
        add_library( ricxfcpp_static STATIC
-               "$<TARGET_OBJECTS:message_objects>;$<TARGET_OBJECTS:json_objects>;$<TARGET_OBJECTS:xapp_objects>"
+               "$<TARGET_OBJECTS:message_objects>;$<TARGET_OBJECTS:json_objects>;$<TARGET_OBJECTS:alarm_objects>;$<TARGET_OBJECTS:config_objects>;$<TARGET_OBJECTS:metrics_objects>;$<TARGET_OBJECTS:xapp_objects>"
        )
        set_target_properties( ricxfcpp_static
                PROPERTIES
@@ -207,14 +215,14 @@ if( DEV_PKG )
                SOVERSION ${major_version}
                VERSION ${major_version}.${minor_version}.${patch_level}
        )
-       target_include_directories( ricxfcpp_static PUBLIC "src/messenger" "src/xapp" )
+#      target_include_directories( ricxfcpp_static PUBLIC "src/alarm" "src/metrics" "src/messenger" "src/xapp" )
 endif()
 
 # -------- unit testing -------------------------------------------------------
 enable_testing()
 add_test(
        NAME drive_unit_tests
-       COMMAND bash ../test/unit_test.sh -q
+       COMMAND bash ../test/unit_test.sh -q CMBUILD=${CMAKE_CURRENT_BINARY_DIR}
        WORKING_DIRECTORY ../test
 )
 
@@ -232,9 +240,9 @@ else()
 endif()
 
 install( TARGETS ${target_list} EXPORT LibraryConfig
-       LIBRARY  DESTINATION ${install_lib}
-       ARCHIVE  DESTINATION ${install_lib}
-       PUBLIC_HEADER DESTINATION ${install_inc}
+       LIBRARY  DESTINATION ${install_lib}
+       ARCHIVE  DESTINATION ${install_lib}
+       PUBLIC_HEADER DESTINATION ${install_inc}
 )
 
 unset( DEV_PKG  CACHE )                        # prevent from being a hidden setting if user redoes things