improve includes

gcontini

2020-03-14 4fed16072030c3176e3ace1b270d3144b0714f99

 CMakeLists.txt

@@ -34,22 +34,23 @@
   SET(CMAKE_CROSSCOMPILING_EMULATOR "wine")   
ENDIF()

SET (OPENSSL_USE_STATIC_LIBS ON)
SET (OPENSSL_USE_STATIC_LIBS TRUE)
IF(${STATIC_RUNTIME})
   SET(OPENSSL_MSVC_STATIC_RT TRUE)
ENDIF(${STATIC_RUNTIME})
find_package(OpenSSL COMPONENTS Crypto QUIET)
IF(OPENSSL_FOUND)
   MESSAGE(STATUS "Found openssl version ${OPENSSL_VERSION}")
   MESSAGE(STATUS "Found openssl version ${OPENSSL_VERSION} -licensecc")
ENDIF(OPENSSL_FOUND)

if(UNIX) #this is true for all the linux systems but not for cross compiling "linux->windows"
   IF(${STATIC_RUNTIME})
      set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++ -static")
      #SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
   ENDIF(${STATIC_RUNTIME})
   IF(NOT OPENSSL_FOUND)
      MESSAGE(SEND_ERROR "Openssl required in Linux, please install it or specify -DOPENSSL_ROOT")
   ENDIF(NOT OPENSSL_FOUND)
	
   #Zlib required when openssl version < 1.0.1f (centos 7)
   SET ( ZLIB_USE_STATIC_LIBS ON ) 
   find_package(ZLIB REQUIRED)
   list(APPEND EXTERNAL_LIBS ${ZLIB_LIBRARIES})
   MESSAGE(STATUS "Found zlib version ${ZLIB_VERSION} ")
   
    find_package(Threads)
   if(THREADS_HAVE_PTHREAD_ARG)
@@ -59,17 +60,19 @@
            list(APPEND EXTERNAL_LIBS "${CMAKE_THREAD_LIBS_INIT}")
      endif()
   endif(THREADS_HAVE_PTHREAD_ARG)

   #Zlib required when openssl version < 1.0.1f (centos 7)
   IF(OPENSSL_VERSION VERSION_LESS_EQUAL 1.0.2)
      SET ( ZLIB_USE_STATIC_LIBS ON ) 
      find_package(ZLIB REQUIRED)
      list(APPEND EXTERNAL_LIBS ${ZLIB_LIBRARIES})
      MESSAGE(STATUS "Found zlib version ${ZLIB_VERSION_STRING} - licensecc")
   ELSE(OPENSSL_VERSION VERSION_LESS_EQUAL 1.0.2)
       MESSAGE(STATUS "openssl ${OPENSSL_VERSION} zlib not required - licensecc")
   ENDIF(OPENSSL_VERSION VERSION_LESS_EQUAL 1.0.2)
   
   find_program( MEMORYCHECK_COMMAND valgrind )
   set( MEMORYCHECK_COMMAND_OPTIONS "--trace-children=yes --leak-check=full" )
	
   if(USE_DBUS_IDENTIFIER)
       FIND_PACKAGE(Dbus REQUIRED)
       add_definitions(-DUSE_DBUS)
       include_directories(${DBUS_INCLUDE_DIR})
       include_directories(${DBUS_ARCH_INCLUDE_DIR})
       list(APPEND EXTERNAL_LIBS ${DBUS_LIBRARIES})
   endif(USE_DBUS_IDENTIFIER)  
   set(main_lib_dest "lib/${PROJECT_NAME}")  
else(UNIX)
   IF(NOT OPENSSL_FOUND)
@@ -111,21 +114,23 @@
  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})
message( STATUS "CXX compiler      : " ${CMAKE_CXX_COMPILER})
message( STATUS "CXX compiler flags: " ${CMAKE_CXX_FLAGS})
message( STATUS "C compiler          : " ${CMAKE_C_COMPILER})
message( STATUS "C compiler flags    : " ${CMAKE_C_FLAGS})
message( STATUS "CXX compiler        : " ${CMAKE_CXX_COMPILER})
message( STATUS "CXX compiler flags  : " ${CMAKE_CXX_FLAGS})
message( STATUS "CXX compiler flags debug : " ${CMAKE_CXX_FLAGS_DEBUG})
message( STATUS "CXX compiler flags release: " ${CMAKE_CXX_FLAGS_RELEASE})
if(CMAKE_BUILD_TYPE)
  message( STATUS "Build type        : " ${CMAKE_BUILD_TYPE})
  message( STATUS "Build type          : " ${CMAKE_BUILD_TYPE})
endif(CMAKE_BUILD_TYPE)
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} )
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)

@@ -150,6 +155,7 @@
      MARK_AS_ADVANCED(BUILDNAME)
      add_subdirectory(test)
   ENDIF(BUILD_TESTING)
   add_subdirectory("src/inspector")
ELSE(Boost_FOUND)
   message(WARNING "Boost not found, disabling tests")
ENDIF(Boost_FOUND)
@@ -160,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")