Skip to content

Commit da078fc

Browse files
committed
Add build test to CI, rename the new option
1 parent 5d405c5 commit da078fc

File tree

3 files changed

+20
-4
lines changed

3 files changed

+20
-4
lines changed

.github/workflows/ci.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,22 @@ jobs:
399399
cmake .. -DBUILD_GSTREAMER_PLUGIN=ON -DBUILD_STATIC=ON
400400
make
401401
402+
linux-build-gcc-static-deps-shared-kvssink:
403+
runs-on: ubuntu-20.04
404+
steps:
405+
- name: Clone repository
406+
uses: actions/checkout@v3
407+
- name: Install dependencies
408+
run: |
409+
sudo apt clean && sudo apt update
410+
sudo apt install -y libunwind-dev
411+
sudo apt-get install libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev gstreamer1.0-plugins-base-apps gstreamer1.0-plugins-bad gstreamer1.0-plugins-good gstreamer1.0-plugins-ugly gstreamer1.0-tools
412+
- name: Build repository
413+
run: |
414+
mkdir build && cd build
415+
cmake .. -DBUILD_GSTREAMER_PLUGIN=ON -DBUILD_STATIC=ON -DBUILD_FORCE_KVSSINK_SHARED=ON
416+
make
417+
402418
linux-build-gcc-shared:
403419
runs-on: ubuntu-20.04
404420
steps:

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ include(GNUInstallDirs)
1212
option(BUILD_GSTREAMER_PLUGIN "Build kvssink GStreamer plugin" OFF)
1313
option(BUILD_JNI "Build C++ wrapper for JNI to expose the functionality to Java/Android" OFF)
1414
option(BUILD_STATIC "Build with static linkage" OFF)
15-
option(BUILD_FORCE_GSTREAMER_PLUGIN_SHARED "If building with static linkage, build the kvssink GStreamer plugin as a shared library" OFF)
15+
option(BUILD_FORCE_KVSSINK_SHARED "If building with static linkage, build the kvssink GStreamer plugin as a shared library" OFF)
1616
option(ADD_MUCLIBC "Add -muclibc c flag" OFF)
1717
option(BUILD_DEPENDENCIES "Whether or not to build depending libraries from source" ON)
1818
option(BUILD_OPENSSL_PLATFORM "If buildng OpenSSL what is the target platform" OFF)
@@ -59,7 +59,7 @@ add_definitions(-DCMAKE_DETECTED_CACERT_PATH)
5959

6060
# Instruct Producer C to build Curl with Position Independent Code (-fpic).
6161
# This is to allow a static Curl build to link with to a shared Producer Cpp build.
62-
if(BUILD_STATIC AND BUILD_FORCE_GSTREAMER_PLUGIN_SHARED)
62+
if(BUILD_STATIC AND BUILD_FORCE_KVSSINK_SHARED)
6363
set(CURL_POSITION_INDEPENDENT_CODE TRUE)
6464
endif()
6565

@@ -220,7 +220,7 @@ if(BUILD_GSTREAMER_PLUGIN)
220220
include_directories(${GST_APP_INCLUDE_DIRS})
221221
link_directories(${GST_APP_LIBRARY_DIRS})
222222

223-
if(BUILD_STATIC AND (NOT BUILD_FORCE_GSTREAMER_PLUGIN_SHARED))
223+
if(BUILD_STATIC AND (NOT BUILD_FORCE_KVSSINK_SHARED))
224224
add_library(gstkvssink STATIC ${GST_PLUGIN_SOURCE_FILES})
225225
else()
226226
add_library(gstkvssink MODULE ${GST_PLUGIN_SOURCE_FILES})

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ You can pass the following options to `cmake ..`.
8484

8585
* `-DBUILD_GSTREAMER_PLUGIN` -- Build kvssink GStreamer plugin. Default is OFF.
8686
* `-DBUILD_STATIC` -- Build as static libraries. Default is OFF.
87-
* `-BUILD_FORCE_GSTREAMER_PLUGIN_SHARED` -- If building with static linkage, build the kvssink GStreamer plugin as a shared library. Default is OFF.
87+
* `-BUILD_FORCE_KVSSINK_SHARED` -- If building with static linkage, build the kvssink GStreamer plugin as a shared library. Default is OFF.
8888
* `-DBUILD_JNI` -- Build C++ wrapper for JNI to expose the functionality to Java/Android
8989
* `-DBUILD_DEPENDENCIES` -- Build depending libraries from source
9090
* `-DBUILD_TEST=TRUE` -- Build unit/integration tests, may be useful for confirm support for your device. `./tst/producerTest`

0 commit comments

Comments
 (0)