diff --git a/.ci/script.sh b/.ci/script.sh index 215e415b108e3e76ae4cc2cc2b50caab05653861..93a2287dc2e048b89dcc00f8b8b9a7f1a7d4d2e0 100755 --- a/.ci/script.sh +++ b/.ci/script.sh @@ -36,16 +36,13 @@ fi if [ $TRAVIS_OS_NAME == osx ]; then # Build the library. - export OPENSSL_ROOT_DIR=/usr/local/opt/openssl cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release \ - -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl \ - -DOPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include \ -DBUILD_LIB_TESTS=OFF \ + -DBUILD_LIB_EXAMPLES=OFF \ -DBUILD_SHARED_LIBS=ON \ -DHUNTER_ENABLED=ON \ -DHUNTER_CONFIGURATION_TYPES=Release \ -DHUNTER_ROOT=.deps \ - -DUSE_BUNDLED_OPENSSL=OFF \ -DUSE_BUNDLED_GTEST=OFF || true cmake --build build diff --git a/.travis.yml b/.travis.yml index 3d54360291cbff67b901a9eb269c1a901f3fd1f5..fa0fe1162e281a5afb7e89cadfb682dd17b08a6e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ notifications: matrix: include: - os: osx - osx_image: xcode10.2 # for c++17 + osx_image: xcode11.3 # for c++17 compiler: clang addons: homebrew: diff --git a/CMakeLists.txt b/CMakeLists.txt index e2465c58cbaa84cb176e19317657edcb64eb21fc..3c483cf86da88959cc3ccbb70471e1442e5d7c14 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,8 +36,7 @@ option(USE_BUNDLED_ZLIB "Use the bundled version of zlib." project(matrix_client VERSION 0.3.0 DESCRIPTION "Client API library for Matrix, built on top of Boost.Asio" - HOMEPAGE_URL https://github.com/Nheko-Reborn/mtxclient - LANGUAGES CXX C) + HOMEPAGE_URL https://github.com/Nheko-Reborn/mtxclient) option(ASAN "Compile with address sanitizers" OFF) option(BUILD_LIB_TESTS "Build tests" ON)