From bd25f8043a261f59083d869f33ac0ecbd67cf02f Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周二, 12 11月 2019 10:24:46 +0800
Subject: [PATCH] fix submodules
---
CMakeLists.txt | 211 +++++++++++++++++++---------------------------------
1 files changed, 76 insertions(+), 135 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 503ae24..d99de77 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,158 +1,99 @@
-#TODO guess address_model 64 in boost
-#make it compatible with find_boost (exchange lowercase to camelcase)
-#fix shared libraries activation
-
-#cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR)
cmake_minimum_required(VERSION 2.8.11 FATAL_ERROR)
#version variables, major and minor must be 1 character only
SET(LICENSECC_MAJOR_VERSION 1)
-SET(LICENSECC_MINOR_VERSION 0)
-SET(LICENSECC_PATCH_VERSION 0 CACHE STRING "License++ patch version string")
+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 ON)
+SET(CMAKE_DISABLE_SOURCE_CHANGES OFF) #keys are generated in the source tree by default
SET(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
-SET(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL "CMake verbose" FORCE)
-project (license++ C CXX)
+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_PROJECT_NAME "DEFAULT")
+ENDIF(NOT LCC_PROJECT_NAME)
+
+#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)
-SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/build/modules/")
+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
-include(utilities)
-if(CMAKE_BUILD_TYPE)
- string(TOLOWER ${CMAKE_BUILD_TYPE} _CMAKE_BUILD_TYPE)
- EVAL_CONDITION(RELEASE_BUILD ${_CMAKE_BUILD_TYPE} STREQUAL "release")
-else(CMAKE_BUILD_TYPE)
- set(RELEASE_BUILD 0)
-endif(CMAKE_BUILD_TYPE)
+#find olm executable or build it.
+find_package(olm REQUIRED)
-if(WIN32)
+#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" )
+set(LCC_PROJECT_PRIVATE_KEY "${LCC_PROJECTS_BASE_DIR}/${LCC_PROJECT_NAME}/private_key.rsa" )
- SET(PLATFORM_LIBS "")
- include(target_arch)
- target_architecture( TARGET_ARCHITECTURE )
- message(STATUS "architecture detected: ${TARGET_ARCHITECTURE}")
- #force to patch an error in cmake
- if(TARGET_ARCHITECTURE STREQUAL "x86_64")
- SET(CMAKE_EXE_LINKER_FLAGS "/machine:X64" CACHE STRING "Linker flags" FORCE)
- SET(CMAKE_MODULE_LINKER_FLAGS "/machine:X64" CACHE STRING "Module Linker flags" FORCE)
- SET(CMAKE_SHARED_LINKER_FLAGS "/machine:X64" CACHE STRING "Shared Linker flags" FORCE)
- endif()
- SET(CMAKE_FIND_LIBRARY_SUFFIXES .lib ) #${CMAKE_FIND_LIBRARY_SUFFIXES}
- add_definitions("/D_CRT_SECURE_NO_WARNINGS")
-else(WIN32)
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -fmessage-length=0 -std=c++11 -Wuninitialized -fPIC") #-Wall
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -fmessage-length=0 -Wall -Wuninitialized -fPIC")
- #use static libraries in release to make it easier to distribute it
- #SET(Boost_USE_STATIC_RUNTIME ${RELEASE_BUILD})
- if(RELEASE_BUILD)
- SET(CMAKE_FIND_LIBRARY_SUFFIXES .a) #.so for dynamic libraries
- else()
- SET(CMAKE_FIND_LIBRARY_SUFFIXES .a .so)
- endif()
- set (CMAKE_EXE_LINKER_FLAGS "-pthread")
- SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "-Wl,--strip-all -static-libstdc++") #-static
- #you need to "force" the change in cmake_install_prefix after the project keyword
- IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
- SET(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "Install path prefix" FORCE)
- ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-endif(WIN32)
-set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS $<$<CONFIG:Debug>:_DEBUG>)
+add_custom_command(
+ OUTPUT "${LCC_PROJECT_PUBLIC_KEY}" "${LCC_PROJECT_PRIVATE_KEY}"
+ COMMAND license_generator::olm project initialize -t "${PROJECT_SOURCE_DIR}/src/templates" -n "${LCC_PROJECT_NAME}" -p "${LCC_PROJECTS_BASE_DIR}"
+ COMMENT "generating ${LCC_PROJECT_PUBLIC_KEY}"
+ USES_TERMINAL
+)
-
-if(CMAKE_SIZEOF_VOID_P EQUAL 8)
- SET(HAVE_64BIT_SIZE_T 1)
-else(CMAKE_SIZEOF_VOID_P EQUAL 8)
- SET(HAVE_64BIT_SIZE_T 0)
-endif(CMAKE_SIZEOF_VOID_P EQUAL 8)
-
-include(add_boost)
-add_boost(STATIC MODULES date_time test 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>)
-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
-
-if(NOT WIN32)
- #find a static version of openssl crypto library
- find_package(OpenSSL REQUIRED)
- include_directories(${OPENSSL_INCLUDE_DIR})
- #-lssl for backward compatibility with old openssl versions
- list(APPEND EXTERNAL_LIBS ${OPENSSL_LIBRARIES})
- list(APPEND EXTERNAL_LIBS ${OPENSSL_CRYPTO_LIBRARY})
- MESSAGE(STATUS "Found openssl version ${OPENSSL_VERSION}")
- 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)
- list(APPEND EXTERNAL_LIBS dl)
-endif(NOT WIN32)
-
-FIND_PACKAGE(Doxygen)
-
-IF (DOXYGEN_FOUND)
-
- SET(DOXYGEN_INPUT ${CMAKE_BINARY_DIR}/doc/Doxyfile)
- SET(DOXYGEN_OUTPUT ${CMAKE_BINARY_DIR}/doc/doxy_output)
-
- configure_file (
- "doc/Doxyfile.in"
- "doc/Doxyfile"
- )
-
- ADD_CUSTOM_COMMAND(
- OUTPUT ${DOXYGEN_OUTPUT}
- COMMAND ${CMAKE_COMMAND} -E echo_append "Building API Documentation..."
- COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_INPUT}
- COMMAND ${CMAKE_COMMAND} -E echo "Done."
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- DEPENDS ${DOXYGEN_INPUT})
-
- ADD_CUSTOM_TARGET(apidoc ALL DEPENDS ${DOXYGEN_OUTPUT})
-
- ADD_CUSTOM_TARGET(apidoc_forced
- COMMAND ${CMAKE_COMMAND} -E echo_append "Building API Documentation..."
- COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_INPUT}
- COMMAND ${CMAKE_COMMAND} -E echo "Done."
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-ENDIF (DOXYGEN_FOUND)
+add_custom_target(project_initialize DEPENDS "${LCC_PROJECT_PUBLIC_KEY}" "${LCC_PROJECT_PRIVATE_KEY}")
configure_file (
- "src/build_properties.h.in"
- "${CMAKE_BINARY_DIR}/build_properties.h"
+ "src/templates/build_properties.h.in"
+ "${LCC_INCLUDE_DIR}/build_properties.h"
)
-#include build directory to find build_properties.h
-include_directories(${CMAKE_BINARY_DIR})
+include_directories( ${LCC_INCLUDE_DIR} )
+
+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})
+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} )
+
+#boost is required only for tests
+#bug in cmake win32 - can't find boost compiled with mingw
+if(WIN32 AND "x${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}" STREQUAL "x")
+ message(WARNING "WIN32 compiler does not specify CMAKE_CXX_COMPILER_ARCHITECTURE_ID -- filling in manually")
+ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+ set(CMAKE_CXX_COMPILER_ARCHITECTURE_ID "x64")
+ else()
+ set(CMAKE_CXX_COMPILER_ARCHITECTURE_ID "x86")
+ endif()
+ message(STATUS "Compiler architecture: ${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}")
+endif()
add_subdirectory(src)
-INCLUDE(CTest)
-ENABLE_TESTING()
-IF(BUILD_TESTING)
- SET(BUILDNAME "${BUILDNAME}" CACHE STRING "Name of build on the dashboard")
- MARK_AS_ADVANCED(BUILDNAME)
-ENDIF(BUILD_TESTING)
-add_subdirectory(test)
+SET( Boost_USE_STATIC_LIBS ON )
+find_package(Boost REQUIRED COMPONENTS date_time unit_test_framework program_options system filesystem)
-#include(build/modules/CmakeDebugVariables.txt)
+#set below in case of dynamic linking in debug.
+#set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS $<$<CONFIG:Debug>:BOOST_TEST_DYN_LINK>)
-message("")
-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})
-if(CMAKE_BUILD_TYPE)
- message( STATUS "Build type: " ${CMAKE_BUILD_TYPE})
-endif(CMAKE_BUILD_TYPE)
-message( STATUS "Install prefix: " ${CMAKE_INSTALL_PREFIX})
-if(DOXYGEN_FOUND)
- message(STATUS "Doxygen: " ${DOXYGEN_EXECUTABLE})
-else(DOXYGEN_FOUND)
- message(STATUS "Doxygen: not found.")
-endif(DOXYGEN_FOUND)
+#if boost is found enable tests
+IF(Boost_FOUND)
+ INCLUDE(CTest)
+ 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)
+
--
Gitblit v1.9.1