CI: split general/libmatroska configure arguments

diff --git a/.github/workflows/linux-gcc10.yaml b/.github/workflows/linux-gcc10.yaml
index 03adc201d51f6400a35bbfac2660d78e098ad64c..206798d86fdc59123bc21bb48a06d22bce4366e7 100644 (file)
--- a/.github/workflows/linux-gcc10.yaml
+++ b/.github/workflows/linux-gcc10.yaml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest\r
     env:\r
       CMAKE_OPTIONS: -DCMAKE_CXX_EXTENSIONS=OFF\r
-      CMAKE_MATROSKA_OPTIONS: ${{ env.CMAKE_OPTIONS }} -DBUILD_EXAMPLES=ON\r
+      CMAKE_MATROSKA_OPTIONS: -DBUILD_EXAMPLES=ON\r
     steps:\r
       - uses: lukka/get-cmake@latest\r
 \r
@@ -38,7 +38,7 @@ jobs:
         run: cmake --install libebml/_build --prefix ${GITHUB_WORKSPACE}/_built\r
 \r
       - name: Configure CMake\r
-        run: cmake -S . -B _build  ${{ env.CMAKE_MATROSKA_OPTIONS }} -DEBML_DIR="${GITHUB_WORKSPACE}/_built/lib/cmake/EBML"\r
+        run: cmake -S . -B _build  ${{ env.CMAKE_OPTIONS }} ${{ env.CMAKE_MATROSKA_OPTIONS }} -DEBML_DIR="${GITHUB_WORKSPACE}/_built/lib/cmake/EBML"\r
         env:\r
           CC:  gcc-10\r
           CXX: g++-10\r

diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml
index e2261904231288a8537dc8f236cd99c7bc02c6f6..696340cf7f159be298a5d58b596d6522dfe9f7ea 100644 (file)
--- a/.github/workflows/linux.yaml
+++ b/.github/workflows/linux.yaml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest\r
     env:\r
       CMAKE_OPTIONS: -DCMAKE_CXX_EXTENSIONS=OFF\r
-      CMAKE_MATROSKA_OPTIONS: ${{ env.CMAKE_OPTIONS }} -DBUILD_EXAMPLES=ON\r
+      CMAKE_MATROSKA_OPTIONS: -DBUILD_EXAMPLES=ON\r
     steps:\r
       - uses: lukka/get-cmake@latest\r
 \r
@@ -35,7 +35,7 @@ jobs:
         run: cmake --install libebml/_build --prefix ${GITHUB_WORKSPACE}/_built\r
 \r
       - name: Configure CMake \r
-        run: cmake -S . -B _build  ${{ env.CMAKE_MATROSKA_OPTIONS }} -DEBML_DIR="${GITHUB_WORKSPACE}/_built/lib/cmake/EBML"\r
+        run: cmake -S . -B _build  ${{ env.CMAKE_OPTIONS }} ${{ env.CMAKE_MATROSKA_OPTIONS }} -DEBML_DIR="${GITHUB_WORKSPACE}/_built/lib/cmake/EBML"\r
 \r
       - name: Build\r
         run: cmake --build _build --parallel\r

diff --git a/.github/workflows/macos.yaml b/.github/workflows/macos.yaml
index a5040ba1f751f45009d864b9e8805179bda2b1f5..c3febda362bbd935f32fd266cd7d4e577470fa35 100644 (file)
--- a/.github/workflows/macos.yaml
+++ b/.github/workflows/macos.yaml
@@ -15,7 +15,7 @@ jobs:
         arch:   [x86_64, arm64]\r
     env:\r
       CMAKE_OPTIONS: -DCMAKE_CXX_EXTENSIONS=OFF\r
-      CMAKE_MATROSKA_OPTIONS: ${{ env.CMAKE_OPTIONS }} -DBUILD_EXAMPLES=ON\r
+      CMAKE_MATROSKA_OPTIONS: -DBUILD_EXAMPLES=ON\r
     steps:\r
       - uses: lukka/get-cmake@latest\r
 \r
@@ -39,7 +39,7 @@ jobs:
         run: cmake --install libebml/_build --prefix ${GITHUB_WORKSPACE}/_built\r
 \r
       - name: Configure CMake \r
-        run: cmake -S . -B _build ${{ env.CMAKE_MATROSKA_OPTIONS }} -DCMAKE_OSX_ARCHITECTURES="${{ matrix.arch }}" -DEBML_DIR="${GITHUB_WORKSPACE}/_built/lib/cmake/EBML"\r
+        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"\r
 \r
       - name: Build with CMake\r
         run: cmake --build _build --parallel\r

diff --git a/.github/workflows/uwp.yaml b/.github/workflows/uwp.yaml
index f6c041f656660bc2feaafa965e02673cc1f0a4b8..aaf226407434cdfc1a41688cb115707b268034c7 100644 (file)
--- a/.github/workflows/uwp.yaml
+++ b/.github/workflows/uwp.yaml
@@ -19,7 +19,7 @@ jobs:
         ]\r
     env:\r
       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"\r
-      CMAKE_MATROSKA_OPTIONS: ${{ env.CMAKE_OPTIONS }} -DBUILD_EXAMPLES=ON\r
+      CMAKE_MATROSKA_OPTIONS: -DBUILD_EXAMPLES=ON\r
     steps:\r
       - uses: lukka/get-cmake@latest\r
 \r
@@ -43,7 +43,7 @@ jobs:
         run: cmake --install libebml/_build --config ${{ matrix.config }} --prefix ${GITHUB_WORKSPACE}/_built\r
 \r
       - name: Configure library\r
-        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\r
+        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\r
 \r
       - name: Build\r
         run: cmake --build _build --config ${{ matrix.config }} --parallel\r

diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml
index 8c68afe649852eec8c6150f5237050709c52c18d..3137f5bfbeddf62acd45792604a696b75672f5e7 100644 (file)
--- a/.github/workflows/windows.yaml
+++ b/.github/workflows/windows.yaml
@@ -24,7 +24,7 @@ jobs:
         ]\r
     env:\r
       CMAKE_OPTIONS: -DCMAKE_CXX_EXTENSIONS=OFF -DCMAKE_CXX_FLAGS_INIT="-DWINVER=0x0501"\r
-      CMAKE_MATROSKA_OPTIONS: ${{ env.CMAKE_OPTIONS }} -DBUILD_EXAMPLES=ON\r
+      CMAKE_MATROSKA_OPTIONS: -DBUILD_EXAMPLES=ON\r
     steps:\r
       - uses: lukka/get-cmake@latest\r
 \r
@@ -48,7 +48,7 @@ jobs:
         run: cmake --install libebml/_build --config ${{ matrix.config }} --prefix ${GITHUB_WORKSPACE}/_built\r
 \r
       - name: Configure ${{ matrix.shared.name }} library\r
-        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 }}\r
+        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 }}\r
 \r
       - name: Build\r
         run: cmake --build _build --config ${{ matrix.config }} --parallel\r