Skip to content

Integrating cURL into cmake - #1329

Merged
abitmore merged 2 commits into
bitshares:curl-cmakefrom
ShineQi:cURL
Sep 20, 2018
Merged

Integrating cURL into cmake #1329
abitmore merged 2 commits into
bitshares:curl-cmakefrom
ShineQi:cURL

Conversation

@ShineQi

@ShineQi ShineQi commented Sep 16, 2018

Copy link
Copy Markdown

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

Copy link
Copy Markdown
Member

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

@ShineQi

ShineQi commented Sep 18, 2018

Copy link
Copy Markdown
Author

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

Copy link
Copy Markdown
Contributor

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

@abitmore

Copy link
Copy Markdown
Member

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

Or perhaps squash and merge?

@ShineQi

ShineQi commented Sep 19, 2018 via email

Copy link
Copy Markdown
Author

@abitmore

abitmore commented Sep 19, 2018

Copy link
Copy Markdown
Member

@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.

@ShineQi

ShineQi commented Sep 20, 2018

Copy link
Copy Markdown
Author

@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 September 20, 2018 15:39
@abitmore

Copy link
Copy Markdown
Member

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
@abitmore abitmore mentioned this pull request Sep 20, 2018
2 tasks
@abitmore abitmore added this to the 201810 - Feature Release milestone Sep 20, 2018
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