diff options
Diffstat (limited to 'cmake/Modules')
| -rw-r--r-- | cmake/Modules/CheckCCompilerFlagSSP.cmake (renamed from cmake/Modules/MacroCheckCCompilerFlagSSP.cmake) | 20 | ||||
| -rw-r--r-- | cmake/Modules/DefineCompilerFlags.cmake | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/cmake/Modules/MacroCheckCCompilerFlagSSP.cmake b/cmake/Modules/CheckCCompilerFlagSSP.cmake index b64fb453..2fe43954 100644 --- a/cmake/Modules/MacroCheckCCompilerFlagSSP.cmake +++ b/cmake/Modules/CheckCCompilerFlagSSP.cmake @@ -1,11 +1,12 @@ # - Check whether the C compiler supports a given flag in the # context of a stack checking compiler option. + # CHECK_C_COMPILER_FLAG_SSP(FLAG VARIABLE) # # FLAG - the compiler flag # VARIABLE - variable to store the result -# -# This actually calls the check_c_source_compiles macro. +# +# This actually calls check_c_source_compiles. # See help for CheckCSourceCompiles for a listing of variables # that can modify the build. @@ -15,12 +16,11 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -INCLUDE(CheckCSourceCompiles) - -MACRO (CHECK_C_COMPILER_FLAG_SSP _FLAG _RESULT) - SET(SAFE_CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}") - SET(CMAKE_REQUIRED_DEFINITIONS "${_FLAG}") - CHECK_C_SOURCE_COMPILES("int main(int argc, char **argv) { char buffer[256]; return buffer[argc]=0;}" ${_RESULT}) - SET (CMAKE_REQUIRED_DEFINITIONS "${SAFE_CMAKE_REQUIRED_DEFINITIONS}") -ENDMACRO (CHECK_C_COMPILER_FLAG_SSP) +include(CheckCSourceCompiles) +function(CHECK_C_COMPILER_FLAG_SSP _FLAG _RESULT) + set(SAFE_CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}") + set(CMAKE_REQUIRED_DEFINITIONS "${_FLAG}") + check_c_source_compiles("int main(int argc, char **argv) { char buffer[256]; return buffer[argc]=0;}" ${_RESULT}) + set(CMAKE_REQUIRED_DEFINITIONS "${SAFE_CMAKE_REQUIRED_DEFINITIONS}") +endfunction(CHECK_C_COMPILER_FLAG_SSP) diff --git a/cmake/Modules/DefineCompilerFlags.cmake b/cmake/Modules/DefineCompilerFlags.cmake index d43c454b..5b0fbdd6 100644 --- a/cmake/Modules/DefineCompilerFlags.cmake +++ b/cmake/Modules/DefineCompilerFlags.cmake @@ -1,7 +1,7 @@ # define system dependent compiler flags include(CheckCCompilerFlag) -include(MacroCheckCCompilerFlagSSP) +include(CheckCCompilerFlagSSP) if (UNIX AND NOT WIN32) # |