refactor cmake

CMakeLists.txt

@@ -4,29 +4,22 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-if(LIBPARAMS_PLATFORM STREQUAL "stm32f103")
-elseif(LIBPARAMS_PLATFORM STREQUAL "stm32g0b1")
-elseif(LIBPARAMS_PLATFORM STREQUAL "ubuntu")
-else()
-  message(SEND_ERROR "LIBPARAMS_PLATFORM is not specified! Options: stm32f103, stm32g0b1, ubuntu.")
+cmake_minimum_required(VERSION 3.15.3)
+project(libparams VERSION 0.9.0)
+
+set(SUPPORTED_PLATFORMS "stm32f103;stm32g0b1;ubuntu")
+if(NOT LIBPARAMS_PLATFORM IN_LIST SUPPORTED_PLATFORMS)
+  message(SEND_ERROR "LIBPARAMS_PLATFORM is not specified or unsupported! Options: stm32f103, stm32g0b1, ubuntu.")
 endif()
 
-FILE(GLOB libparamsPlatformSpecificSrc
-  ${CMAKE_CURRENT_LIST_DIR}/platform_specific/${LIBPARAMS_PLATFORM}/*.c*
-  )
-
-  FILE(GLOB libparamsPlatformSpecificHeaders
-  ${CMAKE_CURRENT_LIST_DIR}/platform_specific/${LIBPARAMS_PLATFORM}/
-  )
-
-  set(libparamsSrc
-  ${CMAKE_CURRENT_LIST_DIR}/libparams/rom.c
-  ${CMAKE_CURRENT_LIST_DIR}/libparams/storage.c
+include(${CMAKE_CURRENT_LIST_DIR}/platform_specific/${LIBPARAMS_PLATFORM}/config.cmake)
+
+add_library(${PROJECT_NAME} STATIC
+  ${CMAKE_CURRENT_LIST_DIR}/src/rom.c
+  ${CMAKE_CURRENT_LIST_DIR}/src/storage.c
   ${libparamsPlatformSpecificSrc}
-  )
-
-  set(libparamsHeaders
-  ${CMAKE_CURRENT_LIST_DIR}/libparams/
-  -  ${CMAKE_CURRENT_LIST_DIR}/platform_specific/${LIBPARAMS_PLATFORM}/
-  ${libparamsPlatformSpecificHeaders}
+)
+target_include_directories(${PROJECT_NAME} PUBLIC
+  ${CMAKE_CURRENT_LIST_DIR}/include/libparams/
+  ${CMAKE_CURRENT_LIST_DIR}/platform_specific/${LIBPARAMS_PLATFORM}/
 )

platform_specific/stm32f103/config.cmake

@@ -0,0 +1,3 @@
+set(libparamsPlatformSpecificSrc
+  ${CMAKE_CURRENT_LIST_DIR}/flash_driver.c
+)

platform_specific/stm32g0b1/config.cmake

@@ -0,0 +1,3 @@
+set(libparamsPlatformSpecificSrc
+  ${CMAKE_CURRENT_LIST_DIR}/flash_driver.c
+)

platform_specific/ubuntu/config.cmake

@@ -0,0 +1,4 @@
+set(libparamsPlatformSpecificSrc
+  ${CMAKE_CURRENT_LIST_DIR}/flash_driver.cpp
+  ${CMAKE_CURRENT_LIST_DIR}/YamlParameters.cpp
+)

scripts/code_style/get_pathes.sh

@@ -4,7 +4,8 @@ SCRIPTS_DIR="$(dirname "$CODE_STYLE_DIR")"
 REPO_DIR="$(dirname "$SCRIPTS_DIR")"
 
 FOLDERS=(
-   "$REPO_DIR/libparams/*"
+   "$REPO_DIR/src/*"
+   "$REPO_DIR/include/*"
    "$REPO_DIR/platform_specific/*/*"
 )
 

scripts/cppcheck.sh

@@ -10,7 +10,7 @@ cppcheck --enable=all \
          --suppress=missingIncludeSystem \
          --suppress=unusedFunction \
          --suppress=toomanyconfigs \
