Merge pull request libgit2#6114 from libgit2/ethomson/cmake5

cmake: further refactorings

Author: ethomson

CMakeLists.txt

@@ -40,7 +40,7 @@ option(DEBUG_STRICT_OPEN       "Enable path validation in open"
 
 # Output options
 option(SONAME                  "Set the (SO)VERSION of the target"                      ON)
-option(LIBGIT2_FILENAME        "Name of the produced binary"                           OFF)
+   set(LIBGIT2_FILENAME        "git2" CACHE STRING "Name of the produced binary")
 option(DEPRECATE_HARD          "Do not include deprecated functions in the library"    OFF)
 
 # Compilation options

cmake/AddCFlagIfSupported.cmake

@@ -3,28 +3,28 @@
 #  <flag> - the compiler flag to test
 # This internally calls the CHECK_C_COMPILER_FLAG macro.
 
-INCLUDE(CheckCCompilerFlag)
+include(CheckCCompilerFlag)
 
-MACRO(ADD_C_FLAG _FLAG)
-	STRING(TOUPPER ${_FLAG} UPCASE)
-	STRING(REGEX REPLACE "[-=]" "_" UPCASE_PRETTY ${UPCASE})
-	STRING(REGEX REPLACE "^_+" "" UPCASE_PRETTY ${UPCASE_PRETTY})
-	CHECK_C_COMPILER_FLAG(${_FLAG} IS_${UPCASE_PRETTY}_SUPPORTED)
+macro(ADD_C_FLAG _FLAG)
+	string(TOUPPER ${_FLAG} UPCASE)
+	string(REGEX REPLACE "[-=]" "_" UPCASE_PRETTY ${UPCASE})
+	string(REGEX REPLACE "^_+" "" UPCASE_PRETTY ${UPCASE_PRETTY})
+	check_c_compiler_flag(${_FLAG} IS_${UPCASE_PRETTY}_SUPPORTED)
 
-	IF(IS_${UPCASE_PRETTY}_SUPPORTED)
-		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_FLAG}")
-	ELSE()
-		MESSAGE(FATAL_ERROR "Required flag ${_FLAG} is not supported")
-	ENDIF()
-ENDMACRO()
+	if(IS_${UPCASE_PRETTY}_SUPPORTED)
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_FLAG}")
+	else()
+		message(FATAL_ERROR "Required flag ${_FLAG} is not supported")
+	endif()
+endmacro()
 
-MACRO(ADD_C_FLAG_IF_SUPPORTED _FLAG)
-	STRING(TOUPPER ${_FLAG} UPCASE)
-	STRING(REGEX REPLACE "[-=]" "_" UPCASE_PRETTY ${UPCASE})
-	STRING(REGEX REPLACE "^_+" "" UPCASE_PRETTY ${UPCASE_PRETTY})
-	CHECK_C_COMPILER_FLAG(${_FLAG} IS_${UPCASE_PRETTY}_SUPPORTED)
+macro(ADD_C_FLAG_IF_SUPPORTED _FLAG)
+	string(TOUPPER ${_FLAG} UPCASE)
+	string(REGEX REPLACE "[-=]" "_" UPCASE_PRETTY ${UPCASE})
+	string(REGEX REPLACE "^_+" "" UPCASE_PRETTY ${UPCASE_PRETTY})
+	check_c_compiler_flag(${_FLAG} IS_${UPCASE_PRETTY}_SUPPORTED)
 
-	IF(IS_${UPCASE_PRETTY}_SUPPORTED)
-		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_FLAG}")
-	ENDIF()
-ENDMACRO()
+	if(IS_${UPCASE_PRETTY}_SUPPORTED)
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_FLAG}")
+	endif()
+endmacro()

cmake/EnableWarnings.cmake

@@ -1,15 +1,15 @@
-MACRO(ENABLE_WARNINGS flag)
-	ADD_C_FLAG_IF_SUPPORTED(-W${flag})
-ENDMACRO()
+macro(ENABLE_WARNINGS flag)
+	add_c_flag_if_supported(-W${flag})
+endmacro()
 
-MACRO(DISABLE_WARNINGS flag)
-	ADD_C_FLAG_IF_SUPPORTED(-Wno-${flag})
-ENDMACRO()
+macro(DISABLE_WARNINGS flag)
+	add_c_flag_if_supported(-Wno-${flag})
+endmacro()
 
-IF(ENABLE_WERROR)
-	IF(MSVC)
-		ADD_COMPILE_OPTIONS(-WX)
-	ELSE()
-		ADD_C_FLAG_IF_SUPPORTED(-Werror)
-	ENDIF()
-ENDIF()
+if(ENABLE_WERROR)
+	if(MSVC)
+		add_compile_options(-WX)
+	else()
+		add_c_flag_if_supported(-Werror)
+	endif()
+endif()

cmake/FindCoreFoundation.cmake

@@ -6,21 +6,21 @@
 # COREFOUNDATION_LDFLAGS
 #
 
-FIND_PATH(COREFOUNDATION_INCLUDE_DIR NAMES CoreFoundation.h)
-FIND_LIBRARY(COREFOUNDATION_LIBRARIES NAMES CoreFoundation)
-IF (COREFOUNDATION_INCLUDE_DIR AND COREFOUNDATION_LIBRARIES)
-	IF (NOT CoreFoundation_FIND_QUIETLY)
-		MESSAGE(STATUS "Found CoreFoundation ${COREFOUNDATION_LIBRARIES}")
-	ENDIF()
-	SET(COREFOUNDATION_FOUND TRUE)
-	SET(COREFOUNDATION_LDFLAGS "-framework CoreFoundation")
-ENDIF ()
+find_path(COREFOUNDATION_INCLUDE_DIR NAMES CoreFoundation.h)
+find_library(COREFOUNDATION_LIBRARIES NAMES CoreFoundation)
+if(COREFOUNDATION_INCLUDE_DIR AND COREFOUNDATION_LIBRARIES)
+	if(NOT CoreFoundation_FIND_QUIETLY)
+		message(STATUS "Found CoreFoundation ${COREFOUNDATION_LIBRARIES}")
+	endif()
+	set(COREFOUNDATION_FOUND TRUE)
+	set(COREFOUNDATION_LDFLAGS "-framework CoreFoundation")
+endif()
 
-IF (CoreFoundation_FIND_REQUIRED AND NOT COREFOUNDATION_FOUND)
-	MESSAGE(FATAL_ERROR "CoreFoundation not found")
-ENDIF()
+if(CoreFoundation_FIND_REQUIRED AND NOT COREFOUNDATION_FOUND)
+	message(FATAL_ERROR "CoreFoundation not found")
+endif()
 
-MARK_AS_ADVANCED(
+mark_as_advanced(
 	COREFOUNDATION_INCLUDE_DIR
 	COREFOUNDATION_LIBRARIES
 )