diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9880c81297e262095708e970dff66009f55d1433..e4c12177e7e7d85469d1bc3ab9ddad5b690dc4fb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,14 +30,18 @@ windows: variables: GIT_DEPTH: "1" # shallow cloning script: - - $OPTLIBS = "C:/opt/x64" - - $FFTW3_INCLUDE_DIR = "$OPTLIBS/include" - - $FFTW3_LIB = "$OPTLIBS/lib/libfftw3-3.lib" - - $QTDIR = "C:/Qt/current/msvc2019_64" - - $QTCMake_DIR = "$QTDIR/lib/cmake" + - $OPT_DIR = "C:/opt/new/x64" + - $FFTW3_INCLUDE_DIR = "$OPT_DIR/include" + - $FFTW3_LIB = "$OPT_DIR/lib/libfftw3-3.lib" + - $BOOST_DIR = "$OPT_DIR/boost_current" + - $BOOST_INCLUDE_DIR = "$BOOST_DIR/include" + - $BOOST_LIB_DIR = "$BOOST_DIR/lib" + - $QT_MSVC_DIR = "C:/Qt/msvc" + - $QTCMake_DIR = "$QT_MSVC_DIR/lib/cmake" - $BUILD_DIR = "build" - echo "#--- DIAGNOSTICS ---" # list powershell properties + - echo "# Path <$Env:Path>" - echo "# Powershell <$PSHOME>`n PS Profile <$PROFILE>`n PS Command-Path <$PSCOMMANDPATH>" # list all environmental variables - echo "----------------------------------------" @@ -49,7 +53,7 @@ windows: - pwd - echo "#--- CONFIGURE ---" - cmake --version - - cmake -G "Visual Studio 16 2019" -A x64 -T host=x64 -DLIB_MAN=OFF -DQTDIR="$QTDIR" -DQt5_DIR="$QTCMake_DIR/Qt5" -DQt5Test_DIR="$QTCMake_DIR/Qt5Test" -DFFTW3_INCLUDE_DIR="$FFTW3_INCLUDE_DIR" -DFFTW3_LIBRARY="$FFTW3_LIB" -DCMAKE_INCLUDE_PATH="$OPTLIBS/include" -DCMAKE_LIBRARY_PATH="$OPTLIBS/lib" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_CXX_COMPILER="cl.exe" -B. .. + - cmake -G "Visual Studio 16 2019" -A x64 -T host=x64 -DLIB_MAN=OFF -DQTDIR="$QT_MSVC_DIR" -DQt5_DIR="$QTCMake_DIR/Qt5" -DQt5Test_DIR="$QTCMake_DIR/Qt5Test" -DFFTW3_INCLUDE_DIR="$FFTW3_INCLUDE_DIR" -DFFTW3_LIBRARY="$FFTW3_LIB" -DCMAKE_INCLUDE_PATH="$OPT_DIR/include;$BOOST_INCLUDE_DIR" -DCMAKE_LIBRARY_PATH="$OPT_DIR/lib;$BOOST_LIB_DIR" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_CXX_COMPILER="cl.exe" -B. .. - echo "#--- BUILD ---" - pwd - cmake --build . --config Release --clean-first