diff --git a/CMakeLists.txt b/CMakeLists.txt index e0eb94500b..ae7b46e690 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -314,16 +314,16 @@ endif() option(CURL_CODE_COVERAGE "Enable code coverage build options" OFF) if(CURL_CODE_COVERAGE) set(CURL_COVERAGE_MACROS "") - set(CURL_CFLAGS_COVERAGE "") - set(CURL_LIBS_COVERAGE "") + set(CURL_COVERAGE_CFLAGS "") + set(CURL_COVERAGE_LIBS "") if(CMAKE_C_COMPILER_ID STREQUAL "GNU") list(APPEND CURL_COVERAGE_MACROS "NDEBUG") - list(APPEND CURL_CFLAGS_COVERAGE "-O0" "-g" "-fprofile-arcs" "-ftest-coverage") - list(APPEND CURL_LIBS_COVERAGE "gcov") + list(APPEND CURL_COVERAGE_CFLAGS "-O0" "-g" "-fprofile-arcs" "-ftest-coverage") + list(APPEND CURL_COVERAGE_LIBS "gcov") elseif(CMAKE_C_COMPILER_ID MATCHES "Clang") list(APPEND CURL_COVERAGE_MACROS "NDEBUG") - list(APPEND CURL_CFLAGS_COVERAGE "-O0" "-g" "-fprofile-arcs" "-ftest-coverage") - list(APPEND CURL_LIBS_COVERAGE "llvm-gcov") + list(APPEND CURL_COVERAGE_CFLAGS "-O0" "-g" "-fprofile-arcs" "-ftest-coverage") + list(APPEND CURL_COVERAGE_LIBS "llvm-gcov") endif() endif() @@ -1999,7 +1999,7 @@ if(WIN32) endif() endif() -list(APPEND CURL_LIBS ${CURL_NETWORK_AND_TIME_LIBS} ${CURL_LIBS_COVERAGE}) +list(APPEND CURL_LIBS ${CURL_NETWORK_AND_TIME_LIBS} ${CURL_COVERAGE_LIBS}) if(CMAKE_C_COMPILER_ID STREQUAL "MSVC") # MSVC but exclude clang-cl set_property(DIRECTORY APPEND PROPERTY COMPILE_OPTIONS "-MP") # Parallel compilation diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 1abbad362c..da6ddbe447 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -25,7 +25,7 @@ set(LIBCURL_OUTPUT_NAME "${LIB_NAME}" CACHE STRING "Basename of the curl library") set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS ${CURL_DEBUG_MACROS} ${CURL_COVERAGE_MACROS} "BUILDING_LIBCURL") -set_property(DIRECTORY APPEND PROPERTY COMPILE_OPTIONS ${CURL_CFLAGS_COVERAGE}) +set_property(DIRECTORY APPEND PROPERTY COMPILE_OPTIONS ${CURL_COVERAGE_CFLAGS}) configure_file("curl_config.h.cmake" "${CMAKE_CURRENT_BINARY_DIR}/curl_config.h") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8d59802ad9..d35667b12a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -23,7 +23,7 @@ ########################################################################### set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS ${CURL_DEBUG_MACROS} ${CURL_COVERAGE_MACROS}) -set_property(DIRECTORY APPEND PROPERTY COMPILE_OPTIONS ${CURL_CFLAGS_COVERAGE}) +set_property(DIRECTORY APPEND PROPERTY COMPILE_OPTIONS ${CURL_COVERAGE_CFLAGS}) set(_curl_cfiles_gen "") set(_curl_hfiles_gen "")