fix new tests

gcontini

2019-12-08 bf76bcf6c991746ccb95f07bc3baa066bdab3025

 CMakeLists.txt

@@ -1,11 +1,5 @@
cmake_minimum_required(VERSION 2.8.11 FATAL_ERROR)
cmake_minimum_required(VERSION 3.6 FATAL_ERROR)

#version variables, major and minor must be 1 character only
SET(LICENSECC_MAJOR_VERSION 1)
SET(LICENSECC_MINOR_VERSION 1)
SET(LICENSECC_PATCH_VERSION 0 CACHE STRING "Licensecc patch version string")
SET(LICENSECC_INT_VERSION "${LICENSECC_MAJOR_VERSION}${LICENSECC_MINOR_VERSION}${LICENSECC_PATCH_VERSION}")
SET(LICENSECC_VERSION "${LICENSECC_MAJOR_VERSION}.${LICENSECC_MINOR_VERSION}.${LICENSECC_PATCH_VERSION}")
SET(LICENSECC_SHORT_LICENSE "BSD Software License")

SET(CMAKE_DISABLE_SOURCE_CHANGES OFF) #keys are generated in the source tree by default
@@ -22,47 +16,37 @@
   set(LCC_PROJECTS_BASE_DIR "${CMAKE_SOURCE_DIR}/projects") 
ENDIF(NOT LCC_PROJECTS_BASE_DIR)

project (licensecc C CXX )
SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
cmake_policy(SET CMP0048 NEW)
project (licensecc 
         VERSION 2.0.0
         DESCRIPTION "Copy protection and licensing library" 
         LANGUAGES C CXX)

set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_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()

if(MSVC)
   include(target_arch)
   target_architecture( TARGET_ARCHITECTURE )
   message(STATUS "architecture detected: ${TARGET_ARCHITECTURE}")
	
   #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}")
      string(REPLACE "/MDd" "/MTd" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
      string(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
      SET(Boost_USE_STATIC_RUNTIME ON)
   endif(${STATIC_RUNTIME})

   add_definitions("/D _CRT_SECURE_NO_WARNINGS")
else(MSVC)
    if(MINGW)
        list(APPEND EXTERNAL_LIBS "-lcrypt32 -lws2_32 -liphlpapi")
        SET(CMAKE_EXE_LINKER_FLAGS "-static")
    endif(MINGW)
endif(MSVC)
SET (OPENSSL_USE_STATIC_LIBS ON)
find_package(OpenSSL COMPONENTS Crypto)
IF(OPENSSL_FOUND)
   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"
   #find a static version of openssl crypto library
   SET ( OPENSSL_USE_STATIC_LIBS ON )
   find_package(OpenSSL REQUIRED COMPONENTS Crypto)
   include_directories(${OPENSSL_INCLUDE_DIR})
    #list(APPEND EXTERNAL_LIBS ${OPENSSL_CRYPTO_LIBRARY})
   MESSAGE(STATUS "Found openssl version ${OPENSSL_VERSION} ")
   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")
@@ -71,22 +55,41 @@
            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)
   #MESSAGE(STATUS "Found zlib version ${ZLIB_VERSION} ")
	
   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)    
   #if(NOT MINGW)
    #   list(APPEND EXTERNAL_LIBS ${CMAKE_DL_LIBS}) 
   #endif(NOT MINGW)
   endif(USE_DBUS_IDENTIFIER)  
   set(main_lib_dest "lib/${PROJECT_NAME}")  
else(UNIX)
   if(MSVC)
      include(target_arch)
      target_architecture( TARGET_ARCHITECTURE )
      message(STATUS "architecture detected: ${TARGET_ARCHITECTURE}")
		
      #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}")
         string(REPLACE "/MDd" "/MTd" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
         string(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
         SET(Boost_USE_STATIC_RUNTIME ON)
      endif(${STATIC_RUNTIME})
	
      add_definitions("/D _CRT_SECURE_NO_WARNINGS")
   else(MSVC)
       if(MINGW)
           list(APPEND EXTERNAL_LIBS "-lcrypt32 -lbcrypt -lws2_32 -liphlpapi")
           SET(CMAKE_EXE_LINKER_FLAGS "-static")
       endif(MINGW)
   endif(MSVC)
   set(main_lib_dest "${PROJECT_NAME}")  
endif(UNIX)

#initialize project
@@ -102,7 +105,6 @@
  USES_TERMINAL
)
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})
@@ -132,7 +134,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,5 +148,11 @@
   message(WARNING "Boost not found, disabling tests")
ENDIF(Boost_FOUND)

install(DIRECTORY ${LCC_INCLUDE_DIR} DESTINATION include/${PROJECT_NAME})
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include)
  
install(FILES src/cmake/licensecc-config.cmake DESTINATION ${main_lib_dest})

include(CMakePackageConfigHelpers)
write_basic_package_version_file(${CMAKE_BINARY_DIR}/licensecc-config-version.cmake COMPATIBILITY SameMajorVersion)
install(FILES ${CMAKE_BINARY_DIR}/licensecc-config-version.cmake DESTINATION ${main_lib_dest})