Skip to content

Commit

Permalink
CMake: Fix Windows OpenGL Linking
Browse files Browse the repository at this point in the history
  • Loading branch information
Holden committed Feb 4, 2025
1 parent d829048 commit 0c85e5c
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 0 deletions.
1 change: 1 addition & 0 deletions .github/workflows/android-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ on:
- 'src/**'
- 'android/**'
- 'CMakeLists.txt'
- 'cmake/**'

# concurrency:
# group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/android-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ on:
- 'src/**'
- 'android/**'
- 'CMakeLists.txt'
- 'cmake/**'

# concurrency:
# group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/docker-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ on:
- 'deploy/linux/**'
- 'src/**'
- 'CMakeLists.txt'
- 'cmake/**'

# concurrency:
# group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ on:
- 'deploy/linux/**'
- 'src/**'
- 'CMakeLists.txt'
- 'cmake/**'

# concurrency:
# group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ on:
- 'deploy/macos/**'
- 'src/**'
- 'CMakeLists.txt'
- 'cmake/**'

# concurrency:
# group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ on:
- 'deploy/windows/**'
- 'src/**'
- 'CMakeLists.txt'
- 'cmake/**'

# concurrency:
# group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
5 changes: 5 additions & 0 deletions cmake/find-modules/FindGStreamer.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -645,6 +645,11 @@ if(ANDROID)
target_link_options(GStreamer::GStreamer INTERFACE "-Wl,-Bsymbolic")
endif()

if(WIN32)
find_package(OpenGL REQUIRED)
target_link_libraries(GStreamer::GStreamer INTERFACE user32.lib OpenGL::GL)
endif()

if(QGC_GST_STATIC_BUILD)
target_compile_definitions(GStreamer::GStreamer INTERFACE QGC_GST_STATIC_BUILD)
endif()
Expand Down

0 comments on commit 0c85e5c

Please sign in to comment.