From 6dd7902d6f148a4ac78e5478edb3a2ca8624f74c Mon Sep 17 00:00:00 2001 From: gcontini <1121667+gcontini@users.noreply.github.com> Date: 周日, 15 3月 2020 16:07:14 +0800 Subject: [PATCH] cpu brand --- CMakeLists.txt | 26 ++++++++++---------------- 1 files changed, 10 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f464593..3c32f44 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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" @@ -60,7 +61,7 @@ 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) @@ -81,25 +82,20 @@ 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}") @@ -120,8 +116,6 @@ 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}) 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}) -- Gitblit v1.9.1