diff --git a/cmake/modules/AddCompilerFlags.cmake b/cmake/modules/AddCompilerFlags.cmake --- a/cmake/modules/AddCompilerFlags.cmake +++ b/cmake/modules/AddCompilerFlags.cmake @@ -3,22 +3,22 @@ include(CheckCCompilerFlag) include(SanitizeHelper) -function(check_compiler_flag RESULT LANGUAGE FLAG) - sanitize_c_cxx_definition("have_${LANGUAGE}_" ${FLAG} TEST_NAME) +function(check_compiler_flags RESULT LANGUAGE) + sanitize_c_cxx_definition("have_${LANGUAGE}_" "${ARGN}" TEST_NAME) if("${LANGUAGE}" STREQUAL "C") - CHECK_C_COMPILER_FLAG(${FLAG} ${TEST_NAME}) + CHECK_C_COMPILER_FLAG("${ARGN}" ${TEST_NAME}) elseif("${LANGUAGE}" STREQUAL "CXX") - CHECK_CXX_COMPILER_FLAG(${FLAG} ${TEST_NAME}) + CHECK_CXX_COMPILER_FLAG("${ARGN}" ${TEST_NAME}) else() - message(FATAL_ERROR "check_compiler_flag LANGUAGE should be C or CXX") + message(FATAL_ERROR "check_compiler_flags LANGUAGE should be C or CXX") endif() set(${RESULT} ${${TEST_NAME}} PARENT_SCOPE) endfunction() function(add_compiler_flags_for_language LANGUAGE) foreach(f ${ARGN}) - check_compiler_flag(FLAG_IS_SUPPORTED ${LANGUAGE} ${f}) + check_compiler_flags(FLAG_IS_SUPPORTED ${LANGUAGE} ${f}) if(${FLAG_IS_SUPPORTED}) add_compile_options($<$:${f}>) endif() @@ -71,7 +71,7 @@ function(add_compile_options_to_configuration_for_language CONFIGURATION LANGUAGE) foreach(f ${ARGN}) - check_compiler_flag(FLAG_IS_SUPPORTED ${LANGUAGE} ${f}) + check_compiler_flags(FLAG_IS_SUPPORTED ${LANGUAGE} ${f}) if(${FLAG_IS_SUPPORTED}) add_compile_options($<$,$>:${f}>) endif() @@ -111,7 +111,7 @@ # CHECK_CXX_COMPILER_FLAG() will return false, preventing the flag from # being set. set(WERROR_UNUSED_ARG -Werror=unused-command-line-argument) - check_compiler_flag(IS_WERROR_SUPPORTED CXX ${WERROR_UNUSED_ARG}) + check_compiler_flags(IS_WERROR_SUPPORTED CXX ${WERROR_UNUSED_ARG}) if(${IS_WERROR_SUPPORTED}) set(CMAKE_REQUIRED_FLAGS ${WERROR_UNUSED_ARG}) endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -72,7 +72,7 @@ # Prefer -g3, defaults to -g if unavailable foreach(LANGUAGE C CXX) set(COMPILER_DEBUG_LEVEL -g) - check_compiler_flag(G3_IS_SUPPORTED ${LANGUAGE} -g3) + check_compiler_flags(G3_IS_SUPPORTED ${LANGUAGE} -g3) if(${G3_IS_SUPPORTED}) set(COMPILER_DEBUG_LEVEL -g3) endif() @@ -112,7 +112,7 @@ # doesn't tell if the visibility set is effective. # Check if the flag -fvisibility=hidden is supported, as using the hidden # visibility is a requirement to reduce exports. - check_compiler_flag(HAS_CXX_FVISIBILITY CXX -fvisibility=hidden) + check_compiler_flags(HAS_CXX_FVISIBILITY CXX -fvisibility=hidden) if(NOT HAS_CXX_FVISIBILITY) message(FATAL_ERROR "Cannot set default symbol visibility. Use -DENABLE_REDUCE_EXPORTS=OFF.") endif()