diff --git a/general/CMakeLists.txt b/general/CMakeLists.txt index fe8412b4608..f61c1131d13 100644 --- a/general/CMakeLists.txt +++ b/general/CMakeLists.txt @@ -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) diff --git a/gui/wxpython/CMakeLists.txt b/gui/wxpython/CMakeLists.txt index 41c6bc0fe0f..8f409317eac 100644 --- a/gui/wxpython/CMakeLists.txt +++ b/gui/wxpython/CMakeLists.txt @@ -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 @@ -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}") diff --git a/locale/CMakeLists.txt b/locale/CMakeLists.txt index 662ef6a9154..47ceedf273c 100644 --- a/locale/CMakeLists.txt +++ b/locale/CMakeLists.txt @@ -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 diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt index fc24e39aa2f..03698923936 100644 --- a/man/CMakeLists.txt +++ b/man/CMakeLists.txt @@ -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 @@ -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 @@ -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