From 4803310de7537094a00cc96be3830d18f9ec91dd Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 30 11月 2019 17:57:31 +0800
Subject: [PATCH] enable c++ 1.1 for old compilers
---
CMakeLists.txt | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e38482..3a5ccea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,13 +23,14 @@
ENDIF(NOT LCC_PROJECTS_BASE_DIR)
project (licensecc C CXX )
-SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
#find lcc executable or build it.
find_package(lcc REQUIRED)
-#My system doesn't support binfmt misc
+#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 )
SET(CMAKE_CROSSCOMPILING_EMULATOR "wine")
ENDIF()
@@ -62,15 +63,15 @@
find_package(OpenSSL REQUIRED COMPONENTS Crypto)
include_directories(${OPENSSL_INCLUDE_DIR})
#list(APPEND EXTERNAL_LIBS ${OPENSSL_CRYPTO_LIBRARY})
- #find_package(Threads)
- #if(THREADS_HAVE_PTHREAD_ARG)
- # list(APPEND EXTERNAL_LIBS "-pthread")
- #else(THREADS_HAVE_PTHREAD_ARG)
- # if(CMAKE_THREAD_LIBS_INIT)
- # list(APPEND EXTERNAL_LIBS "${CMAKE_THREAD_LIBS_INIT}")
- # endif()
- #endif(THREADS_HAVE_PTHREAD_ARG)
MESSAGE(STATUS "Found openssl version ${OPENSSL_VERSION} ")
+ find_package(Threads)
+ if(THREADS_HAVE_PTHREAD_ARG)
+ list(APPEND EXTERNAL_LIBS "-pthread")
+ else(THREADS_HAVE_PTHREAD_ARG)
+ if(CMAKE_THREAD_LIBS_INIT)
+ list(APPEND EXTERNAL_LIBS "${CMAKE_THREAD_LIBS_INIT}")
+ endif()
+ endif(THREADS_HAVE_PTHREAD_ARG)
#Zlib required when openssl version < 1.0.1f
#SET ( ZLIB_USE_STATIC_LIBS ON )
#find_package(ZLIB REQUIRED)
@@ -84,9 +85,9 @@
include_directories(${DBUS_ARCH_INCLUDE_DIR})
list(APPEND EXTERNAL_LIBS ${DBUS_LIBRARIES})
endif(USE_DBUS_IDENTIFIER)
- if(NOT MINGW)
- list(APPEND EXTERNAL_LIBS ${CMAKE_DL_LIBS})
- endif(NOT MINGW)
+ #if(NOT MINGW)
+ # list(APPEND EXTERNAL_LIBS ${CMAKE_DL_LIBS})
+ #endif(NOT MINGW)
endif(UNIX)
#initialize project
--
Gitblit v1.9.1