From 3d077955159247549a139a323956772a31c158eb Mon Sep 17 00:00:00 2001
From: peri4 <peri4ko@yandex.ru>
Date: Fri, 15 Nov 2024 15:43:03 +0300
Subject: [PATCH] add_custom_command(... pip_lang) on ninja brings to resursive
 cmake and ninja call (

---
 CMakeLists.txt                  |  16 ++++++++++------
 lang/compile.bat                |   1 +
 lang/pip_ru.btf                 | Bin 0 -> 8049 bytes
 libs/main/text/pistring.h       |   8 ++++++++
 utils/translator/CMakeLists.txt |   3 ---
 5 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 lang/compile.bat
 create mode 100644 lang/pip_ru.btf

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b214b66a..94ffcb73 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -484,7 +484,8 @@ if (NOT CROSSTOOLS)
 		# libmicrohttpd
 		find_library(microhttpd_LIBRARIES microhttpd HINTS "${MINGW_LIB}")
 		if (microhttpd_LIBRARIES)
-			set(_microhttpd_add_libs)
+			set(microhttpd_FOUND TRUE)
+			set(_microhttpd_add_libs microhttpd)
 			if(WIN32)
 				if("${C_COMPILER}" STREQUAL "cl.exe")
 				else()
@@ -494,7 +495,9 @@ if (NOT CROSSTOOLS)
 				list(APPEND _microhttpd_add_libs dl)
 				find_library(tls_lib gnutls)
 				if (tls_lib)
-					list(APPEND _microhttpd_add_libs ${tls_lib})
+					set(gnutls_FOUND TRUE)
+					set(gnutls_LIBRARIES "${tls_lib}")
+					list(APPEND _microhttpd_add_libs gnutls)
 				endif()
 				if(DEFINED ENV{QNX_HOST})
 					list(APPEND _microhttpd_add_libs socket)
@@ -504,8 +507,8 @@ if (NOT CROSSTOOLS)
 					endif()
 				endif()
 			endif()
-			list(APPEND microhttpd_LIBRARIES "${_microhttpd_add_libs}")
-			pip_module(http_server "${microhttpd_LIBRARIES}" "PIP HTTP server" "" "" "")
+			#list(APPEND microhttpd_LIBRARIES "${_microhttpd_add_libs}")
+			pip_module(http_server "${_microhttpd_add_libs}" "PIP HTTP server" "" "" "")
 		endif()
 
 		# Test program
@@ -563,8 +566,9 @@ endif()
 # Translations
 set(PIP_LANG)
 if (NOT CROSSTOOLS)
-	pip_translation(PIP_LANG lang/pip_ru.ts)
-	add_custom_target(pip_lang SOURCES "${PIP_LANG}")
+	# pip_translation(PIP_LANG lang/pip_ru.ts)
+	# add_custom_target(pip_lang SOURCES "${PIP_LANG}")
+	file(GLOB PIP_LANG "lang/*.btf")
 endif()
 
 
diff --git a/lang/compile.bat b/lang/compile.bat
new file mode 100644
index 00000000..6a09314a
--- /dev/null
+++ b/lang/compile.bat
@@ -0,0 +1 @@
+pip_tr --Compile -o pip_ru.btf pip_ru.ts
\ No newline at end of file
diff --git a/lang/pip_ru.btf b/lang/pip_ru.btf
new file mode 100644
index 0000000000000000000000000000000000000000..230085c6f9a857790ed1ebefd1c2fec73505b209
GIT binary patch
literal 8049
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
E2fwK#O8@`>

literal 0
HcmV?d00001

diff --git a/libs/main/text/pistring.h b/libs/main/text/pistring.h
index ab573d31..efcbe031 100644
--- a/libs/main/text/pistring.h
+++ b/libs/main/text/pistring.h
@@ -1716,6 +1716,14 @@ public:
 	//! \~russian Заменяет все вхождения типа "%1", "%2", ... с наименьшим значением на "v" и возвращает эту строку.
 	PIString & arg(uint v, int base = 10) { return arg(PIString::fromNumber(v, base)); }
 
+	//! \~english Replace all occurances like "%1", "%2", ... with lowest value to "v" and returns this string.
+	//! \~russian Заменяет все вхождения типа "%1", "%2", ... с наименьшим значением на "v" и возвращает эту строку.
+	PIString & arg(long v, int base = 10) { return arg(PIString::fromNumber(v, base)); }
+
+	//! \~english Replace all occurances like "%1", "%2", ... with lowest value to "v" and returns this string.
+	//! \~russian Заменяет все вхождения типа "%1", "%2", ... с наименьшим значением на "v" и возвращает эту строку.
+	PIString & arg(ulong v, int base = 10) { return arg(PIString::fromNumber(v, base)); }
+
 	//! \~english Replace all occurances like "%1", "%2", ... with lowest value to "v" and returns this string.
 	//! \~russian Заменяет все вхождения типа "%1", "%2", ... с наименьшим значением на "v" и возвращает эту строку.
 	PIString & arg(llong v, int base = 10) { return arg(PIString::fromNumber(v, base)); }
diff --git a/utils/translator/CMakeLists.txt b/utils/translator/CMakeLists.txt
index 8559e1a8..2b4268db 100644
--- a/utils/translator/CMakeLists.txt
+++ b/utils/translator/CMakeLists.txt
@@ -18,6 +18,3 @@ if (DEFINED LIB)
 else()
 	install(TARGETS pip_tr DESTINATION bin)
 endif()
-if (NOT CROSSTOOLS)
-	add_custom_command(TARGET pip_tr POST_BUILD COMMAND "${CMAKE_COMMAND}" --build "${PIP_DLL_DIR}" --target pip_lang)
-endif()