Merge pull request #5481 from pks-t/pks/cmake-cleanups

CMake cleanups

22 files changed, 20 insertions, 58 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 381954790..fb5202fd1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,21 +11,12 @@
 # Install:
 # > cmake --build . --target install
 
-PROJECT(libgit2 C)
 CMAKE_MINIMUM_REQUIRED(VERSION 3.5.1)
-CMAKE_POLICY(SET CMP0015 NEW)
-IF(POLICY CMP0051)
-	CMAKE_POLICY(SET CMP0051 NEW)
-ENDIF()
-IF(POLICY CMP0042)
-	CMAKE_POLICY(SET CMP0042 NEW)
-ENDIF()
-IF(POLICY CMP0054)
-	CMAKE_POLICY(SET CMP0054 NEW)
-ENDIF()
+
+project(libgit2 C)
 
 # Add find modules to the path
-SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${libgit2_SOURCE_DIR}/cmake/Modules/")
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${libgit2_SOURCE_DIR}/cmake/")
 
 INCLUDE(CheckLibraryExists)
 INCLUDE(CheckFunctionExists)
@@ -49,8 +40,6 @@ OPTION(THREADSAFE			"Build libgit2 as threadsafe"				 ON)
 OPTION(BUILD_CLAR			"Build Tests using the Clar suite"			 ON)
 OPTION(BUILD_EXAMPLES			"Build library usage example apps"			OFF)
 OPTION(BUILD_FUZZERS			"Build the fuzz targets"				OFF)
-OPTION(TAGS				"Generate tags"						OFF)
-OPTION(PROFILE				"Generate profiling information"			OFF)
 OPTION(ENABLE_TRACE			"Enables tracing support"				ON)
 OPTION(LIBGIT2_FILENAME			"Name of the produced binary"				OFF)
 OPTION(USE_SSH				"Link with libssh2 to enable SSH support"		 ON)
@@ -242,35 +231,27 @@ ELSE ()
 		ADD_DEFINITIONS(-D__USE_MINGW_ANSI_STDIO=1)
 	ENDIF ()
 
-	ENABLE_WARNINGS(documentation)
-	DISABLE_WARNINGS(missing-field-initializers)
-	ENABLE_WARNINGS(strict-aliasing)
-	ENABLE_WARNINGS(strict-prototypes)
-	ENABLE_WARNINGS(declaration-after-statement)
-	ENABLE_WARNINGS(shift-count-overflow)
-	ENABLE_WARNINGS(unused-const-variable)
-	ENABLE_WARNINGS(unused-function)
-	ENABLE_WARNINGS(int-conversion)
+	enable_warnings(documentation)
+	disable_warnings(documentation-deprecated-sync)
+	disable_warnings(missing-field-initializers)
+	enable_warnings(strict-aliasing)
+	enable_warnings(strict-prototypes)
+	enable_warnings(declaration-after-statement)
+	enable_warnings(shift-count-overflow)
+	enable_warnings(unused-const-variable)
+	enable_warnings(unused-function)
+	enable_warnings(int-conversion)
 
 	# MinGW uses gcc, which expects POSIX formatting for printf, but
 	# uses the Windows C library, which uses its own format specifiers.
 	# Disable format specifier warnings.
