diff options
author | Allen Winter <allen.winter@kdab.com> | 2021-11-07 10:24:34 -0500 |
---|---|---|
committer | Allen Winter <allen.winter@kdab.com> | 2021-11-07 10:24:34 -0500 |
commit | 0360a7b6edcc909402556913a8c57e15727ff512 (patch) | |
tree | 5f9a43a28d71ed5235fe1f7805c13c109e9a79dc | |
parent | 32e49e8f285ecb5416ed950b6049c27c66e5eb4e (diff) | |
download | libical-git-0360a7b6edcc909402556913a8c57e15727ff512.tar.gz |
appveyor - try again to setup msvc env
-rw-r--r-- | appveyor.yml | 15 | ||||
-rw-r--r-- | scripts/set_compiler_env.bat | 16 |
2 files changed, 9 insertions, 22 deletions
diff --git a/appveyor.yml b/appveyor.yml index 1b6a1397..175712c1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -42,28 +42,15 @@ configuration: - Release - Debug -environment: - VCVAR2013: 'C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat' - VCVAR2019: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat' - install: - sh: if [ "`uname -s`" = "Darwin" ]; then export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig; export XML_CATALOG_FILES=/usr/local/etc/xml/catalog; brew install pkg-config ninja gtk-doc glib libxml2 icu4c berkeley-db gobject-introspection vala; else sudo apt-get -y install gtk-doc-tools xml-core libdb-dev gobject-introspection libgirepository1.0-dev valac; fi before_build: - - ps: | - # ...example script to set the proper flags for vcvarsall ... - # syntax: vcvarsall.bat [architecture] [platform_type] [winsdk_version] [-vcvars_ver=vcversion] - $Architecture = $env:PLATFORM # simplified, works for x86 and x64 - if ("$env:APPVEYOR_BUILD_WORKER_IMAGE" -eq "Visual Studio 2013") { - $env:VCVARSALL = "`"$env:VCVAR2013`" $Architecture" - } else { - $env:VCVARSALL = "`"$env:VCVAR2019`" $Architecture" - } + - cmd: call scripts\set_compiler_env.bat build_script: - mkdir build - cd build - - cmd: call %VCVARSALL% - cmd: cmake -G Ninja -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DLIBICAL_BUILD_TESTING=True -DENABLE_GTK_DOC=True -DICAL_GLIB=False .. - sh: if [ "`uname -s`" = "Darwin" ]; then BUILD_EXTRAS="False"; else BUILD_EXTRAS="True"; fi; cmake -G Ninja -DCMAKE_BUILD_TYPE=$CONFIGURATION -DLIBICAL_BUILD_TESTING=True -DENABLE_GTK_DOC=True -DICAL_GLIB=True -DGOBJECT_INTROSPECTION=$BUILD_EXTRAS -DICAL_GLIB_VAPI=$BUILD_EXTRAS .. - cmake --build . diff --git a/scripts/set_compiler_env.bat b/scripts/set_compiler_env.bat index 6bbe2a89..47d7c50f 100644 --- a/scripts/set_compiler_env.bat +++ b/scripts/set_compiler_env.bat @@ -3,35 +3,35 @@ :: Now we declare a scope Setlocal EnableDelayedExpansion EnableExtensions -if not defined Configuration set Configuration=2015 +if not defined APPVEYOR_BUILD_WORKER_IMAGE set APPVEYOR_BUILD_WORKER_IMAGE="Visual Studio 2019" -if "%Configuration%"=="MinGW" ( goto :mingw ) +if "%USE_MINGW%"=="MinGW" ( goto :mingw ) set arch=x86 if "%platform%" EQU "x64" ( set arch=x86_amd64 ) -if "%Configuration%"=="2019" ( +if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2019" ( set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" ) -if "%Configuration%"=="2015" ( +if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" ( set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" ) -if "%Configuration%"=="2013" ( +if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2013" ( set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" ) -if "%Configuration%"=="2012" ( +if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2012" ( set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" ) -if "%Configuration%"=="2010" ( +if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2010" ( set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" ) -if "%Configuration%"=="2008" ( +if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2008" ( set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" ) |