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 | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/build/modules/add_boost.cmake b/build/modules/add_boost.cmake
index 7501ae8..7292f5b 100644
--- a/build/modules/add_boost.cmake
+++ b/build/modules/add_boost.cmake
@@ -151,13 +151,13 @@
endif()
execute_process(COMMAND ${b2Bootstrap} WORKING_DIRECTORY ${BOOST_ROOT}
RESULT_VARIABLE Result OUTPUT_VARIABLE Output ERROR_VARIABLE Error)
- if(NOT Result EQUAL 0)
+ find_program(b2Path NAMES b2 PATHS ${BOOST_ROOT} NO_DEFAULT_PATH)
+ if(NOT Result EQUAL 0 OR NOT b2Path)
message(FATAL_ERROR "Failed running ${b2Bootstrap}:\n${Output}\n${Error}\n")
endif()
endif()
execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${BOOST_ROOT}/Build)
-
#ADD_BOOST_STATIC_RUNTIME is a parsed function parameter
if(ADD_BOOST_STATIC_RUNTIME)
set(RUNTIME_LINK "static")
@@ -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})
@@ -258,10 +259,13 @@
else(MSVC)
set(OUTPUT_FILE ${BOOST_ROOT}/stage/lib/libboost_${libName}-mt${BOOST_LIB_SUFFIX}.${LINUX_LIB_EXTENSION})
endif(MSVC)
- if(NOT EXISTS "${OUTPUT_FILE}")
- message(STATUS "Building ${Component}")
- execute_process(COMMAND ${b2Args} --with-${Component} WORKING_DIRECTORY ${BOOST_ROOT})
- endif()
+ #if(NOT EXISTS "${OUTPUT_FILE}")
+ message(STATUS "Building ${Component}: ${b2Args}")
+ execute_process(COMMAND ${b2Args} --with-${Component} WORKING_DIRECTORY ${BOOST_ROOT} RESULT_VARIABLE Result OUTPUT_VARIABLE Output ERROR_VARIABLE Error)
+ if(NOT Result EQUAL 0)
+ message(ERROR "Failed running ${b2Args} --with-${Component}:\n${Output}\n${Error}\n")
+ endif()
+ #endif()
endforeach()
@@ -272,7 +276,7 @@
# BOOST_LIBRARYDIR - Preferred library directory e.g. <prefix>/lib
# Boost_NO_SYSTEM_PATHS - Set to ON to disable searching in locations not
# specified by these hint variables. Default is OFF.
- set (BOOST_LIBRARYDIR ${BoostSourceDir}/stage/lib CACHE PATH "BOOST library dir")
+ set (BOOST_LIBRARYDIR ${BOOST_ROOT}/stage/lib CACHE PATH "BOOST library dir")
#set (Boost_NO_SYSTEM_PATHS ON)
find_package(Boost 1.55 REQUIRED COMPONENTS ${ADD_BOOST_MODULES})
#clean up variables
--
Gitblit v1.9.1