Skip to content

Commit

Permalink
fix when first project is plain cmake (fix #340)
Browse files Browse the repository at this point in the history
  • Loading branch information
dirk-thomas committed Feb 13, 2013
1 parent 73683d7 commit b17de46
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion python/catkin/builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ def build_cmake_package(
# Generate basic env.sh for chaining to catkin packages
new_env_path = os.path.join(install_target, 'env.sh')
subs = {}
subs['last_env'] = os.path.join(os.path.dirname(last_env), 'setup.sh')
subs['last_env'] = os.path.join(os.path.dirname(last_env), 'setup.sh') if last_env is not None else None
subs['cmake_prefix_path'] = install_target + ":"
subs['ld_path'] = os.path.join(install_target, 'lib') + ":"
pythonpath = ":".join(get_python_path(install_target))
Expand Down

0 comments on commit b17de46

Please sign in to comment.