From 48ce93e08fb48cafdd86f626c6a1d4a728942cc8 Mon Sep 17 00:00:00 2001 From: Jacques Germishuys Date: Fri, 18 Apr 2014 18:58:57 +0200 Subject: [PATCH 1/4] Fix inconsistent use of lower-case and upper-case names for macros --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 918e5b8f7..ebd55b9b9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -335,7 +335,7 @@ ENDIF() IF (THREADSAFE) IF (NOT WIN32) - find_package(Threads REQUIRED) + FIND_PACKAGE(Threads REQUIRED) ENDIF() ADD_DEFINITIONS(-DGIT_THREADS) @@ -366,7 +366,7 @@ IF (CMAKE_SIZEOF_VOID_P EQUAL 8) ELSEIF (CMAKE_SIZEOF_VOID_P EQUAL 4) ADD_DEFINITIONS(-DGIT_ARCH_32) ELSE() - message(FATAL_ERROR "Unsupported architecture") + MESSAGE(FATAL_ERROR "Unsupported architecture") ENDIF() # Compile and link libgit2 @@ -455,7 +455,7 @@ ENDIF () IF (TAGS) FIND_PROGRAM(CTAGS ctags) IF (NOT CTAGS) - message(FATAL_ERROR "Could not find ctags command") + MESSAGE(FATAL_ERROR "Could not find ctags command") ENDIF () FILE(GLOB_RECURSE SRC_ALL *.[ch]) From c6cd3f8bde4aeaad60139dd41a3ed5542dd2ab4f Mon Sep 17 00:00:00 2001 From: Jacques Germishuys Date: Fri, 18 Apr 2014 18:32:06 +0200 Subject: [PATCH 2/4] Use CHECK_C_COMPILER_FLAG to determine if the compiler supports a flag This simplifies platform/compiler dependent checks where we optionally enable features or disable warnings. --- CMakeLists.txt | 52 +++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 43 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ebd55b9b9..5a87181b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,6 +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) # Build options # @@ -287,7 +288,7 @@ IF (MSVC) # Precompiled headers ELSE () - SET(CMAKE_C_FLAGS "-D_GNU_SOURCE -Wall -Wextra -Wno-missing-field-initializers -Wstrict-aliasing=2 -Wstrict-prototypes -Wdeclaration-after-statement ${CMAKE_C_FLAGS}") + SET(CMAKE_C_FLAGS "-D_GNU_SOURCE -Wall -Wextra ${CMAKE_C_FLAGS}") IF (WIN32 AND NOT CYGWIN) SET(CMAKE_C_FLAGS_DEBUG "-D_DEBUG") @@ -301,16 +302,49 @@ ELSE () ADD_DEFINITIONS(-D__USE_MINGW_ANSI_STDIO=1) ELSEIF (BUILD_SHARED_LIBS) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -fPIC") - ENDIF () - IF (APPLE) # Apple deprecated OpenSSL - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-declarations") - - # With clang, disable some annoying extra warnings - IF (NOT CMAKE_COMPILER_IS_GNUCC) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-const-variable -Wno-unused-function") + CHECK_C_COMPILER_FLAG(-fvisibility=hidden HIDDEN_VISIBILITY_FLAG) + IF(HIDDEN_VISIBILITY_FLAG) + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden") ENDIF() + + 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() + + 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() + IF (PROFILE) SET(CMAKE_C_FLAGS "-pg ${CMAKE_C_FLAGS}") SET(CMAKE_EXE_LINKER_FLAGS "-pg ${CMAKE_EXE_LINKER_FLAGS}") From 364ef52881f98293a5e454aab447bc7c2a3d3725 Mon Sep 17 00:00:00 2001 From: Jacques Germishuys Date: Fri, 18 Apr 2014 19:13:18 +0200 Subject: [PATCH 3/4] Only disable deprecation warnings on Apple for OpenSSL --- CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5a87181b4..6305be824 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -340,9 +340,11 @@ ELSE () SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function") ENDIF() - CHECK_C_COMPILER_FLAG(-Wno-deprecated-declarations DEPRECATED_DECLARATIONS_WARNING) - IF(DEPRECATED_DECLARATIONS_WARNING) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-declarations") + 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() ENDIF() IF (PROFILE) From 5c8d5eac35794391c935e273612744a0684beb29 Mon Sep 17 00:00:00 2001 From: Jacques Germishuys Date: Sat, 19 Apr 2014 23:07:50 +0200 Subject: [PATCH 4/4] Introduce AddCFlagIfSupported CMake macro --- CMakeLists.txt | 47 +++++-------------------- cmake/Modules/AddCFlagIfSupported.cmake | 16 +++++++++ 2 files changed, 25 insertions(+), 38 deletions(-) create mode 100644 cmake/Modules/AddCFlagIfSupported.cmake 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() +# - 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()