From 3750f651dd3937ec87c46c81cfb2a465aafdb800 Mon Sep 17 00:00:00 2001
From: open-license-manager <rillf@maildrop.cc>
Date: 周三, 15 10月 2014 06:54:26 +0800
Subject: [PATCH] travis
---
build/modules/add_boost.cmake | 3 ++-
.travis.yml | 6 ++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index b3ba6ed..258a023 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,8 @@
- 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
-
+
+before_script:
+ - cd build/linux && cmake ../..
script:
- - cd build/linux && cmake ../..
\ No newline at end of file
+ - make
\ No newline at end of file
diff --git a/build/modules/add_boost.cmake b/build/modules/add_boost.cmake
index 6fa6be4..7292f5b 100644
--- a/build/modules/add_boost.cmake
+++ b/build/modules/add_boost.cmake
@@ -115,7 +115,7 @@
file(MAKE_DIRECTORY ${BoostExtractFolder})
file(COPY ${ZipFilePath} DESTINATION ${BoostExtractFolder})
message(STATUS "Extracting boost ${BoostVersion} to ${BoostExtractFolder}")
- execute_process(COMMAND ${CMAKE_COMMAND} -E tar vxfz ${BoostFolderName}.tar.bz2
+ execute_process(COMMAND ${CMAKE_COMMAND} -E tar xfz ${BoostFolderName}.tar.bz2
WORKING_DIRECTORY ${BoostExtractFolder}
RESULT_VARIABLE Result
)
@@ -220,6 +220,7 @@
elseif(UNIX)
list(APPEND b2Args variant=release cxxflags=-fPIC cxxflags=-std=c++11 -sNO_BZIP2=1 --layout=tagged)
# Need to configure the toolset based on whatever version CMAKE_CXX_COMPILER is
+ message(STATUS "cmake compiler version ${CMAKE_CXX_COMPILER_VERSION}")
string(REGEX MATCH "[0-9]+\\.[0-9]+" ToolsetVer "${CMAKE_CXX_COMPILER_VERSION}")
if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
list(APPEND b2Args toolset=clang-${ToolsetVer})
--
Gitblit v1.9.1