submodule fix

gcontini

2019-11-30 2f0af3f9062c77b5c04d068e51f2b66c88987b8a

 CMakeLists.txt

@@ -29,7 +29,7 @@
#find lcc executable or build it.
find_package(lcc REQUIRED) 

#Not sure about this. My system doesn't support binfmt misc
#My 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()
@@ -39,7 +39,7 @@
   target_architecture( TARGET_ARCHITECTURE )
   message(STATUS "architecture detected: ${TARGET_ARCHITECTURE}")
   
   #Boost > 3.15 handle the /MD flag more nicely than this
   #cmake > 3.15 handle the /MD flag more nicely than this
   if(${STATIC_RUNTIME})
      string(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
      string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
@@ -62,15 +62,15 @@
   find_package(OpenSSL REQUIRED COMPONENTS Crypto)
   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} ")
    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)
   #Zlib required when openssl version < 1.0.1f
   #SET ( ZLIB_USE_STATIC_LIBS ON )
   #find_package(ZLIB REQUIRED)
@@ -84,12 +84,12 @@
       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)
   #if(NOT MINGW)
    #   list(APPEND EXTERNAL_LIBS ${CMAKE_DL_LIBS}) 
   #endif(NOT MINGW)
endif(UNIX)


#initialize project
#load the current project from files or find it from environment variables or create a default one
set(LCC_INCLUDE_DIR "${LCC_PROJECTS_BASE_DIR}/${LCC_PROJECT_NAME}/include/${PROJECT_NAME}/${LCC_PROJECT_NAME}" )
set(LCC_PROJECT_PUBLIC_KEY "${LCC_INCLUDE_DIR}/public_key.h" )
@@ -101,10 +101,9 @@
  COMMENT "generating ${LCC_PROJECT_PUBLIC_KEY}"
  USES_TERMINAL
)

add_custom_target(project_initialize DEPENDS "${LCC_PROJECT_PUBLIC_KEY}" "${LCC_PROJECT_PRIVATE_KEY}")

include_directories( ${LCC_INCLUDE_DIR} ${CMAKE_BINARY_DIR} )
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})
@@ -133,7 +132,7 @@
       message(STATUS "Compiler architecture: ${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}")
endif()
SET( Boost_USE_STATIC_LIBS ON )
find_package(Boost REQUIRED COMPONENTS date_time unit_test_framework program_options system filesystem)
find_package(Boost REQUIRED COMPONENTS unit_test_framework system filesystem)

#if boost is found enable tests
IF(Boost_FOUND)
@@ -141,12 +140,11 @@
   IF(BUILD_TESTING)
      SET(BUILDNAME "${BUILDNAME}" CACHE STRING "Name of build on the dashboard")
      MARK_AS_ADVANCED(BUILDNAME)
      add_definitions(-DBOOST_ALL_NO_LIB) #Disable Boost Microsoft magic, all dependencies are handled by cmake
      add_definitions(-DBOOST_LIB_DIAGNOSTIC) #Check it is really disabled
      include_directories(${Boost_INCLUDE_DIRS}) 
      add_subdirectory(test)
   ENDIF(BUILD_TESTING)
ELSE(Boost_FOUND)
   message(WARNING "Boost not found, disabling tests")
ENDIF(Boost_FOUND)

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