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

Cleanup of merge request 239 , and reverted changes where examples are not built when standalone asio is used

Browse source
This commit is contained in:
eidheim 2019-06-24 10:15:38 +02:00
commit b0bd7df473
1 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

30
CMakeLists.txt
View file

@ -25,8 +25,8 @@ if(USE_STANDALONE_ASIO)
find_path(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() else()
target_include_directories(simple-web-server INTERFACE ${HAVE_ASIO}) 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)
@ -55,20 +55,18 @@ 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}")
if(NOT USE_STANDALONE_ASIO) add_executable(http_examples http_examples.cpp)
add_executable(http_examples http_examples.cpp) target_link_libraries(http_examples simple-web-server)
target_link_libraries(http_examples simple-web-server)
find_package(Boost 1.53.0 COMPONENTS system thread filesystem REQUIRED)
find_package(Boost 1.53.0 COMPONENTS system thread filesystem REQUIRED) target_link_libraries(http_examples ${Boost_LIBRARIES})
target_link_libraries(http_examples ${Boost_LIBRARIES}) target_include_directories(http_examples PRIVATE ${Boost_INCLUDE_DIR})
target_include_directories(http_examples PRIVATE ${Boost_INCLUDE_DIR}) if(OPENSSL_FOUND)
if(OPENSSL_FOUND) add_executable(https_examples https_examples.cpp)
add_executable(https_examples https_examples.cpp) target_link_libraries(https_examples simple-web-server)
target_link_libraries(https_examples simple-web-server) target_link_libraries(https_examples ${Boost_LIBRARIES})
target_link_libraries(https_examples ${Boost_LIBRARIES}) target_include_directories(https_examples PRIVATE ${Boost_INCLUDE_DIR})
target_include_directories(https_examples PRIVATE ${Boost_INCLUDE_DIR}) endif()
endif()
endif()
set(BUILD_TESTING ON) set(BUILD_TESTING ON)