forked fromglynos/cpp-netlib
- Notifications
You must be signed in to change notification settings - Fork425
Modernize cmake scripts and support MSVC 2017#834
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Open
anonimal wants to merge6 commits intocpp-netlib:0.13-releaseChoose a base branch fromanonimal:0.13-release
base:0.13-release
Could not load branches
Branch not found:{{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
Uh oh!
There was an error while loading.Please reload this page.
Open
Changes from1 commit
Commits
Show all changes
6 commits Select commitHold shift + click to select a range
2cb82ec Build: Clean up and modernize cmake scripts
btolfacbb10e6 Build: fix build with Boost 1.66.0
btolfa4a202d3 Work around ambiguous true_type
btolfa604d50e Merge pull request #1
anonimal48bbadb Build: Add cmake option CPP-NETLIB_WINAPI_VERSION
btolfa3c777df Merge pull request #2
anonimalFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
NextNext commit
Build: Clean up and modernize cmake scripts
- Loading branch information
Uh oh!
There was an error while loading.Please reload this page.
commit2cb82ec63fb6926fb8eba02a24fed34515b2ea3f
There are no files selected for viewing
206 changes: 117 additions & 89 deletionsCMakeLists.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
58 changes: 36 additions & 22 deletionscppnetlibConfig.cmake.in
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,38 @@ | ||
| # - Config file for the cppnetlib package | ||
| # It defines the following variables targets | ||
| # cppnetlib::cppnetlib - include directories and usage requirements for cppnetlib | ||
| # Libraries and usage requirements^ | ||
| # cppnetlib::uri | ||
| # cppnetlib::server-parsers | ||
| # cppnetlib::client-connections | ||
| # Variables | ||
| # CPPNETLIB_INCLUDE_DIRS - include directories for cppnetlib (empty, usage requirements propageted through libraries) | ||
| # CPPNETLIB_LIBRARIES - libraries to link against | ||
| set(CPP-NETLIB_STATIC_BOOST @CPP-NETLIB_STATIC_BOOST@) | ||
| set(CPP-NETLIB_ENABLE_HTTPS @CPP-NETLIB_ENABLE_HTTPS@) | ||
| set(CPP-NETLIB_STATIC_OPENSSL @CPP-NETLIB_STATIC_OPENSSL@) | ||
| # Use Boost's static libraries | ||
| if (CPP-NETLIB_STATIC_BOOST) | ||
| set(Boost_USE_STATIC_LIBS ON) | ||
| endif() | ||
| # Always use multi-threaded Boost libraries. | ||
| set(Boost_USE_MULTITHREADED ON) | ||
| if (CPP-NETLIB_ENABLE_HTTPS) | ||
| if (CPP-NETLIB_STATIC_OPENSSL) | ||
| set(OPENSSL_USE_STATIC_LIBS TRUE) | ||
| endif() | ||
| find_package(OpenSSL REQUIRED) | ||
| endif() | ||
| find_package(Boost 1.58.0 REQUIRED COMPONENTS system thread regex) | ||
| find_package(Threads) | ||
| include("${CMAKE_CURRENT_LIST_DIR}/cppnetlibTargets.cmake") | ||
| set(CPPNETLIB_INCLUDE_DIRS) | ||
| set(CPPNETLIB_LIBRARIES cppnetlib::client-connections cppnetlib::server-parsers cppnetlib::uri) |
11 changes: 0 additions & 11 deletionscppnetlibConfigVersion.cmake.in
This file was deleted.
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.