cmake: fix FOLDER structure for IDE's that support it (#7069)

nilason · nilason · commit a73312ddc7d7 · 2026-02-12T09:51:31.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -288,6 +288,7 @@ add_custom_target(
   ALL_MODULES
   DEPENDS ${modules_list}
   COMMENT "Building all modules.")
+set_target_properties(ALL_MODULES PROPERTIES FOLDER Misc)
 
 if(WITH_GUI)
   add_subdirectory(gui)
@@ -309,6 +310,7 @@ add_custom_target(
   BYPRODUCTS ${OUTDIR}/${GRASS_INSTALL_DOCDIR}/colortables
   COMMENT "Creating thumbnails"
   DEPENDS ALL_MODULES)
+set_target_properties(r_colors_thumbnails PROPERTIES FOLDER Misc)
 install(DIRECTORY ${OUTDIR}/${GRASS_INSTALL_DOCDIR}/colortables
         DESTINATION ${GRASS_INSTALL_DOCDIR})
 
@@ -344,3 +346,5 @@ write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/GRASSConfigVersion.
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/GRASSConfig.cmake
               ${CMAKE_CURRENT_BINARY_DIR}/GRASSConfigVersion.cmake
         DESTINATION ${GRASS_INSTALL_CMAKECONFDIR}/GRASS)
+
+set_property(GLOBAL PROPERTY USE_FOLDERS YES)
diff --git a/cmake/modules/build_gui_in_subdir.cmake b/cmake/modules/build_gui_in_subdir.cmake
@@ -99,7 +99,7 @@ function(build_gui_in_subdir dir_name)
       "${G_TARGET_NAME};${modules_list}"
       CACHE INTERNAL "list of modules")
 
-  set_target_properties(${G_TARGET_NAME} PROPERTIES FOLDER gui)
+  set_target_properties(${G_TARGET_NAME} PROPERTIES FOLDER "Tools/GUI (Scripts)")
 
   if(WIN32)
     install(PROGRAMS ${OUTDIR}/${GRASS_INSTALL_SCRIPTDIR}/${G_TARGET_NAME}.bat
diff --git a/cmake/modules/build_module.cmake b/cmake/modules/build_module.cmake
@@ -105,12 +105,28 @@ function(build_module)
 
   if(G_EXE)
     add_executable(${G_NAME} ${${G_NAME}_SRCS})
-    if("${G_NAME}" MATCHES "^v.*")
-      set_target_properties(${G_NAME} PROPERTIES FOLDER vector)
-    elseif("${G_NAME}" MATCHES "^r.*")
-      set_target_properties(${G_NAME} PROPERTIES FOLDER raster)
+    if("${G_NAME}" MATCHES "^v[\.]")
+      set_target_properties(${G_NAME} PROPERTIES FOLDER Tools/Vector)
+    elseif("${G_NAME}" MATCHES "^r[\.]")
+      set_target_properties(${G_NAME} PROPERTIES FOLDER Tools/Raster)
+    elseif("${G_NAME}" MATCHES "^d[\.]")
+      set_target_properties(${G_NAME} PROPERTIES FOLDER Tools/Display)
+    elseif("${G_NAME}" MATCHES "^db[\.]")
+      set_target_properties(${G_NAME} PROPERTIES FOLDER Tools/Database)
+    elseif("${G_NAME}" MATCHES "^g[\.]")
+      set_target_properties(${G_NAME} PROPERTIES FOLDER Tools/General)
+    elseif("${G_NAME}" MATCHES "^i[\.]")
+      set_target_properties(${G_NAME} PROPERTIES FOLDER Tools/Imagery)
+    elseif("${G_NAME}" MATCHES "^m[\.]")
+      set_target_properties(${G_NAME} PROPERTIES FOLDER Tools/Miscellaneous)
+    elseif("${G_NAME}" MATCHES "^ps[\.]")
+      set_target_properties(${G_NAME} PROPERTIES FOLDER Tools/PostScript)
+    elseif("${G_NAME}" MATCHES "^r3[\.]")
+      set_target_properties(${G_NAME} PROPERTIES FOLDER "Tools/Raster 3D")
+    elseif("${G_NAME}" MATCHES "^t[\.]")
+       set_target_properties(${G_NAME} PROPERTIES FOLDER Tools/Temporal)
     else()
-      set_target_properties(${G_NAME} PROPERTIES FOLDER bin)
+      set_target_properties(${G_NAME} PROPERTIES FOLDER Binaries)
     endif()
     set(default_html_file_name ${G_NAME})
     set(PGM_NAME ${G_NAME})
@@ -127,7 +143,7 @@ function(build_module)
     add_library(${G_NAME} ${${G_NAME}_SRCS})
     set_target_properties(
       ${G_NAME}
-      PROPERTIES FOLDER lib
+      PROPERTIES FOLDER "GRASS Libraries"
                  VERSION ${GRASS_VERSION_NUMBER}
                  SOVERSION ${GRASS_VERSION_MAJOR}
                  EXPORT_NAME ${_libname})
diff --git a/cmake/modules/build_script_in_subdir.cmake b/cmake/modules/build_script_in_subdir.cmake
@@ -106,7 +106,29 @@ function(build_script_in_subdir dir_name)
       "${G_NAME};${modules_list}"
       CACHE INTERNAL "list of modules")
 
