improvements for issue #42

gcontini

2019-11-10 1c18dbea1cbd759aaf42a7e78afe0d8781065a50

 CMakeLists.txt

@@ -11,16 +11,16 @@
SET(CMAKE_DISABLE_SOURCE_CHANGES OFF) #keys are generated in the source tree by default
SET(CMAKE_DISABLE_IN_SOURCE_BUILD ON)

IF(NOT LCC_PRODUCT_NAME)
   message(WARNING "You should define a variable LCC_PRODUCT_NAME containing the name of the software you want to add a license to."
IF(NOT LCC_PROJECT_NAME)
   message(WARNING "You should define a variable LCC_PROJECT_NAME containing the name of the software you want to add a license to."
      "A mock product named DEFAULT has been added for you.")
   set(LCC_PRODUCT_NAME "DEFAULT") 
ENDIF(NOT LCC_PRODUCT_NAME)
   set(LCC_PROJECT_NAME "DEFAULT") 
ENDIF(NOT LCC_PROJECT_NAME)

#base folder where product names are stored (/projects)
IF(NOT LCC_PRODUCTS_BASE_DIR)
   set(LCC_PRODUCTS_BASE_DIR "${CMAKE_SOURCE_DIR}/product") 
ENDIF(NOT LCC_PRODUCTS_BASE_DIR)
#base folder where projects are stored (/projects)
IF(NOT LCC_PROJECTS_BASE_DIR)
   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)
@@ -30,17 +30,24 @@
find_package(olm REQUIRED) 

#load the current project from files or find it from environment variables or create a default one
set(LCC_PROJECT_PUBLIC_KEY "${LCC_PRODUCTS_BASE_DIR}/${LCC_PRODUCT_NAME}/include/${PROJECT_NAME}/${LCC_PRODUCT_NAME}/public_key.h" )
set(LCC_PROJECT_PRIVATE_KEY "${LCC_PRODUCTS_BASE_DIR}/${LCC_PRODUCT_NAME}/private_key.rsa" )
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" )
set(LCC_PROJECT_PRIVATE_KEY "${LCC_PROJECTS_BASE_DIR}/${LCC_PROJECT_NAME}/private_key.rsa" )

add_custom_command(
  OUTPUT "${LCC_PROJECT_PUBLIC_KEY}" "${LCC_PROJECT_PRIVATE_KEY}"
  COMMAND license_generator::olm project initialize -s "${PROJECT_SOURCE_DIR}" -n "${LCC_PRODUCT_NAME}" -p "${LCC_PRODUCTS_BASE_DIR}"
  COMMAND license_generator::olm project initialize -s "${PROJECT_SOURCE_DIR}/src" -n "${LCC_PROJECT_NAME}" -p "${LCC_PROJECTS_BASE_DIR}"
  COMMENT "generating ${LCC_PROJECT_PUBLIC_KEY}"
  USES_TERMINAL
)

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

configure_file (
   "src/templates/build_properties.h.in" 
   "${LCC_INCLUDE_DIR}/build_properties.h"
)
include_directories( ${LCC_INCLUDE_DIR} )

message( STATUS "C compiler        : " ${CMAKE_C_COMPILER})
message( STATUS "C compiler flags  : " ${CMAKE_C_FLAGS})
@@ -52,7 +59,8 @@
  message( STATUS "Build type        : " ${CMAKE_BUILD_TYPE})
endif(CMAKE_BUILD_TYPE)
message( STATUS "Install prefix    : " ${CMAKE_INSTALL_PREFIX})
message( STATUS "olm executable    : " ${OLM_VERSION})
message( STATUS "Project name      : " ${LCC_PROJECT_NAME} )
message( STATUS "Project base dir  : " ${LCC_PROJECTS_BASE_DIR}/${LCC_PROJECT_NAME} )

#boost is required only for tests
#bug in cmake win32 - can't find boost compiled with mingw 
@@ -70,6 +78,7 @@

SET( Boost_USE_STATIC_LIBS ON )
find_package(Boost REQUIRED COMPONENTS date_time unit_test_framework program_options system filesystem)

#set below in case of dynamic linking in debug.
#set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS $<$<CONFIG:Debug>:BOOST_TEST_DYN_LINK>)

@@ -81,6 +90,7 @@
      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)