-	IF(MINGW)
-		DISABLE_WARNINGS(format)
-		DISABLE_WARNINGS(format-security)
-	ELSE()
-		ENABLE_WARNINGS(format)
-		ENABLE_WARNINGS(format-security)
-	ENDIF()
-
-	IF("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
-		DISABLE_WARNINGS(documentation-deprecated-sync)
-	ENDIF()
-
-	IF (PROFILE)
-		SET(CMAKE_C_FLAGS "-pg ${CMAKE_C_FLAGS}")
-		SET(CMAKE_EXE_LINKER_FLAGS "-pg ${CMAKE_EXE_LINKER_FLAGS}")
-	ENDIF ()
+	if(MINGW)
+		disable_warnings(format)
+		disable_warnings(format-security)
+	else()
+		enable_warnings(format)
+		enable_warnings(format-security)
+	endif()
 ENDIF()
 
 # Ensure that MinGW provides the correct header files.
@@ -310,25 +291,6 @@ IF (BUILD_CLAR)
 	ADD_SUBDIRECTORY(tests)
 ENDIF ()
 
-IF (TAGS)
-	FIND_PROGRAM(CTAGS ctags)
-	IF (NOT CTAGS)
-		MESSAGE(FATAL_ERROR "Could not find ctags command")
-	ENDIF ()
-
-	FILE(GLOB_RECURSE SRC_ALL *.[ch])
-
-	ADD_CUSTOM_COMMAND(
-		OUTPUT tags
-		COMMAND ${CTAGS} -a ${SRC_ALL}
-		DEPENDS ${SRC_ALL}
-	)
-	ADD_CUSTOM_TARGET(
-		do_tags ALL
-		DEPENDS tags
-	)
-ENDIF ()
-
 IF (BUILD_EXAMPLES)
 	ADD_SUBDIRECTORY(examples)
 ENDIF ()
diff --git a/cmake/Modules/AddCFlagIfSupported.cmake b/cmake/AddCFlagIfSupported.cmake
index b7aaa7910..b7aaa7910 100644
--- a/cmake/Modules/AddCFlagIfSupported.cmake
+++ b/cmake/AddCFlagIfSupported.cmake
diff --git a/cmake/Modules/CheckPrototypeDefinition.c.in b/cmake/CheckPrototypeDefinition.c.in
index a97344ac3..a97344ac3 100644
--- a/cmake/Modules/CheckPrototypeDefinition.c.in
+++ b/cmake/CheckPrototypeDefinition.c.in
diff --git a/cmake/Modules/CheckPrototypeDefinition.cmake b/cmake/CheckPrototypeDefinition.cmake
index 244b9b53b..244b9b53b 100644
--- a/cmake/Modules/CheckPrototypeDefinition.cmake
+++ b/cmake/CheckPrototypeDefinition.cmake
diff --git a/cmake/Modules/EnableWarnings.cmake b/cmake/EnableWarnings.cmake
index b61ed7e90..b61ed7e90 100644
--- a/cmake/Modules/EnableWarnings.cmake
+++ b/cmake/EnableWarnings.cmake
diff --git a/cmake/Modules/FindCoreFoundation.cmake b/cmake/FindCoreFoundation.cmake
index 191aa595c..191aa595c 100644
--- a/cmake/Modules/FindCoreFoundation.cmake
+++ b/cmake/FindCoreFoundation.cmake
diff --git a/cmake/Modules/FindGSSAPI.cmake b/cmake/FindGSSAPI.cmake
index 37357c4cd..37357c4cd 100644
--- a/cmake/Modules/FindGSSAPI.cmake
+++ b/cmake/FindGSSAPI.cmake
diff --git a/cmake/Modules/FindGSSFramework.cmake b/cmake/FindGSSFramework.cmake
index dcf724916..dcf724916 100644
--- a/cmake/Modules/FindGSSFramework.cmake
+++ b/cmake/FindGSSFramework.cmake
diff --git a/cmake/Modules/FindHTTP_Parser.cmake b/cmake/FindHTTP_Parser.cmake
index d92bf75cc..d92bf75cc 100644
--- a/cmake/Modules/FindHTTP_Parser.cmake
+++ b/cmake/FindHTTP_Parser.cmake
diff --git a/cmake/Modules/FindIconv.cmake b/cmake/FindIconv.cmake
index 3c66cdad4..3c66cdad4 100644
--- a/cmake/Modules/FindIconv.cmake
+++ b/cmake/FindIconv.cmake
diff --git a/cmake/Modules/FindPCRE.cmake b/cmake/FindPCRE.cmake
index 74ed61e53..74ed61e53 100644
--- a/cmake/Modules/FindPCRE.cmake
+++ b/cmake/FindPCRE.cmake
diff --git a/cmake/Modules/FindPCRE2.cmake b/cmake/FindPCRE2.cmake
index f8c5639d5..f8c5639d5 100644
--- a/cmake/Modules/FindPCRE2.cmake
+++ b/cmake/FindPCRE2.cmake
diff --git a/cmake/Modules/FindPkgLibraries.cmake b/cmake/FindPkgLibraries.cmake
index 49311c382..49311c382 100644
--- a/cmake/Modules/FindPkgLibraries.cmake
+++ b/cmake/FindPkgLibraries.cmake
diff --git a/cmake/Modules/FindSecurity.cmake b/cmake/FindSecurity.cmake
index a538c02c1..a538c02c1 100644
--- a/cmake/Modules/FindSecurity.cmake
+++ b/cmake/FindSecurity.cmake
diff --git a/cmake/Modules/FindStatNsec.cmake b/cmake/FindStatNsec.cmake
index a4a09fa81..a4a09fa81 100644
--- a/cmake/Modules/FindStatNsec.cmake
+++ b/cmake/FindStatNsec.cmake
diff --git a/cmake/Modules/FindmbedTLS.cmake b/cmake/FindmbedTLS.cmake
index 93297555e..93297555e 100644
--- a/cmake/Modules/FindmbedTLS.cmake
+++ b/cmake/FindmbedTLS.cmake
diff --git a/cmake/Modules/IdeSplitSources.cmake b/cmake/IdeSplitSources.cmake
index e2e09b4ce..e2e09b4ce 100644
--- a/cmake/Modules/IdeSplitSources.cmake
+++ b/cmake/IdeSplitSources.cmake
diff --git a/cmake/Modules/PkgBuildConfig.cmake b/cmake/PkgBuildConfig.cmake
index 54c5e294c..54c5e294c 100644
--- a/cmake/Modules/PkgBuildConfig.cmake
+++ b/cmake/PkgBuildConfig.cmake
diff --git a/cmake/Modules/SanitizeBool.cmake b/cmake/SanitizeBool.cmake
index b5b99a690..b5b99a690 100644
--- a/cmake/Modules/SanitizeBool.cmake
+++ b/cmake/SanitizeBool.cmake
diff --git a/cmake/Modules/SelectGSSAPI.cmake b/cmake/SelectGSSAPI.cmake
index 0a42eeefd..0a42eeefd 100644
--- a/cmake/Modules/SelectGSSAPI.cmake
+++ b/cmake/SelectGSSAPI.cmake
diff --git a/cmake/Modules/SelectHTTPSBackend.cmake b/cmake/SelectHTTPSBackend.cmake
index afbeac424..afbeac424 100644
--- a/cmake/Modules/SelectHTTPSBackend.cmake
+++ b/cmake/SelectHTTPSBackend.cmake
diff --git a/cmake/Modules/SelectHashes.cmake b/cmake/SelectHashes.cmake
index 06672ab03..06672ab03 100644
--- a/cmake/Modules/SelectHashes.cmake
+++ b/cmake/SelectHashes.cmake