CMakeModules -> cmake

This commit is contained in:
Marek Roszko 2022-07-21 20:32:25 -04:00
parent 47fe8ff8eb
commit a9942a62ee
48 changed files with 5 additions and 6 deletions

View File

@ -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 )
###

View File

@ -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

View File

@ -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"