diff options
| author | Allen Winter <allen.winter@kdab.com> | 2016-08-10 16:40:16 -0400 |
|---|---|---|
| committer | Allen Winter <allen.winter@kdab.com> | 2016-08-10 16:40:16 -0400 |
| commit | 660d71810273d46a9ae6f78163abb320b7f11bb2 (patch) | |
| tree | 46d3d8133421c68c3e145f2862f3677e332a34f3 /scripts/set_compiler_env.bat | |
| parent | 7e4c95db189bb039f7e4e636c33ab0215eac7518 (diff) | |
| download | libical-git-660d71810273d46a9ae6f78163abb320b7f11bb2.tar.gz | |
scripts/set_compiler_env.bat - adapt %PATH% for MinGW
can't have sh.ex in path or CMake will not work
Diffstat (limited to 'scripts/set_compiler_env.bat')
| -rw-r--r-- | scripts/set_compiler_env.bat | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/scripts/set_compiler_env.bat b/scripts/set_compiler_env.bat index 7e8462ec..3facfb72 100644 --- a/scripts/set_compiler_env.bat +++ b/scripts/set_compiler_env.bat @@ -12,23 +12,23 @@ set arch=x86 if "%platform%" EQU "x64" ( set arch=x86_amd64 ) if "%Configuration%"=="2015" ( - set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" + set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" ) if "%Configuration%"=="2013" ( - set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" + set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" ) if "%Configuration%"=="2012" ( - set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" + set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" ) if "%Configuration%"=="2010" ( - set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" + set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" ) if "%Configuration%"=="2008" ( - set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" + set SET_VS_ENV="C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" ) :: Visual Studio detected @@ -37,4 +37,7 @@ goto :eof :: MinGW detected :mingw +:: workaround for CMake not wanting sh.exe in PATH for MinGW +set PATH=%PATH:C:\Program Files (x86)\Git\bin;=% + endlocal & set PATH=c:\mingw\bin;%PATH% |