Fix build error on some platforms

Update build scripts.
This commit is contained in:
Tindy X 2021-09-20 17:17:49 +08:00
parent 9797197c85
commit c35714ba48
No known key found for this signature in database
GPG Key ID: 9669AC138D2F6316
2 changed files with 9 additions and 4 deletions

View File

@ -7,17 +7,17 @@ RUN apk add --no-cache --virtual .build-tools git g++ build-base linux-headers c
apk add --no-cache --virtual .build-deps curl-dev rapidjson-dev libevent-dev pcre2-dev yaml-cpp-dev && \
git clone https://github.com/ftk/quickjspp --depth=1 && \
cd quickjspp && \
git submodule update --init && \
git submodule update --init && \
cmake -DCMAKE_BUILD_TYPE=Release . && \
make quickjs -j2 && \
install -m644 quickjs/libquickjs.a /usr/lib && \
install -d /usr/include/quickjs/ && \
install -d /usr/include/quickjs/ && \
install -m644 quickjs/quickjs.h quickjs/quickjs-libc.h /usr/include/quickjs/ && \
install -m644 quickjspp.hpp /usr/include && \
cd .. && \
git clone https://github.com/PerMalmberg/libcron --depth=1 && \
cd libcron && \
git submodule update --init && \
git submodule update --init && \
cmake -DCMAKE_BUILD_TYPE=Release . && \
make libcron -j4 && \
install -m644 libcron/out/Release/liblibcron.a /usr/lib/ && \
@ -26,6 +26,11 @@ RUN apk add --no-cache --virtual .build-tools git g++ build-base linux-headers c
install -d /usr/include/date/ && \
install -m644 libcron/externals/date/include/date/* /usr/include/date/ && \
cd .. && \
git clone https://github.com/ToruNiina/toml11 --depth=1 && \
cd toml11 && \
cmake . && \
make install -j4 && \
cd .. && \
git clone https://github.com/tindy2013/subconverter --depth=1 && \
cd subconverter && \
cmake -DCMAKE_BUILD_TYPE=Release . && \

View File

@ -921,7 +921,7 @@ template <class T, class... U>
void find_if_exist(const toml::value &v, const toml::key &k, T& target, U&&... args)
{
if(v.contains(k)) target = toml::find<T>(v, k);
if constexpr (sizeof...(args)) find_if_exist(v, std::forward<U>(args)...);
if constexpr (sizeof...(args) > 0) find_if_exist(v, std::forward<U>(args)...);
}
std::string join(const string_array &arr, const std::string &delimiter = "|")