From a2891d8367aa0bc28d680acb1a7af86b76488e86 Mon Sep 17 00:00:00 2001 From: Ian Craggs Date: Mon, 3 May 2021 18:10:15 +0100 Subject: [PATCH] Add some PAHO_HIGH_PERFORMANCE builds --- .travis.yml | 8 ++++---- appveyor.yml | 5 ++++- travis-build.sh | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 488d4681..befd03c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,18 +4,18 @@ jobs: - os: linux compiler: gcc dist: bionic - env: OPENSSL_ROOT_DIR= PAHO_BUILD_STATIC=TRUE PAHO_BUILD_SHARED=FALSE + env: OPENSSL_ROOT_DIR= PAHO_BUILD_STATIC=TRUE PAHO_BUILD_SHARED=FALSE PAHO_HIGH_PERFORMANCE=FALSE - os: linux compiler: gcc dist: xenial - env: OPENSSL_ROOT_DIR= PAHO_BUILD_STATIC=TRUE PAHO_BUILD_SHARED=TRUE + env: OPENSSL_ROOT_DIR= PAHO_BUILD_STATIC=TRUE PAHO_BUILD_SHARED=TRUE PAHO_HIGH_PERFORMANCE=TRUE - os: osx compiler: clang - env: OPENSSL_ROOT_DIR=/usr/local/opt/openssl PAHO_BUILD_STATIC=FALSE PAHO_BUILD_SHARED=TRUE + env: OPENSSL_ROOT_DIR=/usr/local/opt/openssl PAHO_BUILD_STATIC=FALSE PAHO_BUILD_SHARED=TRUE PAHO_HIGH_PERFORMANC=FALSE - os: linux compiler: gcc dist: trusty - env: OPENSSL_ROOT_DIR= PAHO_BUILD_STATIC=FALSE PAHO_BUILD_SHARED=TRUE + env: OPENSSL_ROOT_DIR= PAHO_BUILD_STATIC=FALSE PAHO_BUILD_SHARED=TRUE PAHO_HIGH_PERFORMANCE=FALSE before_install: #- if [ "$DEPLOY" = "true" ]; then ./travis-setup-deploy.sh; fi - "./travis-install.sh" diff --git a/appveyor.yml b/appveyor.yml index 334f86a3..6ab1abb4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,16 +7,19 @@ environment: OPENSSL_ROOT_DIR: "C:/OpenSSL-v111-Win64" PAHO_BUILD_STATIC: FALSE PAHO_BUILD_SHARED: TRUE + PAHO_HIGH_PERFORMANCE: FALSE - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 PAHO_WINDOWS_BUILD_BIT: x64 OPENSSL_ROOT_DIR: "C:/OpenSSL-Win64" PAHO_BUILD_STATIC: TRUE PAHO_BUILD_SHARED: FALSE + PAHO_HIGH_PERFORMANCE: TRUE - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 PAHO_WINDOWS_BUILD_BIT: x86 OPENSSL_ROOT_DIR: "C:/OpenSSL-Win32" PAHO_BUILD_STATIC: FALSE PAHO_BUILD_SHARED: TRUE + PAHO_HIGH_PERFORMANCE: TRUE configuration: Debug install: @@ -45,7 +48,7 @@ build_script: if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2013" call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" %PAHO_WINDOWS_BUILD_BIT% - cmake -G "NMake Makefiles" -DPAHO_WITH_SSL=TRUE -DOPENSSL_ROOT_DIR=%OPENSSL_ROOT_DIR% -DPAHO_BUILD_DOCUMENTATION=FALSE -DPAHO_BUILD_SAMPLES=TRUE -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=TRUE -DPAHO_BUILD_STATIC=%PAHO_BUILD_STATIC% -DPAHO_BUILD_SHARED=%PAHO_BUILD_SHARED% .. + cmake -G "NMake Makefiles" -DPAHO_WITH_SSL=TRUE -DOPENSSL_ROOT_DIR=%OPENSSL_ROOT_DIR% -DPAHO_BUILD_DOCUMENTATION=FALSE -DPAHO_BUILD_SAMPLES=TRUE -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=TRUE -DPAHO_BUILD_STATIC=%PAHO_BUILD_STATIC% -DPAHO_BUILD_SHARED=%PAHO_BUILD_SHARED% -DPAHO_HIGH_PERFORMANCE=%PAHO_HIGH_PERFORMANCE% .. nmake diff --git a/travis-build.sh b/travis-build.sh index 733833a2..669a22c2 100755 --- a/travis-build.sh +++ b/travis-build.sh @@ -6,7 +6,7 @@ rm -rf build.paho mkdir build.paho cd build.paho echo "travis build dir $TRAVIS_BUILD_DIR pwd $PWD with OpenSSL root $OPENSSL_ROOT_DIR" -cmake -DPAHO_BUILD_STATIC=$PAHO_BUILD_STATIC -DPAHO_BUILD_SHARED=$PAHO_BUILD_SHARED -DCMAKE_BUILD_TYPE=Debug -DPAHO_WITH_SSL=TRUE -DOPENSSL_ROOT_DIR=$OPENSSL_ROOT_DIR -DPAHO_BUILD_DOCUMENTATION=FALSE -DPAHO_BUILD_SAMPLES=TRUE .. +cmake -DPAHO_BUILD_STATIC=$PAHO_BUILD_STATIC -DPAHO_BUILD_SHARED=$PAHO_BUILD_SHARED -DCMAKE_BUILD_TYPE=Debug -DPAHO_WITH_SSL=TRUE -DOPENSSL_ROOT_DIR=$OPENSSL_ROOT_DIR -DPAHO_BUILD_DOCUMENTATION=FALSE -DPAHO_BUILD_SAMPLES=TRUE -DPAHO_HIGH_PERFORMANCE=$PAHO_HIGH_PERFORMANCE .. cmake --build . python3 ../test/mqttsas.py & ctest -VV --timeout 600