diff --git a/CI/ci-windows.bat b/CI/ci-windows.bat index 0245bb1d2f7b987b8b08ea810256b43f158efbb7..edd53257537def79e8ad6ad38ae4820b0bceb561 100644 --- a/CI/ci-windows.bat +++ b/CI/ci-windows.bat @@ -115,6 +115,12 @@ for /l %%x in (0, 1, 3) do ( set QWT6_LIBRARY=%LIBPATH_BASE%\%ARCHITECTURE%\qwt-6.1.%%x-qt%QT_REV_LONG%\lib\qwt.lib set QWT6_LIBRARY_DIR=%LIBPATH_BASE%\%ARCHITECTURE%\qwt-6.1.%%x-qt%QT_REV_LONG%\lib ) +:: unfortunately qwt is not named consistently in our repos so we also have to check for a different folder named + if exist %LIBPATH_BASE%\%ARCHITECTURE%\qwt-6.1.%%x-qt-%QT_REV_LONG%\include ( + set QWT6_INCLUDE_DIR=%LIBPATH_BASE%\%ARCHITECTURE%\qwt-6.1.%%x-qt-%QT_REV_LONG%\include + set QWT6_LIBRARY=%LIBPATH_BASE%\%ARCHITECTURE%\qwt-6.1.%%x-qt-%QT_REV_LONG%\lib\qwt.lib + set QWT6_LIBRARY_DIR=%LIBPATH_BASE%\%ARCHITECTURE%\qwt-6.1.%%x-qt-%QT_REV_LONG%\lib + ) )