From ecd2f38f3d9c8b28aaa4c47bc09789f11dcaa7f7 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周日, 29 11月 2020 11:19:33 +0800
Subject: [PATCH] fix documentation warnings and broken links
---
CMakeLists.txt | 63 ++++++++++++++-----------------
1 files changed, 29 insertions(+), 34 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f464593..b85bc2f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,8 +6,8 @@
SET(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
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.")
+ message(STATUS "You should define a variable LCC_PROJECT_NAME containing the name of the software you want to add a license to."
+ "A mock project named DEFAULT has been added for you.")
set(LCC_PROJECT_NAME "DEFAULT" CACHE STRING "Project name (name of the software for which you want to issue a license)")
ENDIF(NOT LCC_PROJECT_NAME)
@@ -17,6 +17,7 @@
ENDIF(NOT LCC_PROJECTS_BASE_DIR)
cmake_policy(SET CMP0048 NEW)
+#cmake_policy(SET CMP0091 NEW)
project (licensecc
VERSION 2.0.0
DESCRIPTION "Copy protection and licensing library"
@@ -26,8 +27,8 @@
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)
+#find lccgen executable or build it.
+find_package(lccgen REQUIRED)
#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 )
@@ -60,11 +61,11 @@
endif()
endif(THREADS_HAVE_PTHREAD_ARG)
- #Zlib required when openssl version < 1.0.1f (centos 7)
+ #Zlib required with old openssl version < 1.0.1f in centos 7
IF(OPENSSL_VERSION VERSION_LESS_EQUAL 1.0.2)
SET ( ZLIB_USE_STATIC_LIBS ON )
find_package(ZLIB REQUIRED)
- list(APPEND EXTERNAL_LIBS ${ZLIB_LIBRARIES})
+ list(APPEND EXTERNAL_LIBS "${ZLIB_LIBRARIES}")
MESSAGE(STATUS "Found zlib version ${ZLIB_VERSION_STRING} - licensecc")
ELSE(OPENSSL_VERSION VERSION_LESS_EQUAL 1.0.2)
MESSAGE(STATUS "openssl ${OPENSSL_VERSION} zlib not required - licensecc")
@@ -72,7 +73,9 @@
find_program( MEMORYCHECK_COMMAND valgrind )
set( MEMORYCHECK_COMMAND_OPTIONS "--trace-children=yes --leak-check=full" )
- set(main_lib_dest "lib/${PROJECT_NAME}")
+ set(main_lib_dest "lib/${PROJECT_NAME}")
+ #https://cmake.org/cmake/help/latest/command/find_package.html
+ set(pkg_config_dest "lib/cmake/${PROJECT_NAME}")
else(UNIX)
IF(NOT OPENSSL_FOUND)
MESSAGE(STATUS "Openssl not found, configuring the library without it (running in wine not supported).")
@@ -81,28 +84,25 @@
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}")
+ if(STATIC_RUNTIME)
+ message(STATUS "Static runtime ${STATIC_RUNTIME}")
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}")
+ #list(APPEND CMAKE_CXX_FLAGS_DEBUG "/MTd")
SET(Boost_USE_STATIC_RUNTIME ON)
- endif(${STATIC_RUNTIME})
-
+ endif(STATIC_RUNTIME)
add_definitions("/D _CRT_SECURE_NO_WARNINGS")
+ list(APPEND EXTERNAL_LIBS "bcrypt" "crypt32" "ws2_32" "iphlpapi")
else(MSVC)
- if(MINGW)
- list(APPEND EXTERNAL_LIBS "-lcrypt32 -lbcrypt -lws2_32 -liphlpapi")
- SET(CMAKE_EXE_LINKER_FLAGS "-static")
- #super ugly bug when cross compiling in cmake 3.16
- #IF(CMAKE_CROSSCOMPILING)
- # link_directories(BEFORE /usr/lib/gcc/x86_64-w64-mingw32/7.3-win32)
- #ENDIF()
+ if(MINGW)
+ list(APPEND EXTERNAL_LIBS "-lbcrypt" "-lcrypt32" "-lws2_32" "-liphlpapi")
+ SET(CMAKE_EXE_LINKER_FLAGS "-static -static-libstdc++")
endif(MINGW)
endif(MSVC)
set(main_lib_dest "${PROJECT_NAME}")
+ #https://cmake.org/cmake/help/latest/command/find_package.html
+ set(pkg_config_dest "cmake/${PROJECT_NAME}")
endif(UNIX)
#initialize project
@@ -111,17 +111,14 @@
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::lcc project initialize -t "${PROJECT_SOURCE_DIR}/src/templates" -n "${LCC_PROJECT_NAME}" -p "${LCC_PROJECTS_BASE_DIR}"
- COMMENT "generating ${LCC_PROJECT_PUBLIC_KEY}"
+add_custom_target(project_initialize
+ COMMAND license_generator::lccgen project initialize -t "${PROJECT_SOURCE_DIR}/src/templates" -n "${LCC_PROJECT_NAME}" -p "${LCC_PROJECTS_BASE_DIR}"
+ COMMENT "generating ${LCC_PROJECT_PUBLIC_KEY} and ${LCC_PROJECT_PRIVATE_KEY} if they don't already exist"
USES_TERMINAL
)
-include_directories( ${LCC_INCLUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/include" )
-add_custom_target(project_initialize DEPENDS "${LCC_PROJECT_PUBLIC_KEY}" "${LCC_PROJECT_PRIVATE_KEY}")
-message( STATUS "C compiler : " ${CMAKE_C_COMPILER})
-message( STATUS "C compiler flags : " ${CMAKE_C_FLAGS})
+include_directories( ${LCC_INCLUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/include" )
+
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})
@@ -171,10 +168,10 @@
message(STATUS "Doxygen found, generating docs.")
SET(DOXYGEN_EXCLUDE_PATTERNS "*/library/ini/*;*/doc/resources/*")
SET(DOXYGEN_DISABLE_INDEX YES)
- SET(DOXYGEN_GENERATE_TREEVIEW YES)
+ #SET(DOXYGEN_GENERATE_TREEVIEW YES)
SET(DOXYGEN_GENERATE_XML YES)
SET(DOXYGEN_LAYOUT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/doc/DoxygenLayout.xml")
- doxygen_add_docs(docs doc src include/licensecc COMMENT "doxygen docs")
+ doxygen_add_docs(docs doc src include/licensecc ${LCC_INCLUDE_DIR} COMMENT "doxygen docs")
#file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/doc/resources/" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/html")
#file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/doc/sphinx/" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
@@ -193,14 +190,12 @@
ELSE(Doxygen_FOUND AND Sphinx_FOUND)
message(STATUS "Doxygen or Sphynx not found, not generating docs.")
ENDIF(Doxygen_FOUND AND Sphinx_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})
+install(FILES src/cmake/licensecc-config.cmake DESTINATION ${pkg_config_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})
+install(FILES ${CMAKE_BINARY_DIR}/licensecc-config-version.cmake DESTINATION ${pkg_config_dest})
--
Gitblit v1.9.1