diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt index 093a29c4efb62225a493809b7e220ca24fc65b80..941a65497e38e5a1572dfac55eba396a7629922a 100644 --- a/po/CMakeLists.txt +++ b/po/CMakeLists.txt @@ -18,8 +18,12 @@ endforeach(language) # update inkscape.pot set(_potFile ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.pot) +set(_potFiles_src ${CMAKE_CURRENT_BINARY_DIR}/POTFILES.src) set(xgettext_options -cTRANSLATORS -j --keyword=_ --keyword=N_ --keyword=Q_:1g --keyword=C_:1c,2 --keyword=NC_:1c,2 --msgid-bugs-address=inkscape-translator@lists.inkscape.org --from-code=UTF-8 -ktranslatable -o ${_potFile}) +# configure the POTFILES.src file from POTFILES.src.in +configure_file(POTFILES.src.in ${_potFiles_src}) + # Due to a bug in old xgettext versions, we cannot use '--its='. # Instead, we use GETTEXTDATADIR=. to refer to the po/its/*.its files. # This requires a .loc file for each .its file. See po/its/units.loc for an example. @@ -32,7 +36,7 @@ add_custom_target(inkscape_pot BYPRODUCTS ${_potFile} COMMAND rm -f ${_potFile} && touch ${_potFile} # extract strings from source files into inkscape.pot - COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} ${xgettext_options} -C -f POTFILES.src.in + COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} ${xgettext_options} -C -f ${_potFiles_src} COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} ${xgettext_options} -L Glade -f POTFILES.ui.in COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} ${xgettext_options} -L Python -f POTFILES.py.in # the following uses po/its/inx.{loc, its} diff --git a/po/POTFILES.src.in b/po/POTFILES.src.in index 88e370f8fffa5aca2b1c53f49522dc9d65038669..15b17f2a7339337c7c1d7d7e8db727f80ab4c749 100644 --- a/po/POTFILES.src.in +++ b/po/POTFILES.src.in @@ -1,8 +1,8 @@ -../share/filters/filters.svg.h -../share/palettes/palettes.h -../share/paint/patterns.svg.h -../share/symbols/symbols.h -../share/templates/templates.h +${CMAKE_BINARY_DIR}/share/filters/filters.svg.h +${CMAKE_BINARY_DIR}/share/palettes/palettes.h +${CMAKE_BINARY_DIR}/share/paint/patterns.svg.h +${CMAKE_BINARY_DIR}/share/symbols/symbols.h +${CMAKE_BINARY_DIR}/share/templates/templates.h ../src/actions/actions-base.cpp ../src/actions/actions-canvas-mode.cpp ../src/actions/actions-canvas-snapping.cpp diff --git a/po/generate_POTFILES.sh b/po/generate_POTFILES.sh index e1537151ba1afd70f7f8ce3199d13c6f0747152f..4d016284d2272bb1cafd951ec5d7e8e08fb0acf8 100755 --- a/po/generate_POTFILES.sh +++ b/po/generate_POTFILES.sh @@ -10,11 +10,11 @@ cd "$mydir" export LC_ALL=C ( - echo "../share/filters/filters.svg.h" - echo "../share/palettes/palettes.h" - echo "../share/paint/patterns.svg.h" - echo "../share/symbols/symbols.h" - echo "../share/templates/templates.h" + echo "\${CMAKE_BINARY_DIR}/share/filters/filters.svg.h" + echo "\${CMAKE_BINARY_DIR}/share/palettes/palettes.h" + echo "\${CMAKE_BINARY_DIR}/share/paint/patterns.svg.h" + echo "\${CMAKE_BINARY_DIR}/share/symbols/symbols.h" + echo "\${CMAKE_BINARY_DIR}/share/templates/templates.h" find ../src \( -name '*.cpp' -o -name '*.[ch]' \) -type f -print0 | xargs -0 egrep -l '(\<[QNC]?_|gettext) *\(' | sort diff --git a/share/filters/CMakeLists.txt b/share/filters/CMakeLists.txt index a1ea4db5a15abf2459f070e68bc3965197becffb..5604734b6db74fe9e7ef85c56ad052e77e3fcbc5 100644 --- a/share/filters/CMakeLists.txt +++ b/share/filters/CMakeLists.txt @@ -1,12 +1,12 @@ # SPDX-License-Identifier: GPL-2.0-or-later add_custom_command( - OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg.h - COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg > ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg.h + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/filters.svg.h + COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg > ${CMAKE_CURRENT_BINARY_DIR}/filters.svg.h MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ) -set_source_files_properties(${CMAKE_SOURCE_DIR}/filters.svg.h PROPERTIES GENERATED TRUE) +set_source_files_properties(${CMAKE_BINARY_DIR}/filters.svg.h PROPERTIES GENERATED TRUE) -add_custom_target(filters_svg_h ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/filters.svg.h) +add_custom_target(filters_svg_h ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/filters.svg.h) install(FILES "filters.svg" "README" DESTINATION ${INKSCAPE_SHARE_INSTALL}/filters) diff --git a/share/paint/CMakeLists.txt b/share/paint/CMakeLists.txt index e139585013d0ff97f211cdc9e048905c3f62623e..2ddf30854fc4249a30315a8095a8ff5ae821eb16 100644 --- a/share/paint/CMakeLists.txt +++ b/share/paint/CMakeLists.txt @@ -1,11 +1,11 @@ # SPDX-License-Identifier: GPL-2.0-or-later add_custom_command( - OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h - COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg > ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/patterns.svg.h + COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg > ${CMAKE_CURRENT_BINARY_DIR}/patterns.svg.h MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ) -set_source_files_properties(${CMAKE_SOURCE_DIR}/patterns.svg.h PROPERTIES GENERATED TRUE) -add_custom_target(patterns_svg_h ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h) +set_source_files_properties(${CMAKE_BINARY_DIR}/patterns.svg.h PROPERTIES GENERATED TRUE) +add_custom_target(patterns_svg_h ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/patterns.svg.h) install(FILES "hatches.svg" "patterns.svg" "README" DESTINATION ${INKSCAPE_SHARE_INSTALL}/paint) diff --git a/share/palettes/CMakeLists.txt b/share/palettes/CMakeLists.txt index dd77633aa2a8901c4265a32b943270296f171cae..a1792d387697c00a5f68af76d5df1fe47de06b87 100644 --- a/share/palettes/CMakeLists.txt +++ b/share/palettes/CMakeLists.txt @@ -2,14 +2,14 @@ set(I18N_FILES "inkscape.gpl" "svg.gpl" "Tango-Palette.gpl") add_custom_command( - OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/palettes.h - COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${I18N_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/palettes.h + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/palettes.h + COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${I18N_FILES} > ${CMAKE_CURRENT_BINARY_DIR}/palettes.h WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${I18N_FILES} ) -set_source_files_properties(${CMAKE_SOURCE_DIR}/palettes.h PROPERTIES GENERATED TRUE) +set_source_files_properties(${CMAKE_BINARY_DIR}/palettes.h PROPERTIES GENERATED TRUE) -add_custom_target(palettes_h ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/palettes.h) +add_custom_target(palettes_h ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/palettes.h) file(GLOB _FILES "*.gpl") diff --git a/share/symbols/CMakeLists.txt b/share/symbols/CMakeLists.txt index a3fea408afc20e04958f7788078d7138d558d2fa..a0b9e39efc109bdc81fc86d2d68422bddfa0c833 100644 --- a/share/symbols/CMakeLists.txt +++ b/share/symbols/CMakeLists.txt @@ -2,12 +2,12 @@ file(GLOB _FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.svg") add_custom_command( - OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/symbols.h - COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/symbols.h + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/symbols.h + COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} > ${CMAKE_CURRENT_BINARY_DIR}/symbols.h WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} ) -set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/symbols.h PROPERTIES GENERATED TRUE) -add_custom_target(symbols_h ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/symbols.h) +set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/symbols.h PROPERTIES GENERATED TRUE) +add_custom_target(symbols_h ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/symbols.h) install(FILES ${_FILES} "README" DESTINATION ${INKSCAPE_SHARE_INSTALL}/symbols) diff --git a/share/templates/CMakeLists.txt b/share/templates/CMakeLists.txt index 70665deafadd39286362391140bb42cfce29305f..dec1230b3c5684c2d9b4ddc4140af6de1d6811e6 100644 --- a/share/templates/CMakeLists.txt +++ b/share/templates/CMakeLists.txt @@ -2,13 +2,13 @@ file(GLOB _FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.svg") add_custom_command( - OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/templates.h - COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} > ${CMAKE_CURRENT_SOURCE_DIR}/templates.h + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/templates.h + COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} > ${CMAKE_CURRENT_BINARY_DIR}/templates.h WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${_FILES} ) -set_source_files_properties(${CMAKE_SOURCE_DIR}/templates.h PROPERTIES GENERATED TRUE) -add_custom_target(templates_h ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/templates.h) +set_source_files_properties(${CMAKE_BINARY_DIR}/templates.h PROPERTIES GENERATED TRUE) +add_custom_target(templates_h ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/templates.h) install(FILES ${_FILES} "README" DESTINATION ${INKSCAPE_SHARE_INSTALL}/templates)