-  set_target_properties(${G_NAME} PROPERTIES FOLDER scripts)
+ if("${G_NAME}" MATCHES "^v[\.]")
+   set_target_properties(${G_NAME} PROPERTIES FOLDER "Tools/Vector (Scripts)")
+ elseif("${G_NAME}" MATCHES "^r[\.]")
+   set_target_properties(${G_NAME} PROPERTIES FOLDER "Tools/Raster (Scripts)")
+ elseif("${G_NAME}" MATCHES "^d[\.]")
+   set_target_properties(${G_NAME} PROPERTIES FOLDER "Tools/Display (Scripts)")
+ elseif("${G_NAME}" MATCHES "^db[\.]")
+   set_target_properties(${G_NAME} PROPERTIES FOLDER "Tools/Database (Scripts)")
+ elseif("${G_NAME}" MATCHES "^g[\.]")
+   set_target_properties(${G_NAME} PROPERTIES FOLDER "Tools/General (Scripts)")
+ elseif("${G_NAME}" MATCHES "^i[\.]")
+   set_target_properties(${G_NAME} PROPERTIES FOLDER "Tools/Imagery (Scripts)")
+ elseif("${G_NAME}" MATCHES "^m[\.]")
+   set_target_properties(${G_NAME} PROPERTIES FOLDER "Tools/Miscellaneous (Scripts)")
+ elseif("${G_NAME}" MATCHES "^ps[\.]")
+   set_target_properties(${G_NAME} PROPERTIES FOLDER "Tools/PostScript (Scripts)")
+ elseif("${G_NAME}" MATCHES "^r3[\.]")
+   set_target_properties(${G_NAME} PROPERTIES FOLDER "Tools/Raster 3D (Scripts)")
+ elseif("${G_NAME}" MATCHES "^t[\.]")
+    set_target_properties(${G_NAME} PROPERTIES FOLDER "Tools/Temporal (Scripts)")
+ else()
+   set_target_properties(${G_NAME} PROPERTIES FOLDER "Binaries (Scripts)")
+ endif()
 
   if(WIN32)
     install(PROGRAMS ${OUTDIR}/${G_DEST_DIR}/${G_NAME}.bat
diff --git a/cmake/modules/copy_python_files_in_subdir.cmake b/cmake/modules/copy_python_files_in_subdir.cmake
@@ -46,6 +46,6 @@ function(copy_python_files_in_subdir dir_name dst_prefix)
               "${OUTDIR}/${dst_prefix}/${dir_name}"
       COMMAND ${CMAKE_COMMAND} -E copy ${PY_FILES}
               "${OUTDIR}/${dst_prefix}/${dir_name}")
-    set_target_properties(python_${targ_name} PROPERTIES FOLDER lib/python)
+    set_target_properties(python_${targ_name} PROPERTIES FOLDER Python/API)
   endif()
 endfunction()
