Skip to content

cmake: enable experimental FHS build, skip failing parts #6972

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nilason merged 1 commit into from
Jan 26, 2026
Merged

cmake: enable experimental FHS build, skip failing parts #6972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions general/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@ build_program_in_subdir(g.message DEPENDS grass_gis)
build_program_in_subdir(g.mkfontcap DEPENDS grass_gis PRIMARY_DEPENDS
Freetype::Freetype)
add_dependencies(g.mkfontcap fonts)

# TODO(FHS): revert GRASS_INSTALL_ETCBINDIR to GRASS_INSTALL_ETCDIR
add_custom_command(
TARGET g.mkfontcap
POST_BUILD
COMMAND ${grass_env_command} ${OUTDIR}/${GRASS_INSTALL_BINDIR}/g.mkfontcap -s
> ${OUTDIR}/${GRASS_INSTALL_ETCDIR}/fontcap)
install(FILES ${OUTDIR}/${GRASS_INSTALL_ETCDIR}/fontcap
DESTINATION ${GRASS_INSTALL_ETCDIR})
> ${OUTDIR}/${GRASS_INSTALL_ETCBINDIR}/fontcap)
install(FILES ${OUTDIR}/${GRASS_INSTALL_ETCBINDIR}/fontcap
DESTINATION ${GRASS_INSTALL_ETCBINDIR})
build_program_in_subdir(g.parser DEPENDS grass_gis)
build_program_in_subdir(g.pnmcomp DEPENDS grass_gis)
build_program_in_subdir(g.ppmtopng DEPENDS grass_gis PRIMARY_DEPENDS PNG::PNG)
Expand Down
5 changes: 5 additions & 0 deletions gui/wxpython/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ 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})

# TODO(FHS): remove this if condition
if(NOT WITH_FHS)

add_custom_target(
build_xml_menudata
COMMAND
Expand Down Expand Up @@ -136,4 +139,6 @@ add_custom_target(
${CMAKE_CURRENT_SOURCE_DIR}/menustrings.py
DEPENDS build_module_tree_menudata gui_images)

endif() # NOT WITH_FHS

install(DIRECTORY "${OUTDIR}/${WXPYTHON_DIR}/xml" DESTINATION "${WXPYTHON_DIR}")
5 changes: 5 additions & 0 deletions locale/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,5 +172,10 @@ add_custom_command(
install(DIRECTORY ${OUTDIR}/${GRASS_INSTALL_LOCALEDIR}/
DESTINATION ${GRASS_INSTALL_LOCALEDIR})

# TODO(FHS): remove this if condition
if(NOT WITH_FHS)

install(FILES ${OUTDIR}/${GRASS_INSTALL_MISCDIR}/translation_status.json
DESTINATION ${GRASS_INSTALL_MISCDIR})

endif() # NOT WITH_FHS
28 changes: 16 additions & 12 deletions man/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
string(TIMESTAMP YEAR %Y)
set(data_files
${CMAKE_CURRENT_SOURCE_DIR}/jquery.fixedheadertable.min.js
${CMAKE_CURRENT_SOURCE_DIR}/grassdocs.css
${CMAKE_CURRENT_SOURCE_DIR}/hamburger_menu.svg
${CMAKE_CURRENT_SOURCE_DIR}/grass_icon.png
${CMAKE_CURRENT_SOURCE_DIR}/grass_logo.png
${CMAKE_CURRENT_SOURCE_DIR}/hamburger_menu_close.svg
${CMAKE_CURRENT_SOURCE_DIR}/parser_standard_options.css
${CMAKE_CURRENT_SOURCE_DIR}/parser_standard_options.js)
install(FILES ${data_files} DESTINATION ${GRASS_INSTALL_DOCDIR})

# TODO(FHS): remove this if condition
if(NOT WITH_FHS)

string(TIMESTAMP YEAR %Y)
add_custom_target(
build_full_index
COMMAND
Expand All @@ -11,17 +24,6 @@ add_custom_target(
COMMENT "man generation: build full index")
set_target_properties(build_full_index PROPERTIES FOLDER man)

set(data_files
${CMAKE_CURRENT_SOURCE_DIR}/jquery.fixedheadertable.min.js
${CMAKE_CURRENT_SOURCE_DIR}/grassdocs.css
${CMAKE_CURRENT_SOURCE_DIR}/hamburger_menu.svg
${CMAKE_CURRENT_SOURCE_DIR}/grass_icon.png
${CMAKE_CURRENT_SOURCE_DIR}/grass_logo.png
${CMAKE_CURRENT_SOURCE_DIR}/hamburger_menu_close.svg
${CMAKE_CURRENT_SOURCE_DIR}/parser_standard_options.css
${CMAKE_CURRENT_SOURCE_DIR}/parser_standard_options.js)
install(FILES ${data_files} DESTINATION ${GRASS_INSTALL_DOCDIR})

add_custom_command(
TARGET build_full_index
PRE_BUILD
Expand Down Expand Up @@ -112,3 +114,5 @@ add_custom_target(
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)

endif() # NOT WITH_FHS
Loading