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.

Sign up for GitHub

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

Update Visual Studio build instructions #2355

Closed
wants to merge 11 commits into from
Closed

Update Visual Studio build instructions #2355

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cb06cc7
Convert code to use boost::beast
seelabs Jan 22, 2018
33c12c9
Remove pre-boost beast
seelabs Jan 22, 2018
c85c433
[FOLD] Remove VS2015 files
bachase Jan 25, 2018
c1383d9
[FOLD] Suppress boost warnings with VS17
bachase Jan 25, 2018
b29eddc
[FOLD] Add default CmakeSettings.json
bachase Jan 25, 2018
42ebcdf
[FOLD] Add VisualStudio2017 build instructions
bachase Jan 25, 2018
8b55956
[FOLD] Address PR comments
bachase Jan 25, 2018
2a655b6
[FOLD] Address additional PR comments
bachase Jan 25, 2018
9fce4c0
[FOLD] Fix whitespace
bachase Jan 29, 2018
4e0cd68
Revert "[FOLD] Remove VS2015 files"
bachase Jan 29, 2018
2376138
[FOLD] Address PR comments
bachase Jan 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions Builds/CMake/CMakeFuncs.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,12 @@ macro(use_boost)
if(NOT Boost_FOUND)
message(WARNING "Boost directory found, but not all components. May not be able to build.")
endif()
if(MSVC14)
# VS2017 with boost <= 1.66.0 requires a flag to suppress warnings
Copy link
Collaborator

Choose a reason for hiding this comment

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

Nit: weird indentation here

if(NOT Boost_VERSION VERSION_GREATER 106600)
add_definitions(-DBOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE)
endif()
endif()
include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
link_directories(${Boost_LIBRARY_DIRS})
else()
Expand All @@ -383,9 +389,13 @@ macro(use_openssl openssl_min)
endif()

if (WIN32)
if (DEFINED ENV{OPENSSL_ROOT})
include_directories($ENV{OPENSSL_ROOT}/include)
link_directories($ENV{OPENSSL_ROOT}/lib)
if ((NOT DEFINED OPENSSL_ROOT) AND (DEFINED ENV{OPENSSL_ROOT}))
set(OPENSSL_ROOT $ENV{OPENSSL_ROOT})
endif()
Copy link
Collaborator

Choose a reason for hiding this comment

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

Nit: weird indentation here as well

file(TO_CMAKE_PATH "${OPENSSL_ROOT}" OPENSSL_ROOT)
if (DEFINED OPENSSL_ROOT)
include_directories(${OPENSSL_ROOT}/include)
link_directories(${OPENSSL_ROOT}/lib)
endif()
else()
if (static)
Expand Down