From: Steve Lhomme <slhomme@matroska.org>
Date: Sun, 16 Oct 2022 14:24:06 +0000 (+0200)
Subject: CI: split general/libmatroska configure arguments
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=468b1fa0ad790517c0f94d410ea05ae8d16f31e8;p=libmatroska

CI: split general/libmatroska configure arguments
---

diff --git a/.github/workflows/linux-gcc10.yaml b/.github/workflows/linux-gcc10.yaml
index 03adc20..206798d 100644
--- a/.github/workflows/linux-gcc10.yaml
+++ b/.github/workflows/linux-gcc10.yaml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       CMAKE_OPTIONS: -DCMAKE_CXX_EXTENSIONS=OFF
-      CMAKE_MATROSKA_OPTIONS: ${{ env.CMAKE_OPTIONS }} -DBUILD_EXAMPLES=ON
+      CMAKE_MATROSKA_OPTIONS: -DBUILD_EXAMPLES=ON
     steps:
       - uses: lukka/get-cmake@latest
 
@@ -38,7 +38,7 @@ jobs:
         run: cmake --install libebml/_build --prefix ${GITHUB_WORKSPACE}/_built
 
       - name: Configure CMake
-        run: cmake -S . -B _build  ${{ env.CMAKE_MATROSKA_OPTIONS }} -DEBML_DIR="${GITHUB_WORKSPACE}/_built/lib/cmake/EBML"
+        run: cmake -S . -B _build  ${{ env.CMAKE_OPTIONS }} ${{ env.CMAKE_MATROSKA_OPTIONS }} -DEBML_DIR="${GITHUB_WORKSPACE}/_built/lib/cmake/EBML"
         env:
           CC:  gcc-10
           CXX: g++-10
diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml
index e226190..696340c 100644
--- a/.github/workflows/linux.yaml
+++ b/.github/workflows/linux.yaml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       CMAKE_OPTIONS: -DCMAKE_CXX_EXTENSIONS=OFF
-      CMAKE_MATROSKA_OPTIONS: ${{ env.CMAKE_OPTIONS }} -DBUILD_EXAMPLES=ON
+      CMAKE_MATROSKA_OPTIONS: -DBUILD_EXAMPLES=ON
     steps:
       - uses: lukka/get-cmake@latest
 
@@ -35,7 +35,7 @@ jobs:
         run: cmake --install libebml/_build --prefix ${GITHUB_WORKSPACE}/_built
 
       - name: Configure CMake 
-        run: cmake -S . -B _build  ${{ env.CMAKE_MATROSKA_OPTIONS }} -DEBML_DIR="${GITHUB_WORKSPACE}/_built/lib/cmake/EBML"
+        run: cmake -S . -B _build  ${{ env.CMAKE_OPTIONS }} ${{ env.CMAKE_MATROSKA_OPTIONS }} -DEBML_DIR="${GITHUB_WORKSPACE}/_built/lib/cmake/EBML"
 
       - name: Build
         run: cmake --build _build --parallel
diff --git a/.github/workflows/macos.yaml b/.github/workflows/macos.yaml
index a5040ba..c3febda 100644
--- a/.github/workflows/macos.yaml
+++ b/.github/workflows/macos.yaml
@@ -15,7 +15,7 @@ jobs:
         arch:   [x86_64, arm64]
     env:
       CMAKE_OPTIONS: -DCMAKE_CXX_EXTENSIONS=OFF
-      CMAKE_MATROSKA_OPTIONS: ${{ env.CMAKE_OPTIONS }} -DBUILD_EXAMPLES=ON
+      CMAKE_MATROSKA_OPTIONS: -DBUILD_EXAMPLES=ON
     steps:
       - uses: lukka/get-cmake@latest
 
@@ -39,7 +39,7 @@ jobs:
         run: cmake --install libebml/_build --prefix ${GITHUB_WORKSPACE}/_built
 
       - name: Configure CMake 
