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

Improve Go cmake, add go/master/c into cmake include path.. #2659

Merged
merged 2 commits into from
Jun 30, 2017

Conversation

helinwang
Copy link
Contributor

No description provided.

@helinwang helinwang force-pushed the cmake branch 5 times, most recently from 7cc018e to 31e1819 Compare June 30, 2017 00:27
@helinwang helinwang changed the title WIP, please do not review. Test build using CI. Improve Go cmake, add go/master/c into cmake include path.. Jun 30, 2017

add_custom_target(copy_paddle_master)
if(WITH_GOLANG)
add_custom_command(TARGET copy_paddle_master
Copy link
Contributor

@gangliao gangliao Jun 30, 2017

Choose a reason for hiding this comment

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

configure_file(<input> <output> COPYONLY)

If the input file is modified the build system will re-run CMake to re-configure the file and generate the build system again.

Copy link
Contributor Author

@helinwang helinwang Jun 30, 2017

Choose a reason for hiding this comment

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

After talking with @gangliao , we decide not to change here, since it depends on target paddle_master, using add_custom_command can express dependency.

CMakeLists.txt Outdated
#TODO (add go/master/c back when fixed)
add_subdirectory(go/pserver/cclient)
# we need to symlink Paddle directory into GOPATH. If we
# don't do it and we have code that depends on Paddle, go
Copy link
Contributor

Choose a reason for hiding this comment

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

we can put this configuration into configure.cmake to keep the root CMAKE FILE as simple as possible.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks! Done.

Copy link
Contributor

@gangliao gangliao left a comment

Choose a reason for hiding this comment

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

LGTM

@helinwang helinwang merged commit fae606f into PaddlePaddle:develop Jun 30, 2017
@helinwang helinwang deleted the cmake branch June 30, 2017 05:11
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