Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable building DLL on Windows #129

Merged
merged 2 commits into from
Dec 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions .github/workflows/windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,12 @@ on:

jobs:
build_libmatroska:
name: libmatroska ${{ matrix.arch.name }} ${{ matrix.config }} ${{ matrix.shared.name }}
name: libmatroska ${{ matrix.arch.name }} ${{ matrix.config }}
runs-on: windows-latest
strategy:
fail-fast: false
matrix:
config: [Debug, Release]
shared: [
{ "name": "Dynamic", "option": "ON"},
{ "name": "Static", "option": "OFF"}
]
arch: [
{ "name": "x64", "option": "x64"},
{ "name": "x86", "option": "win32"},
Expand All @@ -30,25 +26,25 @@ jobs:

- name: Get pushed code
uses: actions/checkout@v3

- name: Checkout libebml
uses: actions/checkout@v3
with:
with:
repository: Matroska-Org/libebml
path: libebml
# minimum version we support ref: 'release-1.4.3'

- name: Configure ${{ matrix.shared.name }} libebml
run: cmake -S libebml -B libebml/_build ${{ env.CMAKE_OPTIONS }} -A ${{ matrix.arch.option }} -DBUILD_SHARED_LIBS=${{ matrix.shared.option }}
- name: Configure libebml
run: cmake -S libebml -B libebml/_build ${{ env.CMAKE_OPTIONS }} -A ${{ matrix.arch.option }}

- name: Build libebml
run: cmake --build libebml/_build --config ${{ matrix.config }} --parallel

- name: Install libebml
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_OPTIONS }} ${{ env.CMAKE_MATROSKA_OPTIONS }} -A ${{ matrix.arch.option }} -DEBML_DIR="${GITHUB_WORKSPACE}/_built/lib/cmake/EBML" -DBUILD_SHARED_LIBS=${{ matrix.shared.option }}
- name: Configure library
run: cmake -S . -B _build ${{ env.CMAKE_OPTIONS }} ${{ env.CMAKE_MATROSKA_OPTIONS }} -A ${{ matrix.arch.option }} -DEBML_DIR="${GITHUB_WORKSPACE}/_built/lib/cmake/EBML"

- name: Build
run: cmake --build _build --config ${{ matrix.config }} --parallel
Expand Down
6 changes: 4 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ cmake_minimum_required(VERSION 3.1.2)

project(matroska VERSION 2.0.0)

include(CMakeDependentOption)

option(DISABLE_PKGCONFIG "Disable PkgConfig module generation" OFF)
option(DISABLE_CMAKE_CONFIG "Disable CMake package config module generation" OFF)
option(BUILD_SHARED_LIBS "Build libmatroska as a shared library" OFF)
option(BUILD_EXAMPLES "Build example code" OFF)
cmake_dependent_option(BUILD_SHARED_LIBS "Build libebml as a shared library (except Windows)" OFF "NOT WIN32" OFF)
option(BUILD_TESTING "Build tests" OFF)

find_package(EBML 2.0.0 REQUIRED)

Expand Down