diff --git a/ci/appveyor/emulate_appveyor.bat b/ci/appveyor/emulate_appveyor.bat index 7efb532..0ff8981 100644 --- a/ci/appveyor/emulate_appveyor.bat +++ b/ci/appveyor/emulate_appveyor.bat @@ -2,6 +2,7 @@ cd /d %~dp0 cd ..\.. +set APPVEYOR=True set APPVEYOR_BUILD_FOLDER=%cd% echo Emulating appveyor's environment. echo APPVEYOR_BUILD_FOLDER set to '%APPVEYOR_BUILD_FOLDER%' diff --git a/ci/appveyor/install_googletest.bat b/ci/appveyor/install_googletest.bat index 43b3d94..73d6369 100644 --- a/ci/appveyor/install_googletest.bat +++ b/ci/appveyor/install_googletest.bat @@ -25,7 +25,7 @@ echo =========================================================================== mkdir build >NUL 2>NUL cd build set GTEST_ROOT=%APPVEYOR_BUILD_FOLDER%\third_parties\googletest\install -cmake -DCMAKE_INSTALL_PREFIX=%GTEST_ROOT% -Dgtest_force_shared_crt=ON .. +cmake -DCMAKE_INSTALL_PREFIX=%GTEST_ROOT% -Dgtest_force_shared_crt=ON -DBUILD_GMOCK=OFF -DBUILD_GTEST=ON .. if %errorlevel% neq 0 exit /b %errorlevel% cmake --build . --config Release if %errorlevel% neq 0 exit /b %errorlevel% diff --git a/ci/travis/emulate_travis.sh b/ci/travis/emulate_travis.sh index c89268f..3d08a4b 100755 --- a/ci/travis/emulate_travis.sh +++ b/ci/travis/emulate_travis.sh @@ -1,5 +1,6 @@ restore_dir=$PWD cd ../.. +export TRAVIS=true export TRAVIS_BUILD_DIR=$PWD echo "TRAVIS_BUILD_DIR set to $TRAVIS_BUILD_DIR" cd $restore_dir diff --git a/ci/travis/install_googletest.sh b/ci/travis/install_googletest.sh index ba6f4c1..2185608 100755 --- a/ci/travis/install_googletest.sh +++ b/ci/travis/install_googletest.sh @@ -26,7 +26,7 @@ echo =========================================================================== mkdir -p build cd build export GTEST_ROOT=$TRAVIS_BUILD_DIR/third_parties/googletest/install -cmake -DCMAKE_INSTALL_PREFIX=$GTEST_ROOT -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF .. +cmake -DCMAKE_INSTALL_PREFIX=$GTEST_ROOT -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DBUILD_GMOCK=OFF -DBUILD_GTEST=ON .. cmake --build . echo