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

cmake: CMAKE_SOURCE/BINARY_DIR to PROJECT_SOURCE/BINARY_DIR #1899

Merged
merged 1 commit into from
Feb 19, 2015

Conversation

philkr
Copy link
Contributor

@philkr philkr commented Feb 18, 2015

This is a simple string replace from CMAKE_SOURCE_DIR/CMAKE_BINARY_DIR to PROJECT_SOURCE_DIR/PROJECT_BINARY_DIR.
If caffe is build directly using cmake, this has no effect.
However if caffe is included as a subproject (add_subdirectory) it now builds correctly, as all PROJECT_.._DIR point to the root of the caffe directory and not root of the parent project.

shelhamer added a commit that referenced this pull request Feb 19, 2015
[cmake] CMAKE_SOURCE/BINARY_DIR to PROJECT_SOURCE/BINARY_DIR
@shelhamer shelhamer merged commit 650b944 into BVLC:dev Feb 19, 2015
@philkr philkr deleted the project_source_dir branch February 20, 2015 17:42
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.

2 participants