From bc02bcd920eac0ca5a930a8272737db10fc4be1f Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Fri, 3 Apr 2020 19:51:22 +0200 Subject: [PATCH] cmake: move modules into the "cmake/" top level dir Our custom CMake module currently live in "cmake/Modules". As the "cmake/" directory doesn't contain anything except the "Modules" directory, it doesn't really make sense to have the additional intermediate directory. So let's instead move the modules one level up into the "cmake/" top level directory. --- CMakeLists.txt | 2 +- cmake/{Modules => }/AddCFlagIfSupported.cmake | 0 cmake/{Modules => }/CheckPrototypeDefinition.c.in | 0 cmake/{Modules => }/CheckPrototypeDefinition.cmake | 0 cmake/{Modules => }/EnableWarnings.cmake | 0 cmake/{Modules => }/FindCoreFoundation.cmake | 0 cmake/{Modules => }/FindGSSAPI.cmake | 0 cmake/{Modules => }/FindGSSFramework.cmake | 0 cmake/{Modules => }/FindHTTP_Parser.cmake | 0 cmake/{Modules => }/FindIconv.cmake | 0 cmake/{Modules => }/FindPCRE.cmake | 0 cmake/{Modules => }/FindPCRE2.cmake | 0 cmake/{Modules => }/FindPkgLibraries.cmake | 0 cmake/{Modules => }/FindSecurity.cmake | 0 cmake/{Modules => }/FindStatNsec.cmake | 0 cmake/{Modules => }/FindmbedTLS.cmake | 0 cmake/{Modules => }/IdeSplitSources.cmake | 0 cmake/{Modules => }/PkgBuildConfig.cmake | 0 cmake/{Modules => }/SanitizeBool.cmake | 0 cmake/{Modules => }/SelectGSSAPI.cmake | 0 cmake/{Modules => }/SelectHTTPSBackend.cmake | 0 cmake/{Modules => }/SelectHashes.cmake | 0 22 files changed, 1 insertion(+), 1 deletion(-) rename cmake/{Modules => }/AddCFlagIfSupported.cmake (100%) rename cmake/{Modules => }/CheckPrototypeDefinition.c.in (100%) rename cmake/{Modules => }/CheckPrototypeDefinition.cmake (100%) rename cmake/{Modules => }/EnableWarnings.cmake (100%) rename cmake/{Modules => }/FindCoreFoundation.cmake (100%) rename cmake/{Modules => }/FindGSSAPI.cmake (100%) rename cmake/{Modules => }/FindGSSFramework.cmake (100%) rename cmake/{Modules => }/FindHTTP_Parser.cmake (100%) rename cmake/{Modules => }/FindIconv.cmake (100%) rename cmake/{Modules => }/FindPCRE.cmake (100%) rename cmake/{Modules => }/FindPCRE2.cmake (100%) rename cmake/{Modules => }/FindPkgLibraries.cmake (100%) rename cmake/{Modules => }/FindSecurity.cmake (100%) rename cmake/{Modules => }/FindStatNsec.cmake (100%) rename cmake/{Modules => }/FindmbedTLS.cmake (100%) rename cmake/{Modules => }/IdeSplitSources.cmake (100%) rename cmake/{Modules => }/PkgBuildConfig.cmake (100%) rename cmake/{Modules => }/SanitizeBool.cmake (100%) rename cmake/{Modules => }/SelectGSSAPI.cmake (100%) rename cmake/{Modules => }/SelectHTTPSBackend.cmake (100%) rename cmake/{Modules => }/SelectHashes.cmake (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 381954790..82def8a42 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,7 @@ IF(POLICY CMP0054) ENDIF() # 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) diff --git a/cmake/Modules/AddCFlagIfSupported.cmake b/cmake/AddCFlagIfSupported.cmake similarity index 100% rename from cmake/Modules/AddCFlagIfSupported.cmake rename to cmake/AddCFlagIfSupported.cmake diff --git a/cmake/Modules/CheckPrototypeDefinition.c.in b/cmake/CheckPrototypeDefinition.c.in similarity index 100% rename from cmake/Modules/CheckPrototypeDefinition.c.in rename to cmake/CheckPrototypeDefinition.c.in diff --git a/cmake/Modules/CheckPrototypeDefinition.cmake b/cmake/CheckPrototypeDefinition.cmake similarity index 100% rename from cmake/Modules/CheckPrototypeDefinition.cmake rename to cmake/CheckPrototypeDefinition.cmake diff --git a/cmake/Modules/EnableWarnings.cmake b/cmake/EnableWarnings.cmake similarity index 100% rename from cmake/Modules/EnableWarnings.cmake rename to cmake/EnableWarnings.cmake diff --git a/cmake/Modules/FindCoreFoundation.cmake b/cmake/FindCoreFoundation.cmake similarity index 100% rename from cmake/Modules/FindCoreFoundation.cmake rename to cmake/FindCoreFoundation.cmake diff --git a/cmake/Modules/FindGSSAPI.cmake b/cmake/FindGSSAPI.cmake similarity index 100% rename from cmake/Modules/FindGSSAPI.cmake rename to cmake/FindGSSAPI.cmake diff --git a/cmake/Modules/FindGSSFramework.cmake b/cmake/FindGSSFramework.cmake similarity index 100% rename from cmake/Modules/FindGSSFramework.cmake rename to cmake/FindGSSFramework.cmake diff --git a/cmake/Modules/FindHTTP_Parser.cmake b/cmake/FindHTTP_Parser.cmake similarity index 100% rename from cmake/Modules/FindHTTP_Parser.cmake rename to cmake/FindHTTP_Parser.cmake diff --git a/cmake/Modules/FindIconv.cmake b/cmake/FindIconv.cmake similarity index 100% rename from cmake/Modules/FindIconv.cmake rename to cmake/FindIconv.cmake diff --git a/cmake/Modules/FindPCRE.cmake b/cmake/FindPCRE.cmake similarity index 100% rename from cmake/Modules/FindPCRE.cmake rename to cmake/FindPCRE.cmake diff --git a/cmake/Modules/FindPCRE2.cmake b/cmake/FindPCRE2.cmake similarity index 100% rename from cmake/Modules/FindPCRE2.cmake rename to cmake/FindPCRE2.cmake diff --git a/cmake/Modules/FindPkgLibraries.cmake b/cmake/FindPkgLibraries.cmake similarity index 100% rename from cmake/Modules/FindPkgLibraries.cmake rename to cmake/FindPkgLibraries.cmake diff --git a/cmake/Modules/FindSecurity.cmake b/cmake/FindSecurity.cmake similarity index 100% rename from cmake/Modules/FindSecurity.cmake rename to cmake/FindSecurity.cmake diff --git a/cmake/Modules/FindStatNsec.cmake b/cmake/FindStatNsec.cmake similarity index 100% rename from cmake/Modules/FindStatNsec.cmake rename to cmake/FindStatNsec.cmake diff --git a/cmake/Modules/FindmbedTLS.cmake b/cmake/FindmbedTLS.cmake similarity index 100% rename from cmake/Modules/FindmbedTLS.cmake rename to cmake/FindmbedTLS.cmake diff --git a/cmake/Modules/IdeSplitSources.cmake b/cmake/IdeSplitSources.cmake similarity index 100% rename from cmake/Modules/IdeSplitSources.cmake rename to cmake/IdeSplitSources.cmake diff --git a/cmake/Modules/PkgBuildConfig.cmake b/cmake/PkgBuildConfig.cmake similarity index 100% rename from cmake/Modules/PkgBuildConfig.cmake rename to cmake/PkgBuildConfig.cmake diff --git a/cmake/Modules/SanitizeBool.cmake b/cmake/SanitizeBool.cmake similarity index 100% rename from cmake/Modules/SanitizeBool.cmake rename to cmake/SanitizeBool.cmake diff --git a/cmake/Modules/SelectGSSAPI.cmake b/cmake/SelectGSSAPI.cmake similarity index 100% rename from cmake/Modules/SelectGSSAPI.cmake rename to cmake/SelectGSSAPI.cmake diff --git a/cmake/Modules/SelectHTTPSBackend.cmake b/cmake/SelectHTTPSBackend.cmake similarity index 100% rename from cmake/Modules/SelectHTTPSBackend.cmake rename to cmake/SelectHTTPSBackend.cmake diff --git a/cmake/Modules/SelectHashes.cmake b/cmake/SelectHashes.cmake similarity index 100% rename from cmake/Modules/SelectHashes.cmake rename to cmake/SelectHashes.cmake