SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

add_custom_command(... pip_lang) on ninja brings to resursive cmake and ninja call (

Browse Source
This commit is contained in:
Пелипенко Иван
2024-11-15 15:43:03 +03:00
parent ee137b2820
commit 3d07795515
5 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@@ -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()

1
lang/compile.bat Normal file
View File

@@ -0,0 +1 @@
pip_tr --Compile -o pip_ru.btf pip_ru.ts

BIN
lang/pip_ru.btf Normal file
View File

Binary file not shown.

8
libs/main/text/pistring.h
View File

@@ -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)); }

3
utils/translator/CMakeLists.txt
View File

@@ -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()