Skip to content

GitLab

Commit 65dd0a91 authored by Jan Möbius's avatar Jan Möbius
Browse files
Options

Merge branch 'Try_FixBundle_Fix' into 'master' 

Try to fix windows fixbundle error on qwt

See merge request !360
parents 6ab95799 1b70d076
Pipeline #14913 passed with stages
        in 84 minutes and 32 seconds
        Hide whitespace changes
        Inline Side-by-side
        Showing with 13 additions and 13 deletions
        CI/ci-windows-config.bat
        View file @ 65dd0a91
        ......@@ -72,30 +72,30 @@ set QT_SUFFIX=
        set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\%QT_VERSION%\%QT_REV%\%QT_COMPILERPREFIX%%ARCHBITS%%QT_SUFFIX%
        :: set up Libraty Paths
        set LIBPATH_BASE=E:\libs\%COMPILER%
        set CMAKE_WINDOWS_LIBS_DIR=E:\libs
        set LIBPATH_BASE=E:/libs/%COMPILER%
        set CMAKE_WINDOWS_LIBS_DIR=E:/libs
        :: check for gtest version 1.6 or 1.7 use the highest found version
        for /l %%x in (6, 1, 7) do (
        if exist %LIBPATH_BASE%\%ARCHITECTURE%\gtest-1.%%x.0 (
        if exist %LIBPATH_BASE%/%ARCHITECTURE%/gtest-1.%%x.0 (
        set GTESTVERSION=gtest-1.%%x.0
        )
        )
        :: check for qwt version 6.1.1 to 6.1.3 use the highest found version
        for /l %%x in (0, 1, 5) do (
        echo "Checking for QWT in : %LIBPATH_BASE%\%ARCHITECTURE%\qwt-6.1.%%x-qt%QT_REV_LONG%\include"
        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
        echo "Checking for QWT in : %LIBPATH_BASE%/%ARCHITECTURE%/qwt-6.1.%%x-qt%QT_REV_LONG%/include"
        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
        )
        :: unfortunately qwt is not named consistently in our repos so we also have to check for a different folder named
        echo "Checking for QWT in : %LIBPATH_BASE%\%ARCHITECTURE%\qwt-6.1.%%x-qt-%QT_REV_LONG%\include"
        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
        echo "Checking for QWT in : %LIBPATH_BASE%/%ARCHITECTURE%/qwt-6.1.%%x-qt-%QT_REV_LONG%/include"
        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
        )
        )
        ......
        Markdown is supported
        0% or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment