From 27daf2691691224f43881c2fccda3cc59c7a8349 Mon Sep 17 00:00:00 2001 From: Oliver Giles Date: Wed, 5 Mar 2025 10:14:53 +1300 Subject: [PATCH] FindGettext: remove use of deprecated -s option The --sorted-output/-s option to msgmerge has been deprecated in gettext 0.23. See https://lists.nongnu.org/archive/html/info-gnu/2024-12/msg00000.html --- Modules/FindGettext.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/FindGettext.cmake b/Modules/FindGettext.cmake index c38f9f511e..b2d9fff076 100644 --- a/Modules/FindGettext.cmake +++ b/Modules/FindGettext.cmake @@ -143,7 +143,7 @@ macro(GETTEXT_CREATE_TRANSLATIONS _potFile _firstPoFileArg) add_custom_command( OUTPUT ${_gmoFile} - COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none -s ${_absFile} ${_absPotFile} + COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none ${_absFile} ${_absPotFile} COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_absFile} DEPENDS ${_absPotFile} ${_absFile} ) @@ -184,7 +184,7 @@ function(GETTEXT_PROCESS_POT_FILE _potFile) add_custom_command( OUTPUT "${_poFile}" - COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none -s ${_poFile} ${_absPotFile} + COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none ${_poFile} ${_absPotFile} DEPENDS ${_absPotFile} )