From 02a9ddec1d039f1177ff422c83fa9645f24fa40b Mon Sep 17 00:00:00 2001 From: Gabriele Contini <contini.mailing@gmail.com> Date: 周六, 30 11月 2019 19:16:45 +0800 Subject: [PATCH] try wine64 for mingw build --- CMakeLists.txt | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b58a488..e24dcfb 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 @@ -103,7 +104,6 @@ ) add_custom_target(project_initialize DEPENDS "${LCC_PROJECT_PUBLIC_KEY}" "${LCC_PROJECT_PRIVATE_KEY}") - include_directories( ${LCC_INCLUDE_DIR} ${CMAKE_BINARY_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/include") message( STATUS "C compiler : " ${CMAKE_C_COMPILER}) @@ -119,6 +119,7 @@ message( STATUS "Project name : " ${LCC_PROJECT_NAME} ) message( STATUS "Project base dir : " ${LCC_PROJECTS_BASE_DIR}/${LCC_PROJECT_NAME} ) +install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include) add_subdirectory(src) #boost is required only for tests @@ -133,7 +134,7 @@ message(STATUS "Compiler architecture: ${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}") endif() SET( Boost_USE_STATIC_LIBS ON ) -find_package(Boost REQUIRED COMPONENTS unit_test_framework system filesystem) +find_package(Boost COMPONENTS unit_test_framework system filesystem) #if boost is found enable tests IF(Boost_FOUND) @@ -146,4 +147,3 @@ ELSE(Boost_FOUND) message(WARNING "Boost not found, disabling tests") ENDIF(Boost_FOUND) - -- Gitblit v1.9.1