-         -I ${REPO_DIR}/libparams \
+         -I ${REPO_DIR}/include/libparams \
          -I ${REPO_DIR}/platform_specific/ubuntu/ \
          -I /usr/include/ \
-         ${REPO_DIR}/libparams/
+         ${REPO_DIR}/src/

sonar-project.properties

@@ -1,6 +1,6 @@
 sonar.organization=ponomarevda
 sonar.projectKey=PonomarevDA_libparams
-sonar.sources=libparams
+sonar.sources=src,include
 sonar.cfamily.build-wrapper-output=bw-output
 sonar.host.url=https://sonarcloud.io
 sonar.cfamily.gcov.reportsPath=build

tests/params_generator/CMakeLists.txt

@@ -10,15 +10,15 @@ set(CMAKE_CXX_STANDARD 17)
 
 cmake_path(GET CMAKE_CURRENT_LIST_DIR PARENT_PATH TESTS_DIR)
 cmake_path(GET TESTS_DIR PARENT_PATH LIBPARAMS_ROOT_DIR)
-set(LIBPARAMS_SOURCE_CODE_PATH ${LIBPARAMS_ROOT_DIR}/libparams)
 set(PLATFORM_SPECIFIC_PATH ${LIBPARAMS_ROOT_DIR}/platform_specific/ubuntu)
 set(PARAMS_PATH ${LIBPARAMS_ROOT_DIR}/build/tests/params_generator)
 
 include_directories(
-    ${LIBPARAMS_SOURCE_CODE_PATH}
     ${PLATFORM_SPECIFIC_PATH}
     ${PARAMS_PATH}
 )
+set(LIBPARAMS_PLATFORM ubuntu)
+add_subdirectory(${LIBPARAMS_ROOT_DIR} ${CMAKE_BINARY_DIR}/libparams)
 
 enable_testing()
 find_package(GTest REQUIRED)
