fix boost layout, update submodule

gcontini

2019-12-01 d02fce46e19f1a7b77a952210974a875c493593f

 CMakeLists.txt

@@ -23,13 +23,14 @@
ENDIF(NOT LCC_PROJECTS_BASE_DIR)

project (licensecc C CXX )
SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")

#find lcc executable or build it.
find_package(lcc REQUIRED) 

#My system doesn't support binfmt misc
#In case the build system doesn't support binfmt misc
IF( ( CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux" ) AND CMAKE_CROSSCOMPILING AND NOT DEFINED CMAKE_CROSSCOMPILING_EMULATOR )
   SET(CMAKE_CROSSCOMPILING_EMULATOR "wine")   
ENDIF()
@@ -51,32 +52,38 @@
   add_definitions("/D _CRT_SECURE_NO_WARNINGS")
else(MSVC)
    if(MINGW)
        list(APPEND EXTERNAL_LIBS "-lcrypt32 -lws2_32 -liphlpapi")
        list(APPEND EXTERNAL_LIBS "-lcrypt32 -lbcrypt -lws2_32 -liphlpapi")
        SET(CMAKE_EXE_LINKER_FLAGS "-static")
    endif(MINGW)
endif(MSVC)

if(UNIX) #this is true for all the linux systems but not for cross compiling "linux->windows"
   #find a static version of openssl crypto library
   SET ( OPENSSL_USE_STATIC_LIBS ON )
   find_package(OpenSSL REQUIRED COMPONENTS Crypto)
SET ( OPENSSL_USE_STATIC_LIBS ON )
find_package(OpenSSL COMPONENTS Crypto)
IF(OPENSSL_FOUND)
   add_definitions(-DHAS_OPENSSL)
   include_directories(${OPENSSL_INCLUDE_DIR})
    #list(APPEND EXTERNAL_LIBS ${OPENSSL_CRYPTO_LIBRARY})
    #find_package(Threads)
   #if(THREADS_HAVE_PTHREAD_ARG)
     #   list(APPEND EXTERNAL_LIBS "-pthread")
   #else(THREADS_HAVE_PTHREAD_ARG)
   #   if(CMAKE_THREAD_LIBS_INIT)
     #       list(APPEND EXTERNAL_LIBS "${CMAKE_THREAD_LIBS_INIT}")
   #   endif()
   #endif(THREADS_HAVE_PTHREAD_ARG)
   MESSAGE(STATUS "Found openssl version ${OPENSSL_VERSION} ")
   #Zlib required when openssl version < 1.0.1f
   #SET ( ZLIB_USE_STATIC_LIBS ON )
   #find_package(ZLIB REQUIRED)
   #MESSAGE(STATUS "Found zlib version ${ZLIB_VERSION} ")
   MESSAGE(STATUS "Found openssl version ${OPENSSL_VERSION}")
ELSE(OPENSSL_FOUND)
   MESSAGE(STATUS "OpenSSL not found")
ENDIF(OPENSSL_FOUND)

if(UNIX) #this is true for all the linux systems but not for cross compiling "linux->windows"
   IF(NOT OPENSSL_FOUND)
      MESSAGE(SEND_ERROR "Openssl required in Linux, please install it or specify -DOPENSSL_ROOT")
   ENDIF(NOT OPENSSL_FOUND)
	
    find_package(Threads)
   if(THREADS_HAVE_PTHREAD_ARG)
        list(APPEND EXTERNAL_LIBS "-pthread")
   else(THREADS_HAVE_PTHREAD_ARG)
      if(CMAKE_THREAD_LIBS_INIT)
            list(APPEND EXTERNAL_LIBS "${CMAKE_THREAD_LIBS_INIT}")
      endif()
   endif(THREADS_HAVE_PTHREAD_ARG)
	
   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)
@@ -84,9 +91,6 @@
       include_directories(${DBUS_ARCH_INCLUDE_DIR})
       list(APPEND EXTERNAL_LIBS ${DBUS_LIBRARIES})
   endif(USE_DBUS_IDENTIFIER)    
   if(NOT MINGW)
       list(APPEND EXTERNAL_LIBS ${CMAKE_DL_LIBS}) 
   endif(NOT MINGW)
endif(UNIX)

#initialize project
@@ -103,7 +107,6 @@
)
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})
@@ -119,6 +122,7 @@
message( STATUS "Project name      : " ${LCC_PROJECT_NAME} )
message( STATUS "Project base dir  : " ${LCC_PROJECTS_BASE_DIR}/${LCC_PROJECT_NAME} )

install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include)
add_subdirectory(src)

#boost is required only for tests
@@ -133,7 +137,7 @@
       message(STATUS "Compiler architecture: ${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}")
endif()
SET( Boost_USE_STATIC_LIBS ON )
find_package(Boost REQUIRED COMPONENTS unit_test_framework system filesystem)
find_package(Boost COMPONENTS unit_test_framework system filesystem)

#if boost is found enable tests
IF(Boost_FOUND)
@@ -146,4 +150,3 @@
ELSE(Boost_FOUND)
   message(WARNING "Boost not found, disabling tests")
ENDIF(Boost_FOUND)