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

Feature: add CONAN_CMAKE_PROGRAM #4298

Merged
merged 2 commits into from Jan 17, 2019

Conversation

Projects
None yet
2 participants
@SSE4
Copy link
Contributor

commented Jan 14, 2019

closes #3512

Changelog: Feature: Added a configuration entry at the conan.conf file to be able to specify a custom CMake executable.
Docs: conan-io/docs#1025

/cc @sigiesec

@ghost ghost assigned SSE4 Jan 14, 2019

@ghost ghost added the stage: review label Jan 14, 2019

@SSE4 SSE4 force-pushed the SSE4:conan_cmake_program branch from 5623de4 to 54b611d Jan 14, 2019

- add CONAN_CMAKE_PROGRAM
Signed-off-by: SSE4 <tomskside@gmail.com>

@SSE4 SSE4 force-pushed the SSE4:conan_cmake_program branch from 54b611d to 29536bd Jan 15, 2019

@lasote

lasote approved these changes Jan 17, 2019

@lasote

This comment has been minimized.

Copy link
Contributor

commented Jan 17, 2019

Please solve conflicts

@lasote lasote added this to the 1.12 milestone Jan 17, 2019

@SSE4

This comment has been minimized.

Copy link
Contributor Author

commented Jan 17, 2019

solved

@lasote

This comment has been minimized.

Copy link
Contributor

commented Jan 17, 2019

Missing docs, update this PR body to link the PR in the docs repo.

@SSE4

This comment has been minimized.

Copy link
Contributor Author

commented Jan 17, 2019

docs added

@lasote lasote merged commit 22114ae into conan-io:develop Jan 17, 2019

2 checks passed

continuous-integration/jenkins/pr-head This commit looks good
Details
license/cla Contributor License Agreement is signed.
Details

@ghost ghost removed the stage: review label Jan 17, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.