From ea2c8543d3a1986bede720f6052d3e2643efbdb8 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Sun, 3 Feb 2019 19:00:03 +0100 Subject: [PATCH] Build some samples on AppVeyor with CMake Remove unused toolsets. Remove extra popd. --- build/tools/appveyor.bat | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/build/tools/appveyor.bat b/build/tools/appveyor.bat index 17a14d0369..35fb5a5ccf 100644 --- a/build/tools/appveyor.bat +++ b/build/tools/appveyor.bat @@ -52,32 +52,6 @@ bash -lc "g++ --version" bash -lc "LDFLAGS=-L/usr/lib/w32api ./configure --disable-optimise --disable-shared && make -j3 && make -j3 -C tests" goto :eof -:cmake_msys -if "%MSYSTEM%"=="" set MSYSTEM=MINGW32 -path C:\msys64\%MSYSTEM%\bin;C:\msys64\usr\bin;%path% -set GENERATOR=MSYS Makefiles -set SKIPTESTS=1 -set SKIPINSTALL=1 -set CMAKE_NATIVE_FLAGS=-j3 -goto cmake - -:cmake_cygwin -C:\cygwin\setup-x86.exe -qnNdO -R C:/cygwin -s http://cygwin.mirror.constant.com -l C:/cygwin/var/cache/setup -P libjpeg-devel -P libpng-devel -P libtiff-devel -P libexpat-devel -path c:\cygwin\bin;%path% -set GENERATOR=Unix Makefiles -set SKIPTESTS=1 -set SKIPINSTALL=1 -set CMAKE_NATIVE_FLAGS=-j3 -goto cmake - -:cmake_mingw -:: CMake requires a path without sh (added by git on AppVeyor) -path C:\Program Files (x86)\CMake\bin;C:\MinGW\bin -set GENERATOR=MinGW Makefiles -set SKIPTESTS=1 -set CMAKE_NATIVE_FLAGS=-j3 -goto cmake - :cmake_qt set SKIPINSTALL=1 set QT5DIR="C:\Qt\5.11\msvc2015_64" @@ -106,7 +80,7 @@ set WX_INSTALL_PATH=%HOMEDRIVE%%HOMEPATH%\wx_install_target mkdir %WX_INSTALL_PATH% mkdir build_cmake pushd build_cmake -cmake -G "%GENERATOR%" -DwxBUILD_TESTS=%BUILD_TESTS% -DCMAKE_INSTALL_PREFIX=%WX_INSTALL_PATH% -DwxBUILD_SHARED=%SHARED% %CMAKE_CONFIGURE_FLAGS% .. +cmake -G "%GENERATOR%" -DwxBUILD_TESTS=%BUILD_TESTS% -DwxBUILD_SAMPLES=SOME -DCMAKE_INSTALL_PREFIX=%WX_INSTALL_PATH% -DwxBUILD_SHARED=%SHARED% %CMAKE_CONFIGURE_FLAGS% .. if ERRORLEVEL 1 goto error echo. echo --- Starting the build @@ -141,7 +115,6 @@ if NOT "%SKIPINSTALL%"=="1" ( echo --- Building minimal sample with installed library cmake --build . --config %CONFIGURATION% -- %CMAKE_LOGGER% if ERRORLEVEL 1 goto error - popd ) popd