From 909c6b41242c1d8c78e5ee621252560f0726d885 Mon Sep 17 00:00:00 2001
From: open-license-manager <rillf@maildrop.cc>
Date: ćšć, 11 9æ 2014 07:24:26 +0800
Subject: [PATCH]
---
build/modules/add_boost.cmake | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/build/modules/add_boost.cmake b/build/modules/add_boost.cmake
index 7501ae8..6480699 100644
--- a/build/modules/add_boost.cmake
+++ b/build/modules/add_boost.cmake
@@ -151,7 +151,8 @@
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()
@@ -272,7 +273,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