Skip to content

Commit 8ada539

Browse files
committed
Make build new option backwards compatible
1 parent db2cf2b commit 8ada539

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 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_GSTREAMER_PLUGIN_STATIC "If building GStreamer plugin, build it as a static library" ${BUILD_STATIC})
15+
option(BUILD_FORCE_GSTREAMER_PLUGIN_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)
@@ -215,7 +215,7 @@ if(BUILD_GSTREAMER_PLUGIN)
215215
include_directories(${GST_APP_INCLUDE_DIRS})
216216
link_directories(${GST_APP_LIBRARY_DIRS})
217217

218-
if(BUILD_GSTREAMER_PLUGIN_STATIC)
218+
if(BUILD_STATIC AND (NOT BUILD_FORCE_GSTREAMER_PLUGIN_SHARED))
219219
add_library(gstkvssink STATIC ${GST_PLUGIN_SOURCE_FILES})
220220
else()
221221
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-
* `-DBUILD_GSTREAMER_PLUGIN_STATIC` -- If building GStreamer plugin, build it as a static library. Default is BUILD_STATIC.
87+
* `-BUILD_FORCE_GSTREAMER_PLUGIN_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)