From 8d405b265285c368df2e9cf1c14acee7532e0ee7 Mon Sep 17 00:00:00 2001
From: nancy.liao <huihui.liao@greentest.com.cn>
Date: ćšć, 29 5æ 2025 18:14:38 +0800
Subject: [PATCH] Merge branch 'develop' of http://139.9.88.116:3000/r/module/open-license-manager into develop
---
CMakeLists.txt | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1e7141a..9dc35a5 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)
@@ -19,9 +19,9 @@
cmake_policy(SET CMP0048 NEW)
#cmake_policy(SET CMP0091 NEW)
project (licensecc
- VERSION 2.0.0
- DESCRIPTION "Copy protection and licensing library"
+ VERSION 2.1.0
LANGUAGES CXX)
+set(PROJECT_DESCRIPTION "Copy protection and licensing library")
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -46,7 +46,7 @@
if(UNIX) #this is true for all the linux systems but not for cross compiling "linux->windows"
IF(${STATIC_RUNTIME})
- set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++ -static ")
+ set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++ -static")
ENDIF(${STATIC_RUNTIME})
IF(NOT OPENSSL_FOUND)
MESSAGE(SEND_ERROR "Openssl required in Linux, please install it or specify -DOPENSSL_ROOT")
@@ -57,7 +57,7 @@
list(APPEND EXTERNAL_LIBS "-pthread")
else(THREADS_HAVE_PTHREAD_ARG)
if(CMAKE_THREAD_LIBS_INIT)
- list(APPEND EXTERNAL_LIBS "${CMAKE_THREAD_LIBS_INIT} ")
+ list(APPEND EXTERNAL_LIBS "${CMAKE_THREAD_LIBS_INIT}")
endif()
endif(THREADS_HAVE_PTHREAD_ARG)
@@ -65,7 +65,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")
@@ -131,7 +131,6 @@
message( STATUS "Project base dir : " ${LCC_PROJECTS_BASE_DIR}/${LCC_PROJECT_NAME} )
add_subdirectory(src)
-
#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")
--
Gitblit v1.9.1