From 37ac994f2be71eb5efb356c54aa987a5efb5101d Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: ćšć, 29 8æ 2019 19:28:10 +0800
Subject: [PATCH] test new travis configuration
---
CMakeLists.txt | 74 +++++++++++--------------------------
1 files changed, 22 insertions(+), 52 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 503ae24..904dc52 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,4 @@
#TODO guess address_model 64 in boost
-#make it compatible with find_boost (exchange lowercase to camelcase)
#fix shared libraries activation
#cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR)
@@ -7,7 +6,7 @@
#version variables, major and minor must be 1 character only
SET(LICENSECC_MAJOR_VERSION 1)
-SET(LICENSECC_MINOR_VERSION 0)
+SET(LICENSECC_MINOR_VERSION 1)
SET(LICENSECC_PATCH_VERSION 0 CACHE STRING "License++ patch version string")
SET(LICENSECC_INT_VERSION "${LICENSECC_MAJOR_VERSION}${LICENSECC_MINOR_VERSION}${LICENSECC_PATCH_VERSION}")
SET(LICENSECC_VERSION "${LICENSECC_MAJOR_VERSION}.${LICENSECC_MINOR_VERSION}.${LICENSECC_PATCH_VERSION}")
@@ -19,7 +18,7 @@
project (license++ C CXX)
SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
-SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/build/modules/")
+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/modules/")
include(utilities)
if(CMAKE_BUILD_TYPE)
@@ -29,8 +28,7 @@
set(RELEASE_BUILD 0)
endif(CMAKE_BUILD_TYPE)
-if(WIN32)
-
+if(MSVC)
SET(PLATFORM_LIBS "")
include(target_arch)
target_architecture( TARGET_ARCHITECTURE )
@@ -43,7 +41,7 @@
endif()
SET(CMAKE_FIND_LIBRARY_SUFFIXES .lib ) #${CMAKE_FIND_LIBRARY_SUFFIXES}
add_definitions("/D_CRT_SECURE_NO_WARNINGS")
-else(WIN32)
+else(MSVC)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -fmessage-length=0 -std=c++11 -Wuninitialized -fPIC") #-Wall
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -fmessage-length=0 -Wall -Wuninitialized -fPIC")
#use static libraries in release to make it easier to distribute it
@@ -59,7 +57,7 @@
IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
SET(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "Install path prefix" FORCE)
ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-endif(WIN32)
+endif(MSVC)
set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS $<$<CONFIG:Debug>:_DEBUG>)
@@ -69,21 +67,29 @@
SET(HAVE_64BIT_SIZE_T 0)
endif(CMAKE_SIZEOF_VOID_P EQUAL 8)
-include(add_boost)
-add_boost(STATIC MODULES date_time test program_options system filesystem)
+set( Boost_USE_STATIC_LIBS ON )
+find_package(Boost 1.55.0 COMPONENTS date_time unit_test_framework program_options system filesystem)
#set below in case of dynamic linking in debug.
#set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS $<$<CONFIG:Debug>:BOOST_TEST_DYN_LINK>)
add_definitions(-DBOOST_ALL_NO_LIB) #Disable Boost Microsoft magic, all dependencies are handled by cmake
add_definitions(-DBOOST_LIB_DIAGNOSTIC) #Check it is really disabled
-if(NOT WIN32)
+if(NOT MSVC)
#find a static version of openssl crypto library
find_package(OpenSSL REQUIRED)
include_directories(${OPENSSL_INCLUDE_DIR})
- #-lssl for backward compatibility with old openssl versions
- list(APPEND EXTERNAL_LIBS ${OPENSSL_LIBRARIES})
- list(APPEND EXTERNAL_LIBS ${OPENSSL_CRYPTO_LIBRARY})
- MESSAGE(STATUS "Found openssl version ${OPENSSL_VERSION}")
+ if(MINGW)
+ list(APPEND EXTERNAL_LIBS "-lcrypto -liphlpapi")
+ else(MINGW)
+ list(APPEND EXTERNAL_LIBS ${OPENSSL_CRYPTO_LIBRARY})
+ endif(MINGW)
+
+ MESSAGE(STATUS "Found openssl version ${OPENSSL_VERSION} ")
+
+ #Zlib required when openssl version < 1.0.1f
+ find_package(ZLIB REQUIRED)
+ list(APPEND EXTERNAL_LIBS ${ZLIB_LIBRARIES})
+
if(USE_DBUS_IDENTIFIER)
FIND_PACKAGE(Dbus REQUIRED)
add_definitions(-DUSE_DBUS)
@@ -92,36 +98,8 @@
list(APPEND EXTERNAL_LIBS ${DBUS_LIBRARIES})
endif(USE_DBUS_IDENTIFIER)
list(APPEND EXTERNAL_LIBS dl)
-endif(NOT WIN32)
-
-FIND_PACKAGE(Doxygen)
-
-IF (DOXYGEN_FOUND)
-
- SET(DOXYGEN_INPUT ${CMAKE_BINARY_DIR}/doc/Doxyfile)
- SET(DOXYGEN_OUTPUT ${CMAKE_BINARY_DIR}/doc/doxy_output)
-
- configure_file (
- "doc/Doxyfile.in"
- "doc/Doxyfile"
- )
-
- ADD_CUSTOM_COMMAND(
- OUTPUT ${DOXYGEN_OUTPUT}
- COMMAND ${CMAKE_COMMAND} -E echo_append "Building API Documentation..."
- COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_INPUT}
- COMMAND ${CMAKE_COMMAND} -E echo "Done."
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- DEPENDS ${DOXYGEN_INPUT})
-
- ADD_CUSTOM_TARGET(apidoc ALL DEPENDS ${DOXYGEN_OUTPUT})
-
- ADD_CUSTOM_TARGET(apidoc_forced
- COMMAND ${CMAKE_COMMAND} -E echo_append "Building API Documentation..."
- COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_INPUT}
- COMMAND ${CMAKE_COMMAND} -E echo "Done."
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-ENDIF (DOXYGEN_FOUND)
+ list(APPEND EXTERNAL_LIBS "-Wl,-Bdynamic")
+endif(NOT MSVC)
configure_file (
"src/build_properties.h.in"
@@ -140,9 +118,6 @@
ENDIF(BUILD_TESTING)
add_subdirectory(test)
-#include(build/modules/CmakeDebugVariables.txt)
-
-message("")
message( STATUS "C compiler: " ${CMAKE_C_COMPILER})
message( STATUS "C compiler flags: " ${CMAKE_C_FLAGS})
message( STATUS "CXX compiler: " ${CMAKE_CXX_COMPILER})
@@ -151,8 +126,3 @@
message( STATUS "Build type: " ${CMAKE_BUILD_TYPE})
endif(CMAKE_BUILD_TYPE)
message( STATUS "Install prefix: " ${CMAKE_INSTALL_PREFIX})
-if(DOXYGEN_FOUND)
- message(STATUS "Doxygen: " ${DOXYGEN_EXECUTABLE})
-else(DOXYGEN_FOUND)
- message(STATUS "Doxygen: not found.")
-endif(DOXYGEN_FOUND)
--
Gitblit v1.9.1