Commit cde35e2a authored by Hermann von Kleist's avatar Hermann von Kleist
Browse files

Set CXX_STANDARD property for declared targets 

CMake 3.8 provides the slightly cooler compile feature cxx_std_11, but
we are on 3.7 for now.
parent fff70e52

CMakeLists.txt

+3 −1
Original line number Diff line number Diff line
@@ -57,7 +57,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()
@@ -70,10 +70,12 @@ if(CMAKE_SOURCE_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") 
        add_executable(http_examples http_examples.cpp)

        target_link_libraries(http_examples simple-web-server)

        target_link_libraries(http_examples Boost::boost Boost::system Boost::thread 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)

            target_link_libraries(https_examples Boost::boost Boost::system Boost::thread Boost::filesystem)

            set_target_properties(https_examples PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON)

        endif()

     endif()

tests/CMakeLists.txt

+10 −0
Original line number Diff line number Diff line
@@ -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()
@@ -32,29 +36,35 @@ if(BUILD_FUZZING) 
    target_compile_options(percent_decode PRIVATE -fsanitize=address,fuzzer)

    target_link_options(percent_decode PRIVATE -fsanitize=address,fuzzer)

    target_link_libraries(percent_decode simple-web-server)

    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_options(query_string_parse PRIVATE -fsanitize=address,fuzzer)

    target_link_libraries(query_string_parse simple-web-server)

    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_options(http_header_parse PRIVATE -fsanitize=address,fuzzer)

    target_link_libraries(http_header_parse simple-web-server)

    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_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)

    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_options(request_message_parse PRIVATE -fsanitize=address,fuzzer)

    target_link_libraries(request_message_parse simple-web-server)

    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_options(response_message_parse PRIVATE -fsanitize=address,fuzzer)

    target_link_libraries(response_message_parse simple-web-server)

    set_target_properties(response_message_parse PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON)

endif()
 
 No newline at end of file