From cf93de93f5c7baf32d4fea139a7cbfc73d4c5589 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <gcontini@users.noreply.github.com>
Date: 周日, 01 9月 2019 14:55:03 +0800
Subject: [PATCH] build page renamed
---
CMakeLists.txt | 43 ++++---------------------------------------
1 files changed, 4 insertions(+), 39 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c69513..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)
@@ -30,7 +29,6 @@
endif(CMAKE_BUILD_TYPE)
if(MSVC)
-
SET(PLATFORM_LIBS "")
include(target_arch)
target_architecture( TARGET_ARCHITECTURE )
@@ -69,6 +67,7 @@
SET(HAVE_64BIT_SIZE_T 0)
endif(CMAKE_SIZEOF_VOID_P EQUAL 8)
+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>)
@@ -99,36 +98,8 @@
list(APPEND EXTERNAL_LIBS ${DBUS_LIBRARIES})
endif(USE_DBUS_IDENTIFIER)
list(APPEND EXTERNAL_LIBS dl)
+ list(APPEND EXTERNAL_LIBS "-Wl,-Bdynamic")
endif(NOT MSVC)
-
-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)
configure_file (
"src/build_properties.h.in"
@@ -147,7 +118,6 @@
ENDIF(BUILD_TESTING)
add_subdirectory(test)
-#include(build/modules/CmakeDebugVariables.txt)
message( STATUS "C compiler: " ${CMAKE_C_COMPILER})
message( STATUS "C compiler flags: " ${CMAKE_C_FLAGS})
message( STATUS "CXX compiler: " ${CMAKE_CXX_COMPILER})
@@ -156,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