diff --git a/db/CMakeLists.txt b/db/CMakeLists.txt
@@ -16,6 +16,7 @@ add_custom_target(
   ALL_DATABASE_MODULES ALL
   DEPENDS ${db_modules_list}
   COMMENT "All database modules are built.")
+set_target_properties(ALL_DATABASE_MODULES PROPERTIES FOLDER Misc)
 
 if(WITH_DOCS)
   generate_docs(databaseintro TARGET ALL_DATABASE_MODULES)
diff --git a/display/CMakeLists.txt b/display/CMakeLists.txt
@@ -41,6 +41,8 @@ add_custom_target(
   DEPENDS ${display_modules_list}
   COMMENT "All display modules are built.")
 
+set_target_properties(ALL_DISPLAY_MODULES PROPERTIES FOLDER Misc)
+
 if(WITH_DOCS)
   generate_docs(displaydrivers TARGET ALL_DISPLAY_MODULES)
 endif()
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -30,6 +30,7 @@ set(img_files
   project.png)
 
 add_custom_target(ADD_DOC_DOCS ALL COMMENT "Generate doc/html docs." DEPENDS LIB_PYTHON)
+set_target_properties(ADD_DOC_DOCS PROPERTIES FOLDER Docs)
 
 generate_docs_list(
   TARGET ADD_DOC_DOCS
diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
@@ -14,5 +14,7 @@ add_custom_target(
     "${CMAKE_CURRENT_SOURCE_DIR}/xml/grass-interface.dtd"
     ${OUTDIR}/${GRASS_INSTALL_GUIDIR}/xml)
 add_dependencies(grass_interface_dtd GUI_WXPYTHON)
+set_target_properties(grass_interface_dtd PROPERTIES FOLDER GUI)
+
 install(FILES ${OUTDIR}/${GRASS_INSTALL_GUIDIR}/xml/grass-interface.dtd
         DESTINATION ${GRASS_INSTALL_GUIDIR}/xml)
diff --git a/gui/icons/CMakeLists.txt b/gui/icons/CMakeLists.txt
@@ -12,6 +12,7 @@ add_custom_target(
           ${OUTDIR}/${GRASS_INSTALL_DOCDIR}/icons
   COMMAND ${CMAKE_COMMAND} -E make_directory
           ${OUTDIR}/${GRASS_INSTALL_GUIDIR}/images/symbols)
+set_target_properties(make_gui_icons_dirs PROPERTIES FOLDER GUI)
 
 set(output_icons)
 foreach(ICON ${GUI_ICONS})
@@ -50,6 +51,7 @@ foreach(ICON ${FLAGS_ICONS})
 endforeach()
 
 add_custom_target(gui_icons DEPENDS make_gui_icons_dirs ${output_icons})
+set_target_properties(gui_icons PROPERTIES FOLDER GUI)
 
 install(FILES ${GUI_ICONS} DESTINATION ${GRASS_INSTALL_GUIDIR}/icons)
 install(FILES ${GRASS_ICONS} DESTINATION ${GRASS_INSTALL_GUIDIR}/icons/grass)
diff --git a/gui/images/CMakeLists.txt b/gui/images/CMakeLists.txt
@@ -25,6 +25,8 @@ add_custom_target(
           ${OUTDIR}/${GRASS_INSTALL_GUIDIR}/images/symbols/README
   DEPENDS gui_icons ${output_images})
 
+set_target_properties(gui_images PROPERTIES FOLDER GUI)
+
 install(FILES ${GUI_IMAGES} DESTINATION ${GRASS_INSTALL_GUIDIR}/images)
 install(DIRECTORY symbols/basic
         DESTINATION ${GRASS_INSTALL_GUIDIR}/images/symbols)
diff --git a/gui/wxpython/CMakeLists.txt b/gui/wxpython/CMakeLists.txt
@@ -30,6 +30,8 @@ add_custom_target(
           ${OUTDIR}/${WXPYTHON_DIR}
   DEPENDS ${gui_lib_targets} LIB_PYTHON)
 
+set_target_properties(GUI_WXPYTHON PROPERTIES FOLDER GUI)
+
 set(gui_DIRS
     animation
     datacatalog
@@ -65,6 +67,7 @@ add_custom_target(
           ${OUTDIR}/${WXPYTHON_DIR}/xml)
 
 add_dependencies(copy_wxpython_xml GUI_WXPYTHON)
+set_target_properties(copy_wxpython_xml PROPERTIES FOLDER GUI)
 
 add_custom_target(
   compile_python_files
@@ -73,6 +76,7 @@ add_custom_target(
   COMMAND ${PYTHON_EXECUTABLE} -m compileall ${OUTDIR}/${WXPYTHON_DIR})
 
 add_dependencies(compile_python_files ALL_MODULES)
+set_target_properties(compile_python_files PROPERTIES FOLDER GUI)
 
 add_custom_command(
   OUTPUT "${OUTDIR}/${WXPYTHON_DIR}/xml/module_items.xml"
@@ -88,6 +92,7 @@ add_custom_target(build_modules_items_xml
 
 add_dependencies(build_modules_items_xml copy_wxpython_xml grass_interface_dtd
                  compile_python_files ${g_gui_targets})
+set_target_properties(build_modules_items_xml PROPERTIES FOLDER GUI)
 
 # TODO(FHS): remove this if condition
 if(NOT WITH_FHS)
@@ -107,6 +112,8 @@ add_custom_target(
     ${OUTDIR}/${WXPYTHON_DIR}/xml
   DEPENDS build_modules_items_xml)
 
+set_target_properties(build_xml_menudata PROPERTIES FOLDER GUI)
+
 add_custom_target(
   build_module_tree_menudata
   COMMAND
@@ -123,6 +130,8 @@ add_custom_target(
     ${OUTDIR}/${WXPYTHON_DIR}/xml
   DEPENDS build_xml_menudata)
 
+set_target_properties(build_module_tree_menudata PROPERTIES FOLDER GUI)
+
 add_custom_target(
   build_menustrings ALL
   COMMAND
@@ -139,6 +148,8 @@ add_custom_target(
     ${CMAKE_CURRENT_SOURCE_DIR}/menustrings.py
   DEPENDS build_module_tree_menudata gui_images)
 
+set_target_properties(build_menustrings PROPERTIES FOLDER GUI)
+
 endif() # NOT WITH_FHS
 
 install(DIRECTORY "${OUTDIR}/${WXPYTHON_DIR}/xml" DESTINATION "${WXPYTHON_DIR}")
diff --git a/gui/wxpython/docs/CMakeLists.txt b/gui/wxpython/docs/CMakeLists.txt
@@ -29,6 +29,7 @@ set(img_files
 
 add_custom_target(wxpython_docs DEPENDS grass_gis LIB_PYTHON)
 add_dependencies(GUI_WXPYTHON wxpython_docs)
+set_target_properties(wxpython_docs PROPERTIES FOLDER GUI)
 
 generate_docs_list(
   TARGET wxpython_docs
diff --git a/imagery/CMakeLists.txt b/imagery/CMakeLists.txt
@@ -63,6 +63,8 @@ add_custom_target(
   DEPENDS ${imagery_modules_list}
   COMMENT "All imagery modules are built.")
 
+set_target_properties(ALL_IMAGERY_MODULES PROPERTIES FOLDER Misc)
+
 if(WITH_DOCS)
   generate_docs(imageryintro TARGET ALL_IMAGERY_MODULES)
 
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
@@ -14,6 +14,7 @@ foreach(srch ${SRCHS})
 endforeach()
 
 add_custom_target(copy_header DEPENDS ${include_depends} LIB_PYTHON)
+set_target_properties(copy_header PROPERTIES FOLDER Misc)
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/grass/version.h.in
                "${OUTDIR}/${GRASS_INSTALL_INCLUDEDIR}/grass/version.h")
diff --git a/lib/fonts/CMakeLists.txt b/lib/fonts/CMakeLists.txt
@@ -31,6 +31,7 @@ add_custom_command(
   PRE_BUILD
   COMMAND ${CMAKE_COMMAND} -E make_directory ${OUTDIR}/${GRASS_INSTALL_FONTSDIR}
   BYPRODUCTS ${OUTDIR}/${GRASS_INSTALL_FONTSDIR})
+set_target_properties(fonts PROPERTIES FOLDER Misc)
 
 foreach(font_file ${font_files})
   add_custom_command(
diff --git a/lib/init/CMakeLists.txt b/lib/init/CMakeLists.txt
@@ -1,6 +1,7 @@
 # #for i18N support
 
 add_custom_target(ADD_INIT_DOCS ALL COMMENT "Generate init docs.")
+set_target_properties(ADD_INIT_DOCS PROPERTIES FOLDER Docs)
 
 if(WITH_DOCS)
 
diff --git a/locale/CMakeLists.txt b/locale/CMakeLists.txt
@@ -102,7 +102,7 @@ set(generate_mo_file_targets ${po_file_names})
 list(TRANSFORM generate_mo_file_targets PREPEND "generate_mo_files_")
 
 add_custom_target(generate_mo_files_dir ALL COMMENT "Create locale directory")
-set_target_properties(generate_mo_files_dir PROPERTIES FOLDER locale)
+set_target_properties(generate_mo_files_dir PROPERTIES FOLDER Locale)
 add_custom_command(
   TARGET generate_mo_files_dir
   PRE_BUILD
@@ -131,9 +131,9 @@ foreach(_locale ${_locales})
             ${OUTDIR}/${GRASS_INSTALL_LOCALEDIR}/${_locale}/LC_MESSAGES
     BYPRODUCTS ${OUTDIR}/${GRASS_INSTALL_LOCALEDIR}/${_locale}/LC_MESSAGES)
 
-  set_target_properties(${_locale}_LC_MESSAGES_dir PROPERTIES FOLDER locale)
+  set_target_properties(${_locale}_LC_MESSAGES_dir PROPERTIES FOLDER Locale)
   set_target_properties(generate_mo_files_dir_${_locale} PROPERTIES FOLDER
-                                                                    locale)
+                                                                    Locale)
 endforeach()
 unset(_locales)
 
@@ -149,7 +149,7 @@ foreach(po_file ${po_files})
     DEPENDS ${_locale}_LC_MESSAGES_dir
     COMMENT "Generate mo files")
   set_target_properties(generate_mo_files_${po_file_name} PROPERTIES FOLDER
-                                                                     locale)
+                                                                     Locale)
   add_custom_command(
     TARGET generate_mo_files_${po_file_name}
     POST_BUILD
@@ -169,6 +169,8 @@ add_custom_command(
           ${CMAKE_CURRENT_SOURCE_DIR}/grass_po_stats.py
   BYPRODUCTS ${OUTDIR}/${GRASS_INSTALL_MISCDIR}/translation_status.json)
 
+set_target_properties(translation_statistics PROPERTIES FOLDER Locale)
+
 install(DIRECTORY ${OUTDIR}/${GRASS_INSTALL_LOCALEDIR}/
         DESTINATION ${GRASS_INSTALL_LOCALEDIR})
 
diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
@@ -22,7 +22,7 @@ add_custom_target(
   BYPRODUCTS ${OUTDIR}/${GRASS_INSTALL_DOCDIR}/full_index.html
   DEPENDS ALL_MODULES LIB_PYTHON GUI_WXPYTHON
   COMMENT "man generation: build full index")
-set_target_properties(build_full_index PROPERTIES FOLDER man)
+set_target_properties(build_full_index PROPERTIES FOLDER Man)
 
 add_custom_command(
   TARGET build_full_index
@@ -39,7 +39,7 @@ add_custom_target(
   BYPRODUCTS ${OUTDIR}/${GRASS_INSTALL_DOCDIR}/index.html
   DEPENDS build_full_index
   COMMENT "man generation: build index")
-set_target_properties(build_index PROPERTIES FOLDER man)
+set_target_properties(build_index PROPERTIES FOLDER Man)
 
 set(target_names build_topics build_keywords build_graphical_index
                  build_manual_gallery)
@@ -51,7 +51,7 @@ foreach(target_name ${target_names})
       ${CMAKE_CURRENT_SOURCE_DIR}/${target_name}.py
     DEPENDS build_index
     COMMENT "man generation: ${target_name}")
-  set_target_properties(${target_name} PROPERTIES FOLDER man)
+  set_target_properties(${target_name} PROPERTIES FOLDER Man)
 endforeach()
 
 add_custom_target(
@@ -63,7 +63,7 @@ add_custom_target(
     ${OUTDIR}/${GRASS_INSTALL_DOCDIR}
   DEPENDS build_index
   COMMENT "man generation: build_class_graphical")
-set_target_properties(build_class_graphical PROPERTIES FOLDER man)
+set_target_properties(build_class_graphical PROPERTIES FOLDER Man)
 
 add_custom_target(
   build_pso
@@ -75,7 +75,7 @@ add_custom_target(
     "id='opts_table' class='scroolTable'"
   DEPENDS ${target_names}
   COMMENT "man generation: parser standard options")
-set_target_properties(build_pso PROPERTIES FOLDER man)
+set_target_properties(build_pso PROPERTIES FOLDER Man)
 
 set(categories
     d:display
@@ -102,7 +102,7 @@ foreach(category ${categories})
       ${OUTDIR}/${GRASS_INSTALL_DOCDIR}
     DEPENDS build_pso
     COMMENT "man generation: build class ${class_name}")
-  set_target_properties(build_class_${class_name} PROPERTIES FOLDER man)
+  set_target_properties(build_class_${class_name} PROPERTIES FOLDER Man)
 endforeach()
 
 # TODO: this shouldn't depend on GUI_WXPYTHON
@@ -113,6 +113,6 @@ add_custom_target(
     ${CMAKE_CURRENT_SOURCE_DIR}/build_check.py ${OUTDIR}/${GRASS_INSTALL_DOCDIR}
   DEPENDS ${category_targets} build_class_graphical ALL_MODULES LIB_PYTHON GUI_WXPYTHON
   COMMENT "man generation: check output")
-set_target_properties(build_check PROPERTIES FOLDER man)
+set_target_properties(build_check PROPERTIES FOLDER Man)
 
 endif() # NOT WITH_FHS
diff --git a/python/grass/CMakeLists.txt b/python/grass/CMakeLists.txt
@@ -70,7 +70,7 @@ add_custom_target(
   VERBATIM
   DEPENDS ${pydir_targets})
 
-set_target_properties(LIB_PYTHON PROPERTIES FOLDER lib)
+set_target_properties(LIB_PYTHON PROPERTIES FOLDER Misc)
 
 install(DIRECTORY ${OUTDIR}/${PYDIR_GRASS} DESTINATION ${GRASS_INSTALL_PYDIR}
         PATTERN "*/resource_paths.py" EXCLUDE)
diff --git a/python/libgrass_interface_generator/CMakeLists.txt b/python/libgrass_interface_generator/CMakeLists.txt
@@ -120,7 +120,7 @@ foreach(module ${MODULES})
     VERBATIM)
 
   add_custom_target(${${module}_TARGET_NAME} ALL DEPENDS ${output_file})
-  set_target_properties(${${module}_TARGET_NAME} PROPERTIES FOLDER lib/python)
+  set_target_properties(${${module}_TARGET_NAME} PROPERTIES FOLDER "Python/GRASS Libraries Interface")
   install(FILES ${output_file} DESTINATION ${GRASS_INSTALL_PYDIR}/grass/lib)
 
 endforeach()
diff --git a/raster/CMakeLists.txt b/raster/CMakeLists.txt
@@ -144,6 +144,8 @@ add_custom_target(
   DEPENDS ${raster_modules_list}
   COMMENT "All raster modules are built.")
 
+set_target_properties(ALL_RASTER_MODULES PROPERTIES FOLDER Misc)
+
 if(WITH_DOCS)
   generate_docs(rasterintro TARGET ALL_RASTER_MODULES)
 endif()
diff --git a/raster3d/CMakeLists.txt b/raster3d/CMakeLists.txt
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
diff --git a/temporal/CMakeLists.txt b/temporal/CMakeLists.txt
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
diff --git a/vector/CMakeLists.txt b/vector/CMakeLists.txt
