Skip to content

GitLab

OpenMesh
OpenMesh
Commit c48e9578 authored by Jan Möbius's avatar Jan Möbius
Browse files
Options

Merge branch 'windows_ci_fix' into 'master' 

Windows fix for CI paths

See merge request !140
parents d3e50aed c73b5ac1
Pipeline #5460 passed with stage
    in 43 minutes and 46 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 16 additions and 16 deletions
    CI/Windows.bat
    View file @ c48e9578
    ......@@ -17,54 +17,54 @@ IF "%SHARED%" == "TRUE" (
    )
    IF "%BUILD_PLATFORM%" == "VS2012" (
    set LIBPATH=C:\libs\VS2012
    set LIBPATH=E:\libs\VS2012
    set GTESTVERSION=gtest-1.6.0
    set GENERATOR=Visual Studio 11%ARCH_VS%
    set VS_PATH="C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\IDE\devenv.com"
    set QT_VERSION=
    IF "%ARCHITECTURE%" == "x64" (
    set QT_INSTALL_PATH=C:\Qt\4.8.5-vs2012-%STRING_ARCH%\
    set QT_BASE_CONFIG=-DQT_QMAKE_EXECUTABLE=C:\Qt\4.8.5-vs2012-%STRING_ARCH%\bin\qmake.exe
    set QT_INSTALL_PATH=E:\Qt\4.8.5-vs2012-%STRING_ARCH%\
    set QT_BASE_CONFIG=-DQT_QMAKE_EXECUTABLE=E:\Qt\4.8.5-vs2012-%STRING_ARCH%\bin\qmake.exe
    )
    IF "%ARCHITECTURE%" == "x32" (
    set QT_INSTALL_PATH=C:\Qt\4.8.5-vs2012-%STRING_ARCH%\
    set QT_BASE_CONFIG=-DQT_QMAKE_EXECUTABLE=C:\Qt\4.8.5-vs2012-%STRING_ARCH%\bin\qmake.exe
    set QT_INSTALL_PATH=E:\Qt\4.8.5-vs2012-%STRING_ARCH%\
    set QT_BASE_CONFIG=-DQT_QMAKE_EXECUTABLE=E:\Qt\4.8.5-vs2012-%STRING_ARCH%\bin\qmake.exe
    )
    )
    IF "%BUILD_PLATFORM%" == "VS2013" (
    set LIBPATH=C:\libs\VS2013
    set LIBPATH=E:\libs\VS2013
    set GTESTVERSION=gtest-1.6.0
    set GENERATOR=Visual Studio 12%ARCH_VS%
    set VS_PATH="C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\devenv.com"
    set QT_VERSION=
    IF "%ARCHITECTURE%" == "x64" (
    set QT_INSTALL_PATH=C:\Qt\Qt5.3.1-vs2013-%STRING_ARCH%\5.3\msvc2013_64_opengl
    set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=C:\Qt\Qt5.3.1-vs2013-%STRING_ARCH%\5.3\msvc2013_64_opengl
    set QT_INSTALL_PATH=E:\Qt\Qt5.3.1-vs2013-%STRING_ARCH%\5.3\msvc2013_64_opengl
    set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\Qt5.3.1-vs2013-%STRING_ARCH%\5.3\msvc2013_64_opengl
    )
    IF "%ARCHITECTURE%" == "x32" (
    set QT_INSTALL_PATH=C:\Qt\Qt5.3.1-vs2013-%STRING_ARCH%\5.3\msvc2013_opengl
    set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=C:\Qt\Qt5.3.1-vs2013-%STRING_ARCH%\5.3\msvc2013_opengl
    set QT_INSTALL_PATH=E:\Qt\Qt5.3.1-vs2013-%STRING_ARCH%\5.3\msvc2013_opengl
    set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\Qt5.3.1-vs2013-%STRING_ARCH%\5.3\msvc2013_opengl
    )
    )
    IF "%BUILD_PLATFORM%" == "VS2015" (
    set LIBPATH=C:\libs\VS2015
    set LIBPATH=E:\libs\VS2015
    set GTESTVERSION=gtest-1.7.0
    set GENERATOR=Visual Studio 14%ARCH_VS%
    set VS_PATH="C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\devenv.com"
    set QT_VERSION=
    IF "%ARCHITECTURE%" == "x64" (
    set QT_INSTALL_PATH=C:\Qt\Qt5.6.0-vs2015-%STRING_ARCH%\5.6\msvc2015_64
    set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=C:\Qt\Qt5.6.0-vs2015-%STRING_ARCH%\5.6\msvc2015_64
    set QT_INSTALL_PATH=E:\Qt\Qt5.6.0-vs2015-%STRING_ARCH%\5.6\msvc2015_64
    set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\Qt5.6.0-vs2015-%STRING_ARCH%\5.6\msvc2015_64
    )
    IF "%ARCHITECTURE%" == "x32" (
    set QT_INSTALL_PATH=C:\Qt\Qt5.6.0-vs2015-%STRING_ARCH%\5.6\msvc2015
    set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=C:\Qt\Qt5.6.0-vs2015-%STRING_ARCH%\5.6\msvc2015
    set QT_INSTALL_PATH=E:\Qt\Qt5.6.0-vs2015-%STRING_ARCH%\5.6\msvc2015
    set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\Qt5.6.0-vs2015-%STRING_ARCH%\5.6\msvc2015
    )
    )
    ......@@ -93,7 +93,7 @@ IF "%APPS%" == "ON" (
    )
    "C:\Program Files (x86)\CMake\bin\cmake.exe" -DGTEST_PREFIX="%LIBPATH%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=Release -DBUILD_APPS=%APPS% -DOPENMESH_BUILD_UNIT_TESTS=TRUE -DOPENMESH_BUILD_SHARED=%SHARED% %CMAKE_CONFIGURATION% ..
    "C:\Program Files (x86)\CMake\bin\cmake.exe" -DGTEST_PREFIX="%LIBPATH%\%ARCHITECTURE%\%GTESTVERSION%" -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=Release -DBUILD_APPS=%APPS% -DOPENMESH_BUILD_UNIT_TESTS=TRUE -DCMAKE_WINDOWS_LIBS_DIR="e:\libs" -DOPENMESH_BUILD_SHARED=%SHARED% %CMAKE_CONFIGURATION% ..
    %VS_PATH% /Build "Release" OpenMesh.sln /Project "ALL_BUILD"
    ......
    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