bitmaps and template are resources.

CMakeLists.txt

@@ -1072,7 +1072,6 @@ endif()
 # Binaries ( CMake targets )
 add_subdirectory( resources )
 add_subdirectory( thirdparty )
-add_subdirectory( bitmaps_png )
 add_subdirectory( libs )
 add_subdirectory( scripting )
 add_subdirectory( common )
@@ -1102,5 +1101,3 @@ endif ( KICAD_INSTALL_DEMOS )
 if( KICAD_BUILD_I18N )
     add_subdirectory( translation )
 endif()
-
-add_subdirectory( template )

README.md

@@ -34,7 +34,6 @@ 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
-* [bitmaps_png](bitmaps_png)       - Menu and program icons
 * [CMakeModules](CMakeModules)      - Modules for the CMAKE build tool
 * [common](common)            - Sourcecode of the common library
 * [cvpcb](cvpcb)             - Sourcecode of the CvPCB tool
@@ -50,9 +49,10 @@ GitLab CI pipeline status can be viewed for Linux and Windows builds of the late
 * [pcbnew](pcbnew)           - Sourcecode of the printed circuit board editor
 * [plugins](plugins)           - Sourcecode for the 3D viewer plugins
 * [qa](qa)                - Unit testing framework for KiCad
-* [resources](resources)         - Packaging resources for various operating systems
+* [resources](resources)         - Packaging resources such as bitmaps and operating system specific files
+** [bitmaps_png](bitmaps_png)       - Menu and program icons
+** [project_template](project_template)          - Project template
 * [scripting](scripting)         - Python integration for KiCad
-* [template](template)          - Project template
 * [thirdparty](thirdparty)           - Sourcecode of external libraries used in KiCad but not written by the KiCad team
 * [tools](tools)             - Helpers for developing, testing and building
 * [translation](translation) - Translation data files (managed through [Weblate](https://hosted.weblate.org/projects/kicad/master-source/) for most languages)

common/CMakeLists.txt

@@ -13,7 +13,7 @@ include_directories(
     ./dialogs
     ./widgets
     ./dialog_about
-    ${CMAKE_SOURCE_DIR}/bitmaps_png
+    ${CMAKE_SOURCE_DIR}/resources/bitmaps_png
     ${CMAKE_SOURCE_DIR}/3d-viewer
     ${CMAKE_SOURCE_DIR}/pcbnew
     ${INC_AFTER}

resources/CMakeLists.txt

@@ -103,3 +103,6 @@ elseif( UNIX )
              PATTERN "*.in" EXCLUDE
              )
 endif()
+
+add_subdirectory(bitmaps_png)
+add_subdirectory(project_template)

resources/bitmaps_png/CMakeLists.txt

@@ -46,13 +46,13 @@
 # lower case is used for local variables, uppercase for global variables
 
 option( MAINTAIN_PNGS
-        "Set to true if you are a PNG maintainer and have the required tools given in the bitmaps_png/CMakeLists.txt file (default OFF)."
+        "Set to true if you are a PNG maintainer and have the required tools given in the resources/bitmaps_png/CMakeLists.txt file (default OFF)."
         OFF)
 
 # Used Only to maintain PNG files (and therefore to recreate .cpp files)
 # The png2cpp creates files with native End of Line format.
 
-# List of themes - each corresponds to a folder of SVGS in ./bitmaps_png/sources/
+# List of themes - each corresponds to a folder of SVGS in ./resources/bitmaps_png/sources/
 set( THEMES
     light
     dark )