@@ -27,9 +27,7 @@ include(GoogleTest)
 FILE(GLOB GENERATED_PARAMS ${PARAMS_PATH}/*.c*)
 
 add_executable(${PROJECT_NAME} test.cpp
-               ${LIBPARAMS_SOURCE_CODE_PATH}/storage.c
-               ${LIBPARAMS_SOURCE_CODE_PATH}/rom.c
                ${GENERATED_PARAMS}
                ${PLATFORM_SPECIFIC_PATH}/flash_driver.cpp)
-target_link_libraries(${PROJECT_NAME} GTest::GTest GTest::Main)
+target_link_libraries(${PROJECT_NAME} GTest::GTest GTest::Main libparams)
 gtest_discover_tests(${PROJECT_NAME})

tests/platform_specific/stm32f103/Makefile

@@ -8,16 +8,16 @@ BUILD_DIR = ${ROOT_DIR}/build/tests/stm32f103_build
 # source
 ######################################
 C_SOURCES =                     	\
-${ROOT_DIR}/libparams/rom.c             	\
+${ROOT_DIR}/src/rom.c             	\
 ${ROOT_DIR}/platform_specific/stm32f103/flash_driver.c       \
-${ROOT_DIR}/libparams/storage.c           \
+${ROOT_DIR}/src/storage.c           \
 ../../params.c                         \
 main.c               				\
 application.c
 
 # C includes
 C_INCLUDES =    \
--I${ROOT_DIR}/libparams/	\
+-I${ROOT_DIR}/include/libparams/	\
 -I${ROOT_DIR}/platform_specific/stm32f103/ \
 -I./ \
 -I../../ 

tests/platform_specific/stm32g0b1/Makefile

@@ -8,16 +8,16 @@ BUILD_DIR = ${ROOT_DIR}/build/tests/stm32g0b1_build
 # source
 ######################################
 C_SOURCES =                         \
-${ROOT_DIR}/libparams/rom.c         \
+${ROOT_DIR}/src/rom.c         \
 ${ROOT_DIR}/platform_specific/stm32g0b1/flash_driver.c       \
-${ROOT_DIR}/libparams/storage.c     \
+${ROOT_DIR}/src/storage.c     \
 ../../params.c                      \
 main.c                              \
 application.c
 
 # C includes
 C_INCLUDES =    \
--I${ROOT_DIR}/libparams/	\
+-I${ROOT_DIR}/include/libparams/	\
 -I${ROOT_DIR}/platform_specific/stm32g0b1/ \
 -I./ \
 -I../../

tests/platform_specific/ubuntu/CMakeLists.txt

@@ -20,15 +20,20 @@ set(CMAKE_CXX_FLAGS_RELEASE "-O3")
 
 # Libraries
 set(LIBPARAMS_PLATFORM ubuntu)
-include(${ROOT_DIR}/CMakeLists.txt)
+
+include_directories(
+    ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+add_subdirectory(${ROOT_DIR} ${CMAKE_BINARY_DIR}/libparams)
 
 add_definitions(-DFLASH_DRIVER_STORAGE_FILE="${CMAKE_CURRENT_LIST_DIR}/default_params.yaml")
 
 add_executable(application
-    ${libparamsSrc}
     ${CMAKE_CURRENT_BINARY_DIR}/params.cpp
     ${CMAKE_CURRENT_LIST_DIR}/main.cpp
 )
+target_link_libraries(application libparams)
 
 execute_process(
     COMMAND ${ROOT_DIR}/scripts/generate_params.py --out-dir . -f ${CMAKE_CURRENT_LIST_DIR}/params.yaml
@@ -37,8 +42,3 @@ execute_process(
 if(NOT ret EQUAL 0)
     message( FATAL_ERROR "Params Generator has been failed. Abort.")
 endif()
-
-include_directories(
-    ${libparamsHeaders}
-    ${CMAKE_CURRENT_BINARY_DIR}
-)

tests/unit_tests/CMakeLists.txt

@@ -20,19 +20,21 @@ enable_testing()
 find_package(GTest REQUIRED)
 include_directories(${GTEST_INCLUDE_DIR})
 
-include_directories(.)
+include_directories(
+    ${UNIT_TESTS_DIR}
+    ${TESTS_DIR}
+    ${ROOT_DIR}/include/libparams
+    ${ROOT_DIR}/platform_specific/ubuntu
+)
 set(LIBPARAMS_PLATFORM ubuntu)
-include(${ROOT_DIR}/CMakeLists.txt)
 
 function(gen_test app_name test_file)
-    include_directories(
-        ${libparamsHeaders}
-        ${TESTS_DIR}
-    )
     add_executable(${app_name}
         ${test_file}
-        ${libparamsSrc}
         ${TESTS_DIR}/params.c
+        ${ROOT_DIR}/src/rom.c
+        ${ROOT_DIR}/src/storage.c
+        ${ROOT_DIR}/platform_specific/ubuntu/flash_driver.cpp
     )
     target_link_libraries(${app_name} gtest)
 endfunction()

tests/unit_tests/Makefile

@@ -22,10 +22,10 @@ coverage: create_build_dir
 	cd ${BUILD_DIR} && ./flash_driver
 
 	echo "\n1. Storage:"
-	cd ${BUILD_DIR} && gcov ${BUILD_DIR}/CMakeFiles/storage.dir${REPO_DIR}/libparams/storage.c.gcda
+	cd ${BUILD_DIR} && gcov ${BUILD_DIR}/CMakeFiles/storage.dir${REPO_DIR}/src/storage.c.gcda
 
 	echo "\n2. ROM:"
-	cd ${BUILD_DIR} && gcov ${BUILD_DIR}/CMakeFiles/rom.dir${REPO_DIR}/libparams/rom.c.gcda
+	cd ${BUILD_DIR} && gcov ${BUILD_DIR}/CMakeFiles/rom.dir${REPO_DIR}/src/rom.c.gcda
 
 	# echo "\n3. Ubuntu flash driver:"
 	cd ${BUILD_DIR} && gcov ${BUILD_DIR}/CMakeFiles/flash_driver.dir${REPO_DIR}/platform_specific/ubuntu/flash_driver.cpp.gcda