Merge pull request 'master' (#144) from YanTheKaller/ubl-settings-datetime:master into master

Reviewed-on: #144

source/CMakeLists.txt

@@ -67,13 +67,16 @@ add_custom_target(
     DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${GRESOURCE_C}
 )
 
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always -std=c++2a")
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always -lm")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \
 	-O2 -pipe -fno-plt -fexceptions \
-        -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
+         -Wformat -Werror=format-security \
         -fstack-clash-protection -fcf-protection")
         
+string(FIND "${CMAKE_CXX_FLAGS}" "-D_FORTIFY_SOURCE" FORTIFY_FOUND)
+
+if(FORTIFY_FOUND EQUAL -1)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wp,-D_FORTIFY_SOURCE=2")
+endif()
          
 set(SOURCE_FILES
         ubl-util-standard.h

ubl-settings-datetime_ru.po

@@ -4,7 +4,7 @@
 # UBLinux Team <info@ublinux.com>, 2022
 #
 #, fuzzy
-msgid "f1\n"
+msgid ""
 msgstr ""
 "Project-Id-Version: ubl-settings-datetime 1.0\n"
 "Report-Msgid-Bugs-To: info@ublinux.com\n"