From a9942a62ee7bbd3d26d57e49be19ad732bc0a893 Mon Sep 17 00:00:00 2001 From: Marek Roszko Date: Thu, 21 Jul 2022 20:32:25 -0400 Subject: [PATCH] CMakeModules -> cmake --- CMakeLists.txt | 6 +++--- README.md | 3 +-- .../BuildSteps/CreateDocsetDoxyfile.cmake | 0 {CMakeModules => cmake}/BuildSteps/CreateShaderCpp.cmake | 0 {CMakeModules => cmake}/BuildSteps/Html2C.cmake | 0 .../BuildSteps/LemonParserGenerator.cmake | 0 {CMakeModules => cmake}/BuildSteps/PNG2cpp.cmake | 0 {CMakeModules => cmake}/BuildSteps/TokenList2DsnLexer.cmake | 0 .../BuildSteps/TranslatePlatformMetadata_linux.cmake | 0 {CMakeModules => cmake}/BuildSteps/Txt2C.cmake | 0 .../BuildSteps/WritePlatformMetadata_linux.cmake | 0 {CMakeModules => cmake}/BuildSteps/WriteVersionHeader.cmake | 0 {CMakeModules => cmake}/BuildSteps/markdown2C.cmake | 0 {CMakeModules => cmake}/BundleUtilities.cmake | 0 {CMakeModules => cmake}/CMakeFindFrameworks.cmake | 0 {CMakeModules => cmake}/CheckFindPackageResult.cmake | 0 {CMakeModules => cmake}/CreateGitVersionHeader.cmake | 0 {CMakeModules => cmake}/FindCairo.cmake | 0 {CMakeModules => cmake}/FindFontconfig.cmake | 0 {CMakeModules => cmake}/FindGLEW.cmake | 0 {CMakeModules => cmake}/FindGLM.cmake | 0 {CMakeModules => cmake}/FindGdiPlus.cmake | 0 {CMakeModules => cmake}/FindHarfBuzz.cmake | 0 {CMakeModules => cmake}/FindOCC.cmake | 0 {CMakeModules => cmake}/FindPackageMessage.cmake | 0 {CMakeModules => cmake}/FindPixman.cmake | 0 {CMakeModules => cmake}/FindPythonInterp.cmake | 0 {CMakeModules => cmake}/FindPythonLibs.cmake | 0 {CMakeModules => cmake}/FindSWIG.cmake | 0 {CMakeModules => cmake}/FindZLIB.cmake.unused | 0 {CMakeModules => cmake}/Findngspice.cmake | 0 {CMakeModules => cmake}/FindwxPython.cmake | 0 {CMakeModules => cmake}/FindwxWidgets.cmake | 0 {CMakeModules => cmake}/Functions.cmake | 0 {CMakeModules => cmake}/GetPrerequisites.cmake | 0 {CMakeModules => cmake}/KiCadFullVersion.cmake | 0 {CMakeModules => cmake}/KiCadQABuildUtils.cmake | 0 {CMakeModules => cmake}/KiCadVersion.cmake | 0 {CMakeModules => cmake}/MinGWResourceCompiler.cmake | 0 {CMakeModules => cmake}/PerformFeatureChecks.cmake | 0 {CMakeModules => cmake}/RefixupMacOS.cmake | 0 {CMakeModules => cmake}/SelectLibraryConfigurations.cmake | 0 {CMakeModules => cmake}/UsewxWidgets.cmake | 0 {CMakeModules => cmake}/Warnings.cmake | 0 {CMakeModules => cmake}/WritePlatformMetadata_macos.cmake | 0 {CMakeModules => cmake}/cmake_uninstall.cmake.in | 0 {CMakeModules => cmake}/config.h.cmake | 0 resources/CMakeLists.txt | 2 +- 48 files changed, 5 insertions(+), 6 deletions(-) rename {CMakeModules => cmake}/BuildSteps/CreateDocsetDoxyfile.cmake (100%) rename {CMakeModules => cmake}/BuildSteps/CreateShaderCpp.cmake (100%) rename {CMakeModules => cmake}/BuildSteps/Html2C.cmake (100%) rename {CMakeModules => cmake}/BuildSteps/LemonParserGenerator.cmake (100%) rename {CMakeModules => cmake}/BuildSteps/PNG2cpp.cmake (100%) rename {CMakeModules => cmake}/BuildSteps/TokenList2DsnLexer.cmake (100%) rename {CMakeModules => cmake}/BuildSteps/TranslatePlatformMetadata_linux.cmake (100%) rename {CMakeModules => cmake}/BuildSteps/Txt2C.cmake (100%) rename {CMakeModules => cmake}/BuildSteps/WritePlatformMetadata_linux.cmake (100%) rename {CMakeModules => cmake}/BuildSteps/WriteVersionHeader.cmake (100%) rename {CMakeModules => cmake}/BuildSteps/markdown2C.cmake (100%) rename {CMakeModules => cmake}/BundleUtilities.cmake (100%) rename {CMakeModules => cmake}/CMakeFindFrameworks.cmake (100%) rename {CMakeModules => cmake}/CheckFindPackageResult.cmake (100%) rename {CMakeModules => cmake}/CreateGitVersionHeader.cmake (100%) rename {CMakeModules => cmake}/FindCairo.cmake (100%) rename {CMakeModules => cmake}/FindFontconfig.cmake (100%) rename {CMakeModules => cmake}/FindGLEW.cmake (100%) rename {CMakeModules => cmake}/FindGLM.cmake (100%) rename {CMakeModules => cmake}/FindGdiPlus.cmake (100%) rename {CMakeModules => cmake}/FindHarfBuzz.cmake (100%) rename {CMakeModules => cmake}/FindOCC.cmake (100%) rename {CMakeModules => cmake}/FindPackageMessage.cmake (100%) rename {CMakeModules => cmake}/FindPixman.cmake (100%) rename {CMakeModules => cmake}/FindPythonInterp.cmake (100%) rename {CMakeModules => cmake}/FindPythonLibs.cmake (100%) rename {CMakeModules => cmake}/FindSWIG.cmake (100%) rename {CMakeModules => cmake}/FindZLIB.cmake.unused (100%) rename {CMakeModules => cmake}/Findngspice.cmake (100%) rename {CMakeModules => cmake}/FindwxPython.cmake (100%) rename {CMakeModules => cmake}/FindwxWidgets.cmake (100%) rename {CMakeModules => cmake}/Functions.cmake (100%) rename {CMakeModules => cmake}/GetPrerequisites.cmake (100%) rename {CMakeModules => cmake}/KiCadFullVersion.cmake (100%) rename {CMakeModules => cmake}/KiCadQABuildUtils.cmake (100%) rename {CMakeModules => cmake}/KiCadVersion.cmake (100%) rename {CMakeModules => cmake}/MinGWResourceCompiler.cmake (100%) rename {CMakeModules => cmake}/PerformFeatureChecks.cmake (100%) rename {CMakeModules => cmake}/RefixupMacOS.cmake (100%) rename {CMakeModules => cmake}/SelectLibraryConfigurations.cmake (100%) rename {CMakeModules => cmake}/UsewxWidgets.cmake (100%) rename {CMakeModules => cmake}/Warnings.cmake (100%) rename {CMakeModules => cmake}/WritePlatformMetadata_macos.cmake (100%) rename {CMakeModules => cmake}/cmake_uninstall.cmake.in (100%) rename {CMakeModules => cmake}/config.h.cmake (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8816a290b4..f1df7e921a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,7 +40,7 @@ include( CMakeDependentOption ) set( CMAKE_EXPORT_COMPILE_COMMANDS ON ) # Path to local CMake modules. -set( CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules ) +set( CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake ) # On Windows, binaries created by link option -g3 are very large (more than 1Gb for pcbnew, # and more than 3Gb for the full kicad suite) @@ -952,7 +952,7 @@ endif() # Require the same wxWidgets version as is used by wxPython set( wxWidgets_REQ_VERSION ${WXPYTHON_WXVERSION} ) -# See line 49 of CMakeModules/FindwxWidgets.cmake +# See line 49 of cmake/FindwxWidgets.cmake set( wxWidgets_CONFIG_OPTIONS ${wxWidgets_CONFIG_OPTIONS} --static=no ) find_package( wxWidgets ${wxWidgets_REQ_VERSION} COMPONENTS gl aui adv html core net base propgrid xml stc richtext REQUIRED ) @@ -1002,7 +1002,7 @@ find_package( Doxygen ) add_subdirectory( doxygen ) # Generate config.h. -configure_file( ${PROJECT_SOURCE_DIR}/CMakeModules/config.h.cmake +configure_file( ${PROJECT_SOURCE_DIR}/cmake/config.h.cmake ${CMAKE_BINARY_DIR}/config.h ) ### diff --git a/README.md b/README.md index bbb9fec918..411ece806a 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,6 @@ GitLab CI pipeline status can be viewed for Linux and Windows builds of the late * [AUTHORS.txt](AUTHORS.txt) - The authors, contributors, document writers and translators list * [CMakeLists.txt](CMakeLists.txt) - Main CMAKE build tool script * [copyright.h](copyright.h) - A very short copy of the GNU General Public License to be included in new source files -* [CTestConfig.cmake](CTestConfig.cmake) - Support for CTest and CDash testing tools * [Doxyfile](Doxyfile) - Doxygen config file for KiCad * [INSTALL.txt](INSTALL.txt) - The release (binary) installation instructions * [uncrustify.cfg](uncrustify.cfg) - Uncrustify config file for uncrustify sources formatting tool @@ -34,7 +33,7 @@ GitLab CI pipeline status can be viewed for Linux and Windows builds of the late * [3d-viewer](3d-viewer) - Sourcecode of the 3D viewer * [bitmap2component](bitmap2component) - Sourcecode of the bitmap to PCB artwork converter -* [CMakeModules](CMakeModules) - Modules for the CMAKE build tool +* [cmake](cmake) - Modules for the CMAKE build tool * [common](common) - Sourcecode of the common library * [cvpcb](cvpcb) - Sourcecode of the CvPCB tool * [demos](demos) - Some demo examples diff --git a/CMakeModules/BuildSteps/CreateDocsetDoxyfile.cmake b/cmake/BuildSteps/CreateDocsetDoxyfile.cmake similarity index 100% rename from CMakeModules/BuildSteps/CreateDocsetDoxyfile.cmake rename to cmake/BuildSteps/CreateDocsetDoxyfile.cmake diff --git a/CMakeModules/BuildSteps/CreateShaderCpp.cmake b/cmake/BuildSteps/CreateShaderCpp.cmake similarity index 100% rename from CMakeModules/BuildSteps/CreateShaderCpp.cmake rename to cmake/BuildSteps/CreateShaderCpp.cmake diff --git a/CMakeModules/BuildSteps/Html2C.cmake b/cmake/BuildSteps/Html2C.cmake similarity index 100% rename from CMakeModules/BuildSteps/Html2C.cmake rename to cmake/BuildSteps/Html2C.cmake diff --git a/CMakeModules/BuildSteps/LemonParserGenerator.cmake b/cmake/BuildSteps/LemonParserGenerator.cmake similarity index 100% rename from CMakeModules/BuildSteps/LemonParserGenerator.cmake rename to cmake/BuildSteps/LemonParserGenerator.cmake diff --git a/CMakeModules/BuildSteps/PNG2cpp.cmake b/cmake/BuildSteps/PNG2cpp.cmake similarity index 100% rename from CMakeModules/BuildSteps/PNG2cpp.cmake rename to cmake/BuildSteps/PNG2cpp.cmake diff --git a/CMakeModules/BuildSteps/TokenList2DsnLexer.cmake b/cmake/BuildSteps/TokenList2DsnLexer.cmake similarity index 100% rename from CMakeModules/BuildSteps/TokenList2DsnLexer.cmake rename to cmake/BuildSteps/TokenList2DsnLexer.cmake diff --git a/CMakeModules/BuildSteps/TranslatePlatformMetadata_linux.cmake b/cmake/BuildSteps/TranslatePlatformMetadata_linux.cmake similarity index 100% rename from CMakeModules/BuildSteps/TranslatePlatformMetadata_linux.cmake rename to cmake/BuildSteps/TranslatePlatformMetadata_linux.cmake diff --git a/CMakeModules/BuildSteps/Txt2C.cmake b/cmake/BuildSteps/Txt2C.cmake similarity index 100% rename from CMakeModules/BuildSteps/Txt2C.cmake rename to cmake/BuildSteps/Txt2C.cmake diff --git a/CMakeModules/BuildSteps/WritePlatformMetadata_linux.cmake b/cmake/BuildSteps/WritePlatformMetadata_linux.cmake similarity index 100% rename from CMakeModules/BuildSteps/WritePlatformMetadata_linux.cmake rename to cmake/BuildSteps/WritePlatformMetadata_linux.cmake diff --git a/CMakeModules/BuildSteps/WriteVersionHeader.cmake b/cmake/BuildSteps/WriteVersionHeader.cmake similarity index 100% rename from CMakeModules/BuildSteps/WriteVersionHeader.cmake rename to cmake/BuildSteps/WriteVersionHeader.cmake diff --git a/CMakeModules/BuildSteps/markdown2C.cmake b/cmake/BuildSteps/markdown2C.cmake similarity index 100% rename from CMakeModules/BuildSteps/markdown2C.cmake rename to cmake/BuildSteps/markdown2C.cmake diff --git a/CMakeModules/BundleUtilities.cmake b/cmake/BundleUtilities.cmake similarity index 100% rename from CMakeModules/BundleUtilities.cmake rename to cmake/BundleUtilities.cmake diff --git a/CMakeModules/CMakeFindFrameworks.cmake b/cmake/CMakeFindFrameworks.cmake similarity index 100% rename from CMakeModules/CMakeFindFrameworks.cmake rename to cmake/CMakeFindFrameworks.cmake diff --git a/CMakeModules/CheckFindPackageResult.cmake b/cmake/CheckFindPackageResult.cmake similarity index 100% rename from CMakeModules/CheckFindPackageResult.cmake rename to cmake/CheckFindPackageResult.cmake diff --git a/CMakeModules/CreateGitVersionHeader.cmake b/cmake/CreateGitVersionHeader.cmake similarity index 100% rename from CMakeModules/CreateGitVersionHeader.cmake rename to cmake/CreateGitVersionHeader.cmake diff --git a/CMakeModules/FindCairo.cmake b/cmake/FindCairo.cmake similarity index 100% rename from CMakeModules/FindCairo.cmake rename to cmake/FindCairo.cmake diff --git a/CMakeModules/FindFontconfig.cmake b/cmake/FindFontconfig.cmake similarity index 100% rename from CMakeModules/FindFontconfig.cmake rename to cmake/FindFontconfig.cmake diff --git a/CMakeModules/FindGLEW.cmake b/cmake/FindGLEW.cmake similarity index 100% rename from CMakeModules/FindGLEW.cmake rename to cmake/FindGLEW.cmake diff --git a/CMakeModules/FindGLM.cmake b/cmake/FindGLM.cmake similarity index 100% rename from CMakeModules/FindGLM.cmake rename to cmake/FindGLM.cmake diff --git a/CMakeModules/FindGdiPlus.cmake b/cmake/FindGdiPlus.cmake similarity index 100% rename from CMakeModules/FindGdiPlus.cmake rename to cmake/FindGdiPlus.cmake diff --git a/CMakeModules/FindHarfBuzz.cmake b/cmake/FindHarfBuzz.cmake similarity index 100% rename from CMakeModules/FindHarfBuzz.cmake rename to cmake/FindHarfBuzz.cmake diff --git a/CMakeModules/FindOCC.cmake b/cmake/FindOCC.cmake similarity index 100% rename from CMakeModules/FindOCC.cmake rename to cmake/FindOCC.cmake diff --git a/CMakeModules/FindPackageMessage.cmake b/cmake/FindPackageMessage.cmake similarity index 100% rename from CMakeModules/FindPackageMessage.cmake rename to cmake/FindPackageMessage.cmake diff --git a/CMakeModules/FindPixman.cmake b/cmake/FindPixman.cmake similarity index 100% rename from CMakeModules/FindPixman.cmake rename to cmake/FindPixman.cmake diff --git a/CMakeModules/FindPythonInterp.cmake b/cmake/FindPythonInterp.cmake similarity index 100% rename from CMakeModules/FindPythonInterp.cmake rename to cmake/FindPythonInterp.cmake diff --git a/CMakeModules/FindPythonLibs.cmake b/cmake/FindPythonLibs.cmake similarity index 100% rename from CMakeModules/FindPythonLibs.cmake rename to cmake/FindPythonLibs.cmake diff --git a/CMakeModules/FindSWIG.cmake b/cmake/FindSWIG.cmake similarity index 100% rename from CMakeModules/FindSWIG.cmake rename to cmake/FindSWIG.cmake diff --git a/CMakeModules/FindZLIB.cmake.unused b/cmake/FindZLIB.cmake.unused similarity index 100% rename from CMakeModules/FindZLIB.cmake.unused rename to cmake/FindZLIB.cmake.unused diff --git a/CMakeModules/Findngspice.cmake b/cmake/Findngspice.cmake similarity index 100% rename from CMakeModules/Findngspice.cmake rename to cmake/Findngspice.cmake diff --git a/CMakeModules/FindwxPython.cmake b/cmake/FindwxPython.cmake similarity index 100% rename from CMakeModules/FindwxPython.cmake rename to cmake/FindwxPython.cmake diff --git a/CMakeModules/FindwxWidgets.cmake b/cmake/FindwxWidgets.cmake similarity index 100% rename from CMakeModules/FindwxWidgets.cmake rename to cmake/FindwxWidgets.cmake diff --git a/CMakeModules/Functions.cmake b/cmake/Functions.cmake similarity index 100% rename from CMakeModules/Functions.cmake rename to cmake/Functions.cmake diff --git a/CMakeModules/GetPrerequisites.cmake b/cmake/GetPrerequisites.cmake similarity index 100% rename from CMakeModules/GetPrerequisites.cmake rename to cmake/GetPrerequisites.cmake diff --git a/CMakeModules/KiCadFullVersion.cmake b/cmake/KiCadFullVersion.cmake similarity index 100% rename from CMakeModules/KiCadFullVersion.cmake rename to cmake/KiCadFullVersion.cmake diff --git a/CMakeModules/KiCadQABuildUtils.cmake b/cmake/KiCadQABuildUtils.cmake similarity index 100% rename from CMakeModules/KiCadQABuildUtils.cmake rename to cmake/KiCadQABuildUtils.cmake diff --git a/CMakeModules/KiCadVersion.cmake b/cmake/KiCadVersion.cmake similarity index 100% rename from CMakeModules/KiCadVersion.cmake rename to cmake/KiCadVersion.cmake diff --git a/CMakeModules/MinGWResourceCompiler.cmake b/cmake/MinGWResourceCompiler.cmake similarity index 100% rename from CMakeModules/MinGWResourceCompiler.cmake rename to cmake/MinGWResourceCompiler.cmake diff --git a/CMakeModules/PerformFeatureChecks.cmake b/cmake/PerformFeatureChecks.cmake similarity index 100% rename from CMakeModules/PerformFeatureChecks.cmake rename to cmake/PerformFeatureChecks.cmake diff --git a/CMakeModules/RefixupMacOS.cmake b/cmake/RefixupMacOS.cmake similarity index 100% rename from CMakeModules/RefixupMacOS.cmake rename to cmake/RefixupMacOS.cmake diff --git a/CMakeModules/SelectLibraryConfigurations.cmake b/cmake/SelectLibraryConfigurations.cmake similarity index 100% rename from CMakeModules/SelectLibraryConfigurations.cmake rename to cmake/SelectLibraryConfigurations.cmake diff --git a/CMakeModules/UsewxWidgets.cmake b/cmake/UsewxWidgets.cmake similarity index 100% rename from CMakeModules/UsewxWidgets.cmake rename to cmake/UsewxWidgets.cmake diff --git a/CMakeModules/Warnings.cmake b/cmake/Warnings.cmake similarity index 100% rename from CMakeModules/Warnings.cmake rename to cmake/Warnings.cmake diff --git a/CMakeModules/WritePlatformMetadata_macos.cmake b/cmake/WritePlatformMetadata_macos.cmake similarity index 100% rename from CMakeModules/WritePlatformMetadata_macos.cmake rename to cmake/WritePlatformMetadata_macos.cmake diff --git a/CMakeModules/cmake_uninstall.cmake.in b/cmake/cmake_uninstall.cmake.in similarity index 100% rename from CMakeModules/cmake_uninstall.cmake.in rename to cmake/cmake_uninstall.cmake.in diff --git a/CMakeModules/config.h.cmake b/cmake/config.h.cmake similarity index 100% rename from CMakeModules/config.h.cmake rename to cmake/config.h.cmake diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt index 999eb82201..8530ee2cf3 100644 --- a/resources/CMakeLists.txt +++ b/resources/CMakeLists.txt @@ -11,7 +11,7 @@ elseif( UNIX ) COMMAND ${CMAKE_COMMAND} -DSRC_PATH=${PROJECT_SOURCE_DIR} -DBUILD_PATH=${PROJECT_BINARY_DIR} - -DCMAKE_MODULE_PATH=${PROJECT_SOURCE_DIR}/CMakeModules + -DCMAKE_MODULE_PATH=${PROJECT_SOURCE_DIR}/cmake -P ${CMAKE_MODULE_PATH}/BuildSteps/WritePlatformMetadata_linux.cmake DEPENDS ${CMAKE_MODULE_PATH}/BuildSteps/WritePlatformMetadata_linux.cmake COMMENT "Configuring Linux metainfo"