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

Integrating cURL into cmake #1329

Merged
merged 2 commits into from Sep 20, 2018

Conversation

Projects
3 participants
@cwyyprog

cwyyprog commented Sep 16, 2018

Here's some progress on integrating curl into the cmake build system. I only tested it with vs2015.1 , boost 1.65.1, other environments are not checked.

@abitmore

This comment has been minimized.

Member

abitmore commented Sep 16, 2018

Thanks. The doc submodule update doesn't work for me. Other changed to be checked.

@cwyyprog

This comment has been minimized.

cwyyprog commented Sep 18, 2018

I don't know how to pull to the docs, but you can see my docs in https://github.com/cwyyprog/bitshares-core/wiki/WinDevEnv

@pmconrad

This comment has been minimized.

pmconrad commented Sep 19, 2018

The commit history looks horrible, please use rebase -i to clean this up.

@abitmore

This comment has been minimized.

Member

abitmore commented Sep 19, 2018

The commit history looks horrible, please use rebase -i to clean this up.

Or perhaps squash and merge?

@cwyyprog

This comment has been minimized.

cwyyprog commented Sep 19, 2018

@abitmore

This comment has been minimized.

Member

abitmore commented Sep 19, 2018

@cwyyprog please revert the update on docs submodule (or perhaps rebase), because Travis can't fetch it. We'll update wiki later and bump the submodule. Thanks. Other than that, I need to find time to test the PR, and will update here when done.

@cwyyprog

This comment has been minimized.

cwyyprog commented Sep 20, 2018

@cwyyprog please revert the update on docs submodule (or perhaps rebase), because Travis can't fetch it. We'll update wiki later and bump the submodule. Thanks. Other than that, I need to find time to test the PR, and will update here when done.

Sorry, I tried to revert the docs submodule, but it seems that I failed.

@abitmore abitmore changed the base branch from develop to curl-cmake Sep 20, 2018

@abitmore

This comment has been minimized.

Member

abitmore commented Sep 20, 2018

OK, Thanks. I'll merge into a temporary branch and make changes from there.

@abitmore abitmore merged commit 9a4f18f into bitshares:curl-cmake Sep 20, 2018

1 of 2 checks passed

ci/dockercloud Your tests are pending in Docker Cloud
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@abitmore abitmore referenced this pull request Sep 20, 2018

Merged

Integrating cURL into cmake #1336

0 of 2 tasks complete

@abitmore abitmore added this to In progress in Feature release (201810) via automation Sep 20, 2018

@abitmore abitmore added this to the 201810 - Feature Release milestone Sep 20, 2018

@abitmore abitmore moved this from In progress to Done in Feature release (201810) Sep 20, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment