From fb3bb6617a5fbb8214ed483bf43760ffccf05b0d Mon Sep 17 00:00:00 2001
From: open-license-manager <rillf@maildrop.cc>
Date: 周三, 15 10月 2014 07:11:58 +0800
Subject: [PATCH] doxygen
---
.travis.yml | 2 +-
CMakeLists.txt | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 62d20a8..fb25dbb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@
- sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
- echo "yes" | sudo add-apt-repository ppa:kalakris/cmake
- sudo apt-get update -qq
- - sudo apt-get install cmake
+ - sudo apt-get install cmake doxygen
- if [ "$CXX" = "g++" ]; then sudo apt-get install -qq g++-4.8; fi
- if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
- if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; echo "+++GCC4.8"; fi
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ba51db..3e2703b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@
#fix shared libraries activation
#cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR)
-cmake_minimum_required(VERSION 2.8.7 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)
@@ -139,6 +139,8 @@
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