jyapayne/Simple-Web-Server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'fivethreeo-master'

Browse source
This commit is contained in:
eidheim 2015-10-24 16:44:28 +02:00
commit 2181a172e8
1 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

27
CMakeLists.txt
View file

@ -10,12 +10,18 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.3) if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.3)
message(FATAL_ERROR "Clang version >=3.3 required.") message(FATAL_ERROR "Clang version >=3.3 required.")
endif() endif()
elseif (MSVC14)
else() else()
message(WARNING "Your compiler (${CMAKE_CXX_COMPILER_ID}) has not been tested on this project. Only Clang and GCC has been tested. Please report any problems at the project page on GitHub.") message(WARNING "Your compiler (${CMAKE_CXX_COMPILER_ID}) has not been tested on this project. Only Clang and GCC has been tested. Please report any problems at the project page on GitHub.")
endif() endif()
#Only tested with versions 1.55 and 1.56
find_package(Boost 1.54.0 COMPONENTS regex system thread coroutine context filesystem REQUIRED) include_directories(.)
find_package(Threads REQUIRED)
#Only tested with versions 1.59.0
find_package(Boost 1.59.0 COMPONENTS regex system thread coroutine context filesystem date_time REQUIRED)
include_directories(${Boost_INCLUDE_DIR}) include_directories(${Boost_INCLUDE_DIR})
if(APPLE) if(APPLE)
@ -23,17 +29,16 @@ if(APPLE)
endif() endif()
#TODO: add requirement for version 1.0.1g (can it be done in one line?) #TODO: add requirement for version 1.0.1g (can it be done in one line?)
find_package(OpenSSL REQUIRED) find_package(OpenSSL QUIET)
include_directories(${OPENSSL_INCLUDE_DIR})
find_package(Threads REQUIRED) if(OpenSSL_FOUND)
include_directories(${OPENSSL_INCLUDE_DIR})
include_directories(.) add_executable(https_examples https_examples.cpp)
target_link_libraries(https_examples ${Boost_LIBRARIES})
add_executable(https_examples https_examples.cpp) target_link_libraries(https_examples ${OPENSSL_LIBRARIES})
target_link_libraries(https_examples ${Boost_LIBRARIES}) target_link_libraries(https_examples ${CMAKE_THREAD_LIBS_INIT})
target_link_libraries(https_examples ${OPENSSL_LIBRARIES}) endif()
target_link_libraries(https_examples ${CMAKE_THREAD_LIBS_INIT})
add_executable(http_examples http_examples.cpp) add_executable(http_examples http_examples.cpp)
target_link_libraries(http_examples ${Boost_LIBRARIES}) target_link_libraries(http_examples ${Boost_LIBRARIES})