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

Merge https://gitlab.com/davidwed/Simple-Web-Server

Browse source
This commit is contained in:
eidheim 2019-06-24 10:07:43 +02:00
commit b06e7cfcd2
1 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

29
CMakeLists.txt
View file

@ -22,9 +22,11 @@ target_link_libraries(simple-web-server INTERFACE ${CMAKE_THREAD_LIBS_INIT})
# Remove Boost system, thread, regex components; use Boost::<component> aliases; remove Boost target_include_directories # Remove Boost system, thread, regex components; use Boost::<component> aliases; remove Boost target_include_directories
if(USE_STANDALONE_ASIO) if(USE_STANDALONE_ASIO)
target_compile_definitions(simple-web-server INTERFACE USE_STANDALONE_ASIO) target_compile_definitions(simple-web-server INTERFACE USE_STANDALONE_ASIO)
find_file(HAVE_ASIO asio.hpp) find_path(HAVE_ASIO asio.hpp)
if(NOT HAVE_ASIO) if(NOT HAVE_ASIO)
message(FATAL_ERROR "Standalone Asio not found") message(FATAL_ERROR "Standalone Asio not found")
else()
target_include_directories(simple-web-server INTERFACE ${HAVE_ASIO})
endif() endif()
else() else()
find_package(Boost 1.53.0 COMPONENTS system thread REQUIRED) find_package(Boost 1.53.0 COMPONENTS system thread REQUIRED)
@ -53,17 +55,20 @@ endif()
# If Simple-Web-Server is not a sub-project: # If Simple-Web-Server is not a sub-project:
if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
add_executable(http_examples http_examples.cpp) if(NOT USE_STANDALONE_ASIO)
target_link_libraries(http_examples simple-web-server) add_executable(http_examples http_examples.cpp)
find_package(Boost 1.53.0 COMPONENTS system thread filesystem REQUIRED) target_link_libraries(http_examples simple-web-server)
target_link_libraries(http_examples ${Boost_LIBRARIES})
target_include_directories(http_examples PRIVATE ${Boost_INCLUDE_DIR}) find_package(Boost 1.53.0 COMPONENTS system thread filesystem REQUIRED)
if(OPENSSL_FOUND) target_link_libraries(http_examples ${Boost_LIBRARIES})
add_executable(https_examples https_examples.cpp) target_include_directories(http_examples PRIVATE ${Boost_INCLUDE_DIR})
target_link_libraries(https_examples simple-web-server) if(OPENSSL_FOUND)
target_link_libraries(https_examples ${Boost_LIBRARIES}) add_executable(https_examples https_examples.cpp)
target_include_directories(https_examples PRIVATE ${Boost_INCLUDE_DIR}) target_link_libraries(https_examples simple-web-server)
endif() target_link_libraries(https_examples ${Boost_LIBRARIES})
target_include_directories(https_examples PRIVATE ${Boost_INCLUDE_DIR})
endif()
endif()
set(BUILD_TESTING ON) set(BUILD_TESTING ON)