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

Resolved conflicts

Browse source
This commit is contained in:
eidheim 2023-04-04 12:50:54 +02:00
commit 84170850f3
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -61,7 +61,7 @@ endif()
# If Simple-Web-Server is not a sub-project:
if(CMAKE_SOURCE_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
if(NOT MSVC)
add_compile_options(-std=c++11 -Wall -Wextra)
add_compile_options(-Wall -Wextra)
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_compile_options(-Wthread-safety)
endif()
@ -73,9 +73,11 @@ if(CMAKE_SOURCE_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
if(Boost_FOUND)
add_executable(http_examples http_examples.cpp)
target_link_libraries(http_examples simple-web-server Boost::boost Boost::filesystem)
set_target_properties(http_examples PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON)
if(OPENSSL_FOUND)
add_executable(https_examples https_examples.cpp)
target_link_libraries(https_examples simple-web-server Boost::boost Boost::filesystem)
set_target_properties(https_examples PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON)
endif()
endif()

12
tests/CMakeLists.txt
View file

@ -7,10 +7,12 @@ if(NOT MSVC)
if(BUILD_TESTING)
add_executable(sws_io_test io_test.cpp)
target_link_libraries(sws_io_test simple-web-server)
set_target_properties(sws_io_test PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON)
add_test(NAME sws_io_test COMMAND sws_io_test)
add_executable(sws_parse_test parse_test.cpp)
target_link_libraries(sws_parse_test simple-web-server)
set_target_properties(sws_parse_test PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON)
add_test(NAME sws_parse_test COMMAND sws_parse_test)
endif()
endif()
@ -18,12 +20,14 @@ endif()
if(OPENSSL_FOUND AND BUILD_TESTING)
add_executable(sws_crypto_test crypto_test.cpp)
target_link_libraries(sws_crypto_test simple-web-server)
set_target_properties(sws_crypto_test PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON)
add_test(NAME sws_crypto_test COMMAND sws_crypto_test)
endif()
if(BUILD_TESTING)
add_executable(status_code_test status_code_test.cpp)
target_link_libraries(status_code_test simple-web-server)
set_target_properties(status_code_test PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON)
add_test(NAME status_code_test COMMAND status_code_test)
endif()
@ -31,24 +35,30 @@ if(BUILD_FUZZING)
add_executable(percent_decode fuzzers/percent_decode.cpp)
target_compile_options(percent_decode PRIVATE -fsanitize=address,fuzzer)
target_link_libraries(percent_decode simple-web-server -fsanitize=address,fuzzer)
set_target_properties(percent_decode PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON)
add_executable(query_string_parse fuzzers/query_string_parse.cpp)
target_compile_options(query_string_parse PRIVATE -fsanitize=address,fuzzer)
target_link_libraries(query_string_parse simple-web-server -fsanitize=address,fuzzer)
set_target_properties(query_string_parse PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON)
add_executable(http_header_parse fuzzers/http_header_parse.cpp)
target_compile_options(http_header_parse PRIVATE -fsanitize=address,fuzzer)
target_link_libraries(http_header_parse simple-web-server -fsanitize=address,fuzzer)
set_target_properties(http_header_parse PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON)
add_executable(http_header_field_value_semicolon_separated_attributes_parse fuzzers/http_header_field_value_semicolon_separated_attributes_parse.cpp)
target_compile_options(http_header_field_value_semicolon_separated_attributes_parse PRIVATE -fsanitize=address,fuzzer)
target_link_libraries(http_header_field_value_semicolon_separated_attributes_parse simple-web-server -fsanitize=address,fuzzer)
set_target_properties(http_header_field_value_semicolon_separated_attributes_parse PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON)
add_executable(request_message_parse fuzzers/request_message_parse.cpp)
target_compile_options(request_message_parse PRIVATE -fsanitize=address,fuzzer)
target_link_libraries(request_message_parse simple-web-server -fsanitize=address,fuzzer)
set_target_properties(request_message_parse PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON)
add_executable(response_message_parse fuzzers/response_message_parse.cpp)
target_compile_options(response_message_parse PRIVATE -fsanitize=address,fuzzer)
target_link_libraries(response_message_parse simple-web-server -fsanitize=address,fuzzer)
endif()
set_target_properties(response_message_parse PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON)
endif()