Serene/serene
Serene
/
serene
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

Try to fix the cmake 2.23 bug

This commit is contained in:
Sameer Rahmani 2022-06-12 18:43:06 +01:00
parent 70995c2908
commit 098b3ebdc4
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builder
View File

@ -65,9 +65,9 @@ ROOT_DIR=$(pwd)
BUILD_DIR=$ROOT_DIR/build BUILD_DIR=$ROOT_DIR/build
ME=$(cd "$(dirname "$0")/." >/dev/null 2>&1 ; pwd -P) ME=$(cd "$(dirname "$0")/." >/dev/null 2>&1 ; pwd -P)
CMAKEARGS_DEBUG=" -DCMAKE_BUILD_TYPE=Debug" CMAKEARGS_DEBUG=("-DCMAKE_BUILD_TYPE=Debug")
# Verbose -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON # Verbose -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
CMAKEARGS=" -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DSERENE_CCACHE_DIR=$HOME/.ccache" CMAKEARGS=("-DCMAKE_EXPORT_COMPILE_COMMANDS=ON" "-DSERENE_CCACHE_DIR=$HOME/.ccache")
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Helper functions # Helper functions
@ -103,8 +103,8 @@ function popd_build() {
function build-gen() { function build-gen() {
pushed_build pushed_build
info "Running: " info "Running: "
info "cmake -G Ninja $CMAKEARGS $CMAKEARGS_DEBUG \"$*\" \"$ROOT_DIR\"" info "cmake -G Ninja " "${CMAKEARGS[@]}" "${CMAKEARGS[@]}" "\"$*\" \"$ROOT_DIR\""
cmake -G Ninja "$CMAKEARGS" "$CMAKEARGS_DEBUG" "$*" "$ROOT_DIR" cmake -G Ninja "${CMAKEARGS[@]}" "${CMAKEARGS_DEBUG[@]}" "$*" "$ROOT_DIR"
popd_build popd_build
} }

4
libserene/lib/reader/reader.cpp
View File

@ -179,8 +179,8 @@ const char *Reader::nextChar(bool skipWhitespace, unsigned count) {
return c; return c;
}; };
bool Reader::isEndOfBuffer(const unsigned char *c) { bool Reader::isEndOfBuffer(const char *c) {
return *c == '\0' || currentPos > buf.size() || *c == EOF; return *c == '\0' || currentPos > buf.size() || ((const int)*c == EOF);
}; };
Location Reader::getCurrentLocation() { return currentLocation.clone(); }; Location Reader::getCurrentLocation() { return currentLocation.clone(); };