summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@outlook.com>2020-09-29 00:38:42 +0200
committerTiger Wang <ziwei.tiger@outlook.com>2020-09-30 23:05:17 +0200
commit7bc8d2ee26ec72be533030483a9047cc70473f99 (patch)
tree134b4e850dab45934d937f2d1bd5d4e551e78a5f
parentC++17 stuff (diff)
downloadcuberite-7bc8d2ee26ec72be533030483a9047cc70473f99.tar
cuberite-7bc8d2ee26ec72be533030483a9047cc70473f99.tar.gz
cuberite-7bc8d2ee26ec72be533030483a9047cc70473f99.tar.bz2
cuberite-7bc8d2ee26ec72be533030483a9047cc70473f99.tar.lz
cuberite-7bc8d2ee26ec72be533030483a9047cc70473f99.tar.xz
cuberite-7bc8d2ee26ec72be533030483a9047cc70473f99.tar.zst
cuberite-7bc8d2ee26ec72be533030483a9047cc70473f99.zip
-rw-r--r--.travis.yml12
-rw-r--r--CMake/AddDependencies.cmake15
m---------lib/SQLiteCpp0
3 files changed, 20 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index a78ec5656..d798c2e8c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,6 +26,18 @@ jobs:
- export PATH=/snap/bin/:${PATH}
env: *Debug
+ - name: "Clang 7.0 - Debug"
+ compiler: clang
+ arch: ppc64le
+ before_install: *use-cmake
+ env: *Debug
+
+ - name: "Clang 7.0 - Debug"
+ compiler: clang
+ arch: s390x
+ before_install: *use-cmake
+ env: *Debug
+
- name: "AppleClang - Debug"
os: osx
osx_image: xcode11.3
diff --git a/CMake/AddDependencies.cmake b/CMake/AddDependencies.cmake
index 971a338cc..f16e5a327 100644
--- a/CMake/AddDependencies.cmake
+++ b/CMake/AddDependencies.cmake
@@ -1,12 +1,13 @@
function(build_dependencies)
# Set options for SQLiteCpp, disable all their tests and lints:
- set(SQLITECPP_RUN_CPPLINT OFF CACHE BOOL "Run cpplint.py tool for Google C++ StyleGuide.")
- set(SQLITECPP_RUN_CPPCHECK OFF CACHE BOOL "Run cppcheck C++ static analysis tool.")
- set(SQLITECPP_RUN_DOXYGEN OFF CACHE BOOL "Run Doxygen C++ documentation tool.")
- set(SQLITECPP_BUILD_EXAMPLES OFF CACHE BOOL "Build examples.")
- set(SQLITECPP_BUILD_TESTS OFF CACHE BOOL "Build and run tests.")
- set(SQLITECPP_INTERNAL_SQLITE ON CACHE BOOL "Add the internal SQLite3 source to the project.")
- set(SQLITE_ENABLE_COLUMN_METADATA OFF CACHE BOOL "Enable Column::getColumnOriginName(). Require support from sqlite3 library.")
+ set(SQLITECPP_BUILD_EXAMPLES OFF CACHE BOOL "Build examples.")
+ set(SQLITECPP_BUILD_TESTS OFF CACHE BOOL "Build and run tests.")
+ set(SQLITECPP_INTERNAL_SQLITE ON CACHE BOOL "Add the internal SQLite3 source to the project.")
+ set(SQLITECPP_RUN_CPPCHECK OFF CACHE BOOL "Run cppcheck C++ static analysis tool.")
+ set(SQLITECPP_RUN_CPPLINT OFF CACHE BOOL "Run cpplint.py tool for Google C++ StyleGuide.")
+ set(SQLITECPP_RUN_DOXYGEN OFF CACHE BOOL "Run Doxygen C++ documentation tool.")
+ set(SQLITECPP_USE_STACK_PROTECTION OFF CACHE BOOL "USE Stack Protection hardening.")
+ set(SQLITE_ENABLE_COLUMN_METADATA OFF CACHE BOOL "Enable Column::getColumnOriginName(). Require support from sqlite3 library.")
# Set options for LibEvent, disable all their tests and benchmarks:
set(EVENT__DISABLE_OPENSSL YES CACHE BOOL "Disable OpenSSL in LibEvent")
diff --git a/lib/SQLiteCpp b/lib/SQLiteCpp
-Subproject 6aec7cf646e9d0e49b0000c3d5b74de9c3222ef
+Subproject a25ffb56ab1bae0f416ac5dfbddd4188ea3c1a9