Commit aff8e7e7 authored by Jan Kiene's avatar Jan Kiene
Browse files

cleanup build tool calls

parent 2d514a34

.gitlab-ci.yml

+6 −6
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ build-codec-linux-make: 
    - .rules-basis

  script:

    - *print-common-info

    - make -j 2>&1 | tee $BUILD_OUTPUT

    - make -j



build-codec-linux-cmake:

  extends:
@@ -320,7 +320,7 @@ build-codec-linux-cmake: 
    - cd build

    - cmake ..

    - cd ..

    - make -C build -j 2>&1 | tee $BUILD_OUTPUT

    - make -C build -j



build-codec-instrumented-linux:

  extends:
@@ -346,7 +346,7 @@ build-codec-include-split-linux-make: 
    - .rules-basis

  script:

    - *print-common-info

    - make -j INCLUDE_SPLIT=1 2>&1 | tee $BUILD_OUTPUT

    - make -j INCLUDE_SPLIT=1



build-codec-include-split-linux-cmake:

  extends:
@@ -358,7 +358,7 @@ build-codec-include-split-linux-cmake: 
    - cd build

    - cmake .. -DINCLUDE_SPLIT=1

    - cd ..

    - make -C build -j 2>&1 | tee $BUILD_OUTPUT

    - make -C build -j



build-codec-windows-cmake:

  extends:
@@ -368,7 +368,7 @@ build-codec-windows-cmake: 
    - *print-common-info-windows

    - $winoutdata = $null

    - cmake -G "Visual Studio 15 2017" . -Bbuild

    - cmake --build build -j | tee -variable winoutdata

    - cmake --build build -j



build-codec-windows-include-split-cmake:

  extends:
@@ -378,7 +378,7 @@ build-codec-windows-include-split-cmake: 
    - *print-common-info-windows

    - $winoutdata = $null

    - cmake -DINCLUDE_SPLIT=1 -G "Visual Studio 15 2017" . -Bbuild

    - cmake --build build -j | tee -variable winoutdata

    - cmake --build build -j



build-codec-windows-msbuild:

  extends: