Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: making it so ephemeral list-type arguments are appended to existing list-type arguments #147

Merged
merged 1 commit into from
Mar 16, 2015

Conversation

jbohren
Copy link
Contributor

@jbohren jbohren commented Mar 3, 2015

This allows you to add additional CMake arguments on top of the arguments in a given profile.

@adeguet1 does this do what you needed?

@jbohren jbohren force-pushed the feature-append-list-args branch from abc4e82 to 00962f7 Compare March 3, 2015 14:59
if k in Context.KEYS and v is not None]))
for (k,v) in opts_vars.items():
if k in Context.KEYS and v is not None:
if append and type(context_args.get(k,None)) is list and type(v) is list:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpick: k, None

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also k,v above.

@jbohren jbohren force-pushed the feature-append-list-args branch from 00962f7 to a13f9ce Compare March 16, 2015 15:20
@jbohren
Copy link
Contributor Author

jbohren commented Mar 16, 2015

@wjwwood I'll update the Load / Save functions in another PR.

@jbohren jbohren force-pushed the feature-append-list-args branch from a13f9ce to af7260c Compare March 16, 2015 15:41
…sting list-type arguments

- affects behavior of --cmake-args, --make-args, and --catkin-make-args
- fixes broken --no-catkin-make-args (fixes catkin#136)
@jbohren jbohren force-pushed the feature-append-list-args branch from af7260c to 4007bcd Compare March 16, 2015 15:43
wjwwood added a commit that referenced this pull request Mar 16, 2015
build: making it so ephemeral list-type arguments are appended to existing list-type arguments
@wjwwood wjwwood merged commit ed19ca1 into catkin:master Mar 16, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants