Skip to content

Commit

Permalink
resultspace: adding explicit exec paths
Browse files Browse the repository at this point in the history
  • Loading branch information
jbohren committed Mar 26, 2015
1 parent ccbaaf4 commit 476a599
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion catkin_tools/resultspace.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@

from .runner import run_command
from .common import string_type
from .utils import which

CMAKE_EXEC = which('cmake')
SORT_EXEC = which('sort')


def get_resultspace_environment(result_space_path, quiet=False):
Expand Down Expand Up @@ -58,7 +62,7 @@ def get_resultspace_environment(result_space_path, quiet=False):

# Construct a command list which sources the setup file and prints the env to stdout
norc_flags = {'bash': '--norc', 'zsh': '-f'}
subcommand = '%s cmake -E environment | sort' % (setup_file_path)
subcommand = '%s %s -E environment | %s' % (setup_file_path, CMAKE_EXEC, SORT_EXEC)

command = [
shell_path,
Expand Down

0 comments on commit 476a599

Please sign in to comment.