p36850791
/
kinetic-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

reverted r12809; see #2999

This commit is contained in:
Brian Gerkey 2011-01-29 19:23:11 +00:00
parent 2044518023
commit 47f3e6fb65
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/rosboost_cfg/src/rosboost_cfg/rosboost_cfg.py
View File

@ -177,13 +177,13 @@ def find_boost(search_paths):
return result[-1] return result[-1]
def search_paths(sysroot): def search_paths(sysroot):
_search_paths = [(None if 'ROS_BOOST_ROOT' not in os.environ else os.environ['ROS_BOOST_ROOT'], False), _search_paths = [(sysroot+'/usr', True),
(sysroot+'/usr/local', True),
(None if 'INCLUDE_DIRS' not in os.environ else os.environ['INCLUDE_DIRS'], True), (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 '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 '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 'CPLUS_INCLUDE_PATH' not in os.environ else os.environ['CPLUS_INCLUDE_PATH'], True),
(sysroot+'/usr', True), (None if 'ROS_BOOST_ROOT' not in os.environ else os.environ['ROS_BOOST_ROOT'], False)]
(sysroot+'/usr/local', True)]
search_paths = [] search_paths = []
for (str, system) in _search_paths: for (str, system) in _search_paths: