From b2b3ba55016ba1218033eb65b7d0c318cd89f1d6 Mon Sep 17 00:00:00 2001
From: open-license-manager <rillf@maildrop.cc>
Date: 周三, 15 10月 2014 06:32:41 +0800
Subject: [PATCH] a
---
build/modules/add_boost.cmake | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/build/modules/add_boost.cmake b/build/modules/add_boost.cmake
index 6480699..6fa6be4 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 xfz ${BoostFolderName}.tar.bz2
+ execute_process(COMMAND ${CMAKE_COMMAND} -E tar vxfz ${BoostFolderName}.tar.bz2
WORKING_DIRECTORY ${BoostExtractFolder}
RESULT_VARIABLE Result
)
@@ -158,7 +158,6 @@
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")
@@ -259,10 +258,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()
--
Gitblit v1.9.1