diff --git a/tools/rosboost_cfg/src/rosboost_cfg/rosboost_cfg.py b/tools/rosboost_cfg/src/rosboost_cfg/rosboost_cfg.py index e804bac3..c642e6f9 100755 --- a/tools/rosboost_cfg/src/rosboost_cfg/rosboost_cfg.py +++ b/tools/rosboost_cfg/src/rosboost_cfg/rosboost_cfg.py @@ -177,13 +177,13 @@ def find_boost(search_paths): return result[-1] def search_paths(sysroot): - _search_paths = [(sysroot+'/usr', True), - (sysroot+'/usr/local', True), + _search_paths = [(None if 'ROS_BOOST_ROOT' not in os.environ else os.environ['ROS_BOOST_ROOT'], False), (None if 'INCLUDE_DIRS' not in os.environ else os.environ['INCLUDE_DIRS'], True), (None if 'CPATH' not in os.environ else os.environ['CPATH'], True), (None if 'C_INCLUDE_PATH' not in os.environ else os.environ['C_INCLUDE_PATH'], True), (None if 'CPLUS_INCLUDE_PATH' not in os.environ else os.environ['CPLUS_INCLUDE_PATH'], True), - (None if 'ROS_BOOST_ROOT' not in os.environ else os.environ['ROS_BOOST_ROOT'], False)] + (sysroot+'/usr', True), + (sysroot+'/usr/local', True)] search_paths = [] for (str, system) in _search_paths: