ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-03 00:45:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Visual Studio build instructions

Browse Source
This commit is contained in:
Brad Chase
2018-01-25 12:08:36 -05:00
committed by seelabs
parent ed750a84dd
commit 125316f2a6
3 changed files with 324 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Builds/CMake/CMakeFuncs.cmake
View File

@@ -357,12 +357,21 @@ 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
if(NOT Boost_VERSION VERSION_GREATER 106600)
add_definitions(-DBOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE)
endif()
endif()
if (is_xcode)
include_directories(BEFORE ${Boost_INCLUDE_DIRS})
append_flags(CMAKE_CXX_FLAGS --system-header-prefix="boost/")
else()
include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
endif()
link_directories(${Boost_LIBRARY_DIRS})
else()
message(FATAL_ERROR "Boost not found")
@@ -388,9 +397,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()
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)