-        run: cmake -S . -B _build ${{ env.CMAKE_MATROSKA_OPTIONS }} -DCMAKE_OSX_ARCHITECTURES="${{ matrix.arch }}" -DEBML_DIR="${GITHUB_WORKSPACE}/_built/lib/cmake/EBML"
+        run: cmake -S . -B _build ${{ env.CMAKE_OPTIONS }} ${{ env.CMAKE_MATROSKA_OPTIONS }} -DCMAKE_OSX_ARCHITECTURES="${{ matrix.arch }}" -DEBML_DIR="${GITHUB_WORKSPACE}/_built/lib/cmake/EBML"
 
       - name: Build with CMake
         run: cmake --build _build --parallel
diff --git a/.github/workflows/uwp.yaml b/.github/workflows/uwp.yaml
index f6c041f..aaf2264 100644
--- a/.github/workflows/uwp.yaml
+++ b/.github/workflows/uwp.yaml
@@ -19,7 +19,7 @@ jobs:
         ]
     env:
       CMAKE_OPTIONS: -DCMAKE_CXX_EXTENSIONS=OFF -DCMAKE_SYSTEM_NAME="WindowsStore" -DCMAKE_SYSTEM_VERSION="10.0" -DCMAKE_CXX_FLAGS_INIT="-DWINVER=0x0A00 -DWINAPI_FAMILY=WINAPI_FAMILY_PC_APP"
-      CMAKE_MATROSKA_OPTIONS: ${{ env.CMAKE_OPTIONS }} -DBUILD_EXAMPLES=ON
+      CMAKE_MATROSKA_OPTIONS: -DBUILD_EXAMPLES=ON
     steps:
       - uses: lukka/get-cmake@latest
 
@@ -43,7 +43,7 @@ jobs:
         run: cmake --install libebml/_build --config ${{ matrix.config }} --prefix ${GITHUB_WORKSPACE}/_built
 
       - name: Configure library
-        run: cmake -S . -B _build ${{ env.CMAKE_MATROSKA_OPTIONS }} -A ${{ matrix.arch.option }} -DEBML_DIR="${GITHUB_WORKSPACE}/_built/lib/cmake/EBML" -DBUILD_SHARED_LIBS=OFF
+        run: cmake -S . -B _build ${{ env.CMAKE_OPTIONS }} ${{ env.CMAKE_MATROSKA_OPTIONS }} -A ${{ matrix.arch.option }} -DEBML_DIR="${GITHUB_WORKSPACE}/_built/lib/cmake/EBML" -DBUILD_SHARED_LIBS=OFF
 
       - name: Build
         run: cmake --build _build --config ${{ matrix.config }} --parallel
diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml
index 8c68afe..3137f5b 100644
--- a/.github/workflows/windows.yaml
+++ b/.github/workflows/windows.yaml
@@ -24,7 +24,7 @@ jobs:
         ]
     env:
       CMAKE_OPTIONS: -DCMAKE_CXX_EXTENSIONS=OFF -DCMAKE_CXX_FLAGS_INIT="-DWINVER=0x0501"
-      CMAKE_MATROSKA_OPTIONS: ${{ env.CMAKE_OPTIONS }} -DBUILD_EXAMPLES=ON
+      CMAKE_MATROSKA_OPTIONS: -DBUILD_EXAMPLES=ON
     steps:
       - uses: lukka/get-cmake@latest
 
@@ -48,7 +48,7 @@ jobs:
         run: cmake --install libebml/_build --config ${{ matrix.config }} --prefix ${GITHUB_WORKSPACE}/_built
 
       - name: Configure ${{ matrix.shared.name }} library
-        run: cmake -S . -B _build ${{ env.CMAKE_MATROSKA_OPTIONS }} -A ${{ matrix.arch.option }} -DEBML_DIR="${GITHUB_WORKSPACE}/_built/lib/cmake/EBML" -DBUILD_SHARED_LIBS=${{ matrix.shared.option }}
+        run: cmake -S . -B _build ${{ env.CMAKE_OPTIONS }} ${{ env.CMAKE_MATROSKA_OPTIONS }} -A ${{ matrix.arch.option }} -DEBML_DIR="${GITHUB_WORKSPACE}/_built/lib/cmake/EBML" -DBUILD_SHARED_LIBS=${{ matrix.shared.option }}
 
       - name: Build
         run: cmake --build _build --config ${{ matrix.config }} --parallel