From 60ae840790232c52ea3f456881771edee02d35ac Mon Sep 17 00:00:00 2001
From: Maximilien Siavelis <maximilien.siavelis@simulease.com>
Date: 周五, 05 1月 2018 09:10:28 +0800
Subject: [PATCH] fix some compilation issues
---
CMakeLists.txt | 43 +++++++++++++++++++++++++++++--------------
1 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe14f24..74964b0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,8 @@
#make it compatible with find_boost (exchange lowercase to camelcase)
#fix shared libraries activation
-cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR)
+#cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 2.8.11 FATAL_ERROR)
#version variables, major and minor must be 1 character only
SET(LICENSECC_MAJOR_VERSION 1)
@@ -12,8 +13,7 @@
SET(LICENSECC_VERSION "${LICENSECC_MAJOR_VERSION}.${LICENSECC_MINOR_VERSION}.${LICENSECC_PATCH_VERSION}")
SET(LICENSECC_SHORT_LICENSE "BSD Software License")
-# add this options before PROJECT keyword
-SET(CMAKE_DISABLE_SOURCE_CHANGES OFF)
+SET(CMAKE_DISABLE_SOURCE_CHANGES ON)
SET(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
SET(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL "CMake verbose" FORCE)
@@ -30,10 +30,17 @@
endif(CMAKE_BUILD_TYPE)
if(WIN32)
+
SET(PLATFORM_LIBS "")
- if(CMAKE_CL_64)
- SET(CMAKE_EXE_LINKER_FLAGS "/machine:X64 /INCREMENTAL:NO" CACHE STRING "Linker flags")
- endif(CMAKE_CL_64)
+ include(target_arch)
+ target_architecture( TARGET_ARCHITECTURE )
+ message(STATUS "architecture detected: ${TARGET_ARCHITECTURE}")
+ #force to patch an error in cmake
+ if(TARGET_ARCHITECTURE STREQUAL "x86_64")
+ SET(CMAKE_EXE_LINKER_FLAGS "/machine:X64" CACHE STRING "Linker flags" FORCE)
+ SET(CMAKE_MODULE_LINKER_FLAGS "/machine:X64" CACHE STRING "Module Linker flags" FORCE)
+ SET(CMAKE_SHARED_LINKER_FLAGS "/machine:X64" CACHE STRING "Shared Linker flags" FORCE)
+ endif()
SET(CMAKE_FIND_LIBRARY_SUFFIXES .lib ) #${CMAKE_FIND_LIBRARY_SUFFIXES}
add_definitions("/D_CRT_SECURE_NO_WARNINGS")
else(WIN32)
@@ -62,8 +69,7 @@
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)
+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
@@ -74,10 +80,19 @@
find_package(OpenSSL REQUIRED)
include_directories(${OPENSSL_INCLUDE_DIR})
list(APPEND EXTERNAL_LIBS ${OPENSSL_CRYPTO_LIBRARY})
- FIND_PACKAGE(Dbus REQUIRED)
- include_directories(${DBUS_INCLUDE_DIR})
- include_directories(${DBUS_ARCH_INCLUDE_DIR})
- list(APPEND EXTERNAL_LIBS ${DBUS_LIBRARIES})
+ 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)
+ include_directories(${DBUS_INCLUDE_DIR})
+ include_directories(${DBUS_ARCH_INCLUDE_DIR})
+ list(APPEND EXTERNAL_LIBS ${DBUS_LIBRARIES})
+ endif(USE_DBUS_IDENTIFIER)
list(APPEND EXTERNAL_LIBS dl)
endif(NOT WIN32)
@@ -128,10 +143,10 @@
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})
+message( STATUS "CXX compiler flags: " ${CMAKE_CXX_FLAGS})
if(CMAKE_BUILD_TYPE)
message( STATUS "Build type: " ${CMAKE_BUILD_TYPE})
endif(CMAKE_BUILD_TYPE)
--
Gitblit v1.9.1