diff options
| author | Jacques Germishuys <jacquesg@striata.com> | 2014-04-19 23:07:50 +0200 |
|---|---|---|
| committer | Jacques Germishuys <jacquesg@striata.com> | 2014-04-19 23:07:50 +0200 |
| commit | 5c8d5eac35794391c935e273612744a0684beb29 (patch) | |
| tree | 0e7156abc56bc666331ed9d575926e1a6cdd8cb6 | |
| parent | 364ef52881f98293a5e454aab447bc7c2a3d3725 (diff) | |
| download | libgit2-5c8d5eac35794391c935e273612744a0684beb29.tar.gz | |
Introduce AddCFlagIfSupported CMake macro
| -rw-r--r-- | CMakeLists.txt | 47 | ||||
| -rw-r--r-- | cmake/Modules/AddCFlagIfSupported.cmake | 16 |
2 files changed, 25 insertions, 38 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6305be824..704770b29 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_LIST_DIR}/cmake/Modules/") INCLUDE(CheckLibraryExists) -INCLUDE(CheckCCompilerFlag) +INCLUDE(AddCFlagIfSupported) # Build options # @@ -302,49 +302,20 @@ ELSE () ADD_DEFINITIONS(-D__USE_MINGW_ANSI_STDIO=1) ELSEIF (BUILD_SHARED_LIBS) - CHECK_C_COMPILER_FLAG(-fvisibility=hidden HIDDEN_VISIBILITY_FLAG) - IF(HIDDEN_VISIBILITY_FLAG) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden") - ENDIF() + ADD_C_FLAG_IF_SUPPORTED(-fvisibility=hidden) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") ENDIF () - CHECK_C_COMPILER_FLAG(-Wno-missing-field-initializers NO_MISSING_FIELD_INIT_WARNING) - IF(NO_MISSING_FIELD_INIT_WARNING) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-missing-field-initializers") - ENDIF() - - CHECK_C_COMPILER_FLAG(-Wstrict-aliasing STRICT_ALIASING_WARNING) - IF(STRICT_ALIASING_WARNING) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wstrict-aliasing=2") - ENDIF() - - CHECK_C_COMPILER_FLAG(-Wstrict-prototypes STRICT_PROTOTYPES_WARNING) - IF(STRICT_PROTOTYPES_WARNING) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wstrict-prototypes") - ENDIF() - - CHECK_C_COMPILER_FLAG(-Wdeclaration-after-statement DECLARATION_AFTER_STATEMENT_WARNING) - IF(DECLARATION_AFTER_STATEMENT_WARNING) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wdeclaration-after-statement") - ENDIF() - - CHECK_C_COMPILER_FLAG(-Wno-unused-const-variable UNUSED_CONST_VAR_WARNING) - IF(UNUSED_CONST_VAR_WARNING) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-const-variable") - ENDIF() - - CHECK_C_COMPILER_FLAG(-Wno-unused-function UNUSED_FUNCTION_WARNING) - IF(UNUSED_FUNCTION_WARNING) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function") - ENDIF() + ADD_C_FLAG_IF_SUPPORTED(-Wno-missing-field-initializers) + ADD_C_FLAG_IF_SUPPORTED(-Wstrict-aliasing=2) + ADD_C_FLAG_IF_SUPPORTED(-Wstrict-prototypes) + ADD_C_FLAG_IF_SUPPORTED(-Wdeclaration-after-statement) + ADD_C_FLAG_IF_SUPPORTED(-Wno-unused-const-variable) + ADD_C_FLAG_IF_SUPPORTED(-Wno-unused-function) IF (APPLE) # Apple deprecated OpenSSL - CHECK_C_COMPILER_FLAG(-Wno-deprecated-declarations DEPRECATED_DECLARATIONS_WARNING) - IF(DEPRECATED_DECLARATIONS_WARNING) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-declarations") - ENDIF() + ADD_C_FLAG_IF_SUPPORTED(-Wno-deprecated-declarations) ENDIF() IF (PROFILE) diff --git a/cmake/Modules/AddCFlagIfSupported.cmake b/cmake/Modules/AddCFlagIfSupported.cmake new file mode 100644 index 000000000..67fc89510 --- /dev/null +++ b/cmake/Modules/AddCFlagIfSupported.cmake @@ -0,0 +1,16 @@ +# - Append compiler flag to CMAKE_C_FLAGS if compiler supports it +# ADD_C_FLAG_IF_SUPPORTED(<flag>) +# <flag> - the compiler flag to test +# This internally calls the CHECK_C_COMPILER_FLAG macro. + +INCLUDE(CheckCCompilerFlag) + +MACRO(ADD_C_FLAG_IF_SUPPORTED _FLAG) + STRING(TOUPPER ${_FLAG} UPCASE) + STRING(REGEX REPLACE "^-" "" UPCASE_PRETTY ${UPCASE}) + CHECK_C_COMPILER_FLAG(${_FLAG} IS_${UPCASE_PRETTY}_SUPPORTED) + + IF(IS_${UPCASE_PRETTY}_SUPPORTED) + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_FLAG}") + ENDIF() +ENDMACRO() |