fix CI 7

CMakeLists.txt

@@ -122,7 +122,7 @@ option(WITH_LARGEFILES "Build with large file support"
        ${default_option_enabled})
 option(WITH_DOCS "Build documentation" ON)
 option(WITH_GUI "Build GUI" ON)
-option(WITH_FSH "Install with FHS" OFF)
+option(WITH_FHS "Install with FHS" OFF)
 
 include(check_target)
 include(CheckDependentLibraries)
@@ -171,7 +171,7 @@ endif()
 ]]
 
 # TODO: a proper fix to this workaround
-if(WITH_FSH)
+if(WITH_FHS)
   file(CREATE_LINK ${OUTDIR}/${GRASS_INSTALL_DEMODIR}
        ${RUNTIME_GISBASE}/demolocation SYMBOLIC)
   file(CREATE_LINK ${OUTDIR}/${GRASS_INSTALL_FONTSDIR} ${RUNTIME_GISBASE}/fonts
@@ -250,25 +250,25 @@ add_subdirectory(utils)
 set(modules_list)
 
 set(ALL_SUBDIRS
-    general
     db
     display
+    general
     imagery
     misc
+    ps
     raster
     raster3d
     scripts
-    vector
     temporal
-    ps)
+    vector)
 
 foreach(d ${ALL_SUBDIRS})
   add_subdirectory(${d})
 endforeach()
 add_custom_target(
   ALL_MODULES
   # COMMAND ${CMAKE_COMMAND} -E echo "Building all modules"
-  DEPENDS ${modules_list}
+  DEPENDS LIB_PYTHON ${modules_list}
   COMMENT "Building all modules.")
 
 # message(FATAL_ERROR "modules_list=${modules_list}")

cmake/modules/GRASSInstallDirs.cmake

@@ -1,7 +1,7 @@
 include(GNUInstallDirs)
 
-if(WITH_FSH)
-  message("NEW structure")
+if(WITH_FHS)
+  message("FHS file structure")
   set(GISBASE_DIR "${CMAKE_INSTALL_LIBEXECDIR}/${PROJECT_NAME_LOWER}")
   set(GRASS_INSTALL_BINDIR "${GISBASE_DIR}/bin")
   set(GRASS_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}")
@@ -27,7 +27,7 @@ if(WITH_FSH)
   set(GRASS_INSTALL_MAKEFILEDIR "${GISBASE_DIR}/Make")
   set(GRASS_INSTALL_LOCALEDIR "${CMAKE_INSTALL_LOCALEDIR}")
 else()
-  message("OLD structure")
+  message("Legacy file structure")
   set(GISBASE_DIR "${CMAKE_INSTALL_LIBDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}")
   set(GRASS_INSTALL_BINDIR "${GISBASE_DIR}/bin")
   set(GRASS_INSTALL_LIBDIR "${GISBASE_DIR}/lib")