improve includes

gcontini

2020-03-14 4fed16072030c3176e3ace1b270d3144b0714f99

improve includes

 CMakeLists.txt

@@ -114,8 +114,8 @@
  COMMENT "generating ${LCC_PROJECT_PUBLIC_KEY}"
  USES_TERMINAL
)
include_directories( ${LCC_INCLUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/include" )
add_custom_target(project_initialize DEPENDS "${LCC_PROJECT_PUBLIC_KEY}" "${LCC_PROJECT_PRIVATE_KEY}")
include_directories( ${LCC_INCLUDE_DIR} ${CMAKE_BINARY_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/include")

message( STATUS "C compiler        : " ${CMAKE_C_COMPILER})
message( STATUS "C compiler flags  : " ${CMAKE_C_FLAGS})
@@ -129,6 +129,8 @@
message( STATUS "Install prefix    : " ${CMAKE_INSTALL_PREFIX})
message( STATUS "Project name      : " ${LCC_PROJECT_NAME} )
message( STATUS "Project base dir  : " ${LCC_PROJECTS_BASE_DIR}/${LCC_PROJECT_NAME} )
get_property(inc_dirs DIRECTORY PROPERTY INCLUDE_DIRECTORIES)
message( STATUS "Include dirs : " "${inc_dirs}" )

add_subdirectory(src)

@@ -164,6 +166,7 @@
    SET(DOXYGEN_EXCLUDE_PATTERNS "*/library/ini/*;*/doc/resources/*")
    SET(DOXYGEN_DISABLE_INDEX YES)
    SET(DOXYGEN_GENERATE_TREEVIEW YES)
    SET(DOXYGEN_GENERATE_XML YES)
    SET(DOXYGEN_LAYOUT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/doc/DoxygenLayout.xml")
    doxygen_add_docs(docs doc src include/licensecc COMMENT "doxygen docs")
    file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/doc/resources/" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/html")

 src/library/CMakeLists.txt

@@ -32,9 +32,11 @@
ENDIF(UNIX OR OPENSSL_FOUND)

target_include_directories(licensecc_static
    INTERFACE 
    PUBLIC 
        $<INSTALL_INTERFACE:include>
        $<INSTALL_INTERFACE:include/${PROJECT_NAME}/${LCC_PROJECT_NAME}>
        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../include>
        $<BUILD_INTERFACE:${LCC_INCLUDE_DIR}>
)

add_library(licensecc::licensecc_static ALIAS licensecc_static)

 src/library/LicenseReader.cpp

@@ -22,8 +22,6 @@
#include <stdlib.h>
#include <math.h>

#include <public_key.h>
#include <licensecc_properties.h>
#include <licensecc/licensecc.h>

#include "base/base.h"

 src/library/base/CMakeLists.txt

@@ -6,8 +6,6 @@
    logger.c
)

add_dependencies( base project_initialize )

if(CODE_COVERAGE AND UNIX)
      MESSAGE(STATUS "Enabling code coverage")
      target_compile_options(base PUBLIC

 src/library/locate/CMakeLists.txt

@@ -7,6 +7,11 @@
    LocatorFactory.cpp
)

target_include_directories(locate PRIVATE
        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../include>
        $<BUILD_INTERFACE:${LCC_INCLUDE_DIR}>
)

if(CODE_COVERAGE AND UNIX)
      target_compile_options(locate PUBLIC -O0 -g --coverage)
endif(CODE_COVERAGE AND UNIX)

 src/library/os/CMakeLists.txt

@@ -31,6 +31,9 @@
        windows/network.cpp)
ENDIF(UNIX OR OPENSSL_FOUND)

#dependency of signature_verifier.cpp
add_dependencies( os project_initialize )

if(CODE_COVERAGE AND UNIX)
      MESSAGE(STATUS "Enabling code coverage")
      target_compile_options(os PUBLIC -O0 -g --coverage)

 src/library/os/os.h

@@ -12,7 +12,6 @@
extern "C" {
#endif

#include "../base/base.h"
#include <stddef.h>
#include <string.h>
#include <ctype.h>
@@ -23,6 +22,7 @@
#include <unistd.h>
#include <stdbool.h>
#endif
#include "../base/base.h"

typedef struct {
    int id;