From bbba3dae51f563986bf8d4bb78832ad72b29ab74 Mon Sep 17 00:00:00 2001 From: "Joshua M. Doe" Date: Tue, 26 Sep 2017 12:46:55 -0400 Subject: [PATCH] build: use CMakeLists.txt instead of config.h to define plugin macros --- CMakeLists.txt | 8 +++++++- config.h | 10 ---------- gst/extractcolor/CMakeLists.txt | 2 -- gst/extractcolor/gstextractcolor.c | 3 ++- gst/videoadjust/CMakeLists.txt | 2 -- gst/videoadjust/gstvideoadjust.c | 2 +- sys/bitflow/CMakeLists.txt | 2 -- sys/bitflow/gstbitflowsrc.c | 3 ++- sys/edt/CMakeLists.txt | 2 -- sys/edt/gstedt.c | 3 ++- sys/euresys/CMakeLists.txt | 2 -- sys/euresys/gsteuresyssrc.c | 3 ++- sys/idsueye/CMakeLists.txt | 2 -- sys/idsueye/gstidsueyesrc.c | 3 ++- sys/imperx/CMakeLists.txt | 2 -- sys/imperx/gstframelinksrc.c | 3 ++- sys/matrox/CMakeLists.txt | 2 -- sys/matrox/gstmatroxsrc.c | 3 ++- sys/niimaq/CMakeLists.txt | 2 -- sys/niimaq/gstniimaq.c | 7 +++++-- sys/niimaqdx/CMakeLists.txt | 2 -- sys/niimaqdx/gstniimaqdx.c | 4 ++-- sys/phoenix/CMakeLists.txt | 2 -- sys/phoenix/gstphoenixsrc.c | 3 ++- sys/pixci/CMakeLists.txt | 2 -- sys/pixci/gstpixcisrc.c | 2 +- sys/sapera/CMakeLists.txt | 2 -- sys/sapera/gstsaperasrc.cpp | 2 +- 28 files changed, 33 insertions(+), 52 deletions(-) delete mode 100644 config.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 7311e2b..5221c06 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,13 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) # get git version info include(GetGitRevisionDescription) git_describe(GIT_DESCRIBE --dirty) -add_definitions(-DPACKAGE_VERSION="${GIT_DESCRIBE}") + +# values used when registering plugins +add_definitions(-DGST_PACKAGE_VERSION="${GIT_DESCRIBE}") +add_definitions(-DGST_PACKAGE_LICENSE="LGPL") +add_definitions(-DGST_PACKAGE_ORIGIN="Unknown package origin") +add_definitions(-DGST_PACKAGE_NAME="${CMAKE_PROJECT_NAME}") +add_definitions(-DPACKAGE="${CMAKE_PROJECT_NAME} package") # configure CPack set(CPACK_GENERATOR "ZIP") diff --git a/config.h b/config.h deleted file mode 100644 index 774029a..0000000 --- a/config.h +++ /dev/null @@ -1,10 +0,0 @@ -/* GStreamer license */ -#define GST_LICENSE "LGPL" - -/* package name in plugins */ -#define PACKAGE_NAME "VISION Plug-ins GIT/prerelease" - -/* package origin */ -#define GST_PACKAGE_ORIGIN "Unknown package origin" - -#define PACKAGE "gst-plugins-vision" diff --git a/gst/extractcolor/CMakeLists.txt b/gst/extractcolor/CMakeLists.txt index 21cbb86..3c421c2 100644 --- a/gst/extractcolor/CMakeLists.txt +++ b/gst/extractcolor/CMakeLists.txt @@ -1,5 +1,3 @@ -add_definitions (-DHAVE_CONFIG_H) - set (SOURCES gstextractcolor.c gstextractcolororc-dist.c) diff --git a/gst/extractcolor/gstextractcolor.c b/gst/extractcolor/gstextractcolor.c index 040b40f..770bb7b 100644 --- a/gst/extractcolor/gstextractcolor.c +++ b/gst/extractcolor/gstextractcolor.c @@ -449,4 +449,5 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, extract_color, "Filter that applies various hacks to a video stream", - plugin_init, PACKAGE_VERSION, GST_LICENSE, PACKAGE_NAME, GST_PACKAGE_ORIGIN); + plugin_init, GST_PACKAGE_VERSION, GST_PACKAGE_LICENSE, GST_PACKAGE_NAME, + GST_PACKAGE_ORIGIN); diff --git a/gst/videoadjust/CMakeLists.txt b/gst/videoadjust/CMakeLists.txt index 5665c03..18818a0 100644 --- a/gst/videoadjust/CMakeLists.txt +++ b/gst/videoadjust/CMakeLists.txt @@ -1,5 +1,3 @@ -add_definitions (-DHAVE_CONFIG_H) - set (SOURCES gstvideoadjust.c gstvideolevels.c) diff --git a/gst/videoadjust/gstvideoadjust.c b/gst/videoadjust/gstvideoadjust.c index 59ecaac..ac90a9f 100644 --- a/gst/videoadjust/gstvideoadjust.c +++ b/gst/videoadjust/gstvideoadjust.c @@ -30,5 +30,5 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, videoadjust, "Filters that apply transform from 16-bit to 8-bit video", - plugin_init, PACKAGE_VERSION, GST_LICENSE, PACKAGE_NAME, + plugin_init, GST_PACKAGE_VERSION, GST_PACKAGE_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); diff --git a/sys/bitflow/CMakeLists.txt b/sys/bitflow/CMakeLists.txt index 157a62b..4919dd1 100644 --- a/sys/bitflow/CMakeLists.txt +++ b/sys/bitflow/CMakeLists.txt @@ -1,5 +1,3 @@ -add_definitions (-DHAVE_CONFIG_H) - set (SOURCES gstbitflowsrc.c) diff --git a/sys/bitflow/gstbitflowsrc.c b/sys/bitflow/gstbitflowsrc.c index 066a360..9ff6981 100644 --- a/sys/bitflow/gstbitflowsrc.c +++ b/sys/bitflow/gstbitflowsrc.c @@ -643,4 +643,5 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, bitflow, "BitFlow frame grabber source", - plugin_init, PACKAGE_VERSION, "LGPL", PACKAGE_NAME, GST_PACKAGE_ORIGIN) + plugin_init, GST_PACKAGE_VERSION, GST_PACKAGE_LICENSE, GST_PACKAGE_NAME, + GST_PACKAGE_ORIGIN) diff --git a/sys/edt/CMakeLists.txt b/sys/edt/CMakeLists.txt index 4130823..d157ffc 100644 --- a/sys/edt/CMakeLists.txt +++ b/sys/edt/CMakeLists.txt @@ -1,5 +1,3 @@ -add_definitions (-DHAVE_CONFIG_H) - set (SOURCES gstedt.c gstedtpdvsink.c diff --git a/sys/edt/gstedt.c b/sys/edt/gstedt.c index 6064c6a..b0736eb 100644 --- a/sys/edt/gstedt.c +++ b/sys/edt/gstedt.c @@ -31,4 +31,5 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, edt, "EDT PDV elements", - plugin_init, PACKAGE_VERSION, "LGPL", PACKAGE_NAME, GST_PACKAGE_ORIGIN) \ No newline at end of file + plugin_init, GST_PACKAGE_VERSION, GST_PACKAGE_LICENSE, GST_PACKAGE_NAME, + GST_PACKAGE_ORIGIN) diff --git a/sys/euresys/CMakeLists.txt b/sys/euresys/CMakeLists.txt index 247f65e..15c01eb 100644 --- a/sys/euresys/CMakeLists.txt +++ b/sys/euresys/CMakeLists.txt @@ -1,5 +1,3 @@ -add_definitions (-DHAVE_CONFIG_H) - set (SOURCES gsteuresyssrc.c) diff --git a/sys/euresys/gsteuresyssrc.c b/sys/euresys/gsteuresyssrc.c index 7a6bbfc..1c39f89 100644 --- a/sys/euresys/gsteuresyssrc.c +++ b/sys/euresys/gsteuresyssrc.c @@ -774,4 +774,5 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, euresys, "Euresys Multicam source", - plugin_init, PACKAGE_VERSION, "LGPL", PACKAGE_NAME, GST_PACKAGE_ORIGIN) + plugin_init, GST_PACKAGE_VERSION, GST_PACKAGE_LICENSE, GST_PACKAGE_NAME, + GST_PACKAGE_ORIGIN) diff --git a/sys/idsueye/CMakeLists.txt b/sys/idsueye/CMakeLists.txt index af82cb6..a546a82 100644 --- a/sys/idsueye/CMakeLists.txt +++ b/sys/idsueye/CMakeLists.txt @@ -1,5 +1,3 @@ -add_definitions (-DHAVE_CONFIG_H) - set (SOURCES gstidsueyesrc.c) diff --git a/sys/idsueye/gstidsueyesrc.c b/sys/idsueye/gstidsueyesrc.c index 520c04d..2e08358 100644 --- a/sys/idsueye/gstidsueyesrc.c +++ b/sys/idsueye/gstidsueyesrc.c @@ -756,4 +756,5 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, idsueye, "IDS uEye frame grabber source", - plugin_init, PACKAGE_VERSION, "LGPL", PACKAGE_NAME, GST_PACKAGE_ORIGIN) + plugin_init, GST_PACKAGE_VERSION, GST_PACKAGE_LICENSE, GST_PACKAGE_NAME, + GST_PACKAGE_ORIGIN) diff --git a/sys/imperx/CMakeLists.txt b/sys/imperx/CMakeLists.txt index 554aeac..1de8bb5 100644 --- a/sys/imperx/CMakeLists.txt +++ b/sys/imperx/CMakeLists.txt @@ -1,5 +1,3 @@ -add_definitions (-DHAVE_CONFIG_H) - set (SOURCES gstframelinksrc.c) diff --git a/sys/imperx/gstframelinksrc.c b/sys/imperx/gstframelinksrc.c index 9c8eee8..dfab9ce 100644 --- a/sys/imperx/gstframelinksrc.c +++ b/sys/imperx/gstframelinksrc.c @@ -766,4 +766,5 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, imperx, "IMPERX FrameLink Express frame grabber source", - plugin_init, PACKAGE_VERSION, "LGPL", PACKAGE_NAME, GST_PACKAGE_ORIGIN) + plugin_init, GST_PACKAGE_VERSION, GST_PACKAGE_LICENSE, GST_PACKAGE_NAME, + GST_PACKAGE_ORIGIN) diff --git a/sys/matrox/CMakeLists.txt b/sys/matrox/CMakeLists.txt index a25e26b..e38e52c 100644 --- a/sys/matrox/CMakeLists.txt +++ b/sys/matrox/CMakeLists.txt @@ -1,5 +1,3 @@ -add_definitions (-DHAVE_CONFIG_H) - set (SOURCES gstmatroxsrc.c) diff --git a/sys/matrox/gstmatroxsrc.c b/sys/matrox/gstmatroxsrc.c index e1081bf..1ccde33 100644 --- a/sys/matrox/gstmatroxsrc.c +++ b/sys/matrox/gstmatroxsrc.c @@ -816,4 +816,5 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, matrox, "Matrox Imaging Library video source", - plugin_init, PACKAGE_VERSION, "LGPL", PACKAGE_NAME, GST_PACKAGE_ORIGIN) + plugin_init, GST_PACKAGE_VERSION, GST_PACKAGE_LICENSE, GST_PACKAGE_NAME, + GST_PACKAGE_ORIGIN) diff --git a/sys/niimaq/CMakeLists.txt b/sys/niimaq/CMakeLists.txt index 50a08ff..36fe57d 100644 --- a/sys/niimaq/CMakeLists.txt +++ b/sys/niimaq/CMakeLists.txt @@ -1,5 +1,3 @@ -add_definitions (-DHAVE_CONFIG_H) - set (SOURCES gstniimaq.c) diff --git a/sys/niimaq/gstniimaq.c b/sys/niimaq/gstniimaq.c index 8ef8a28..b23f189 100644 --- a/sys/niimaq/gstniimaq.c +++ b/sys/niimaq/gstniimaq.c @@ -945,6 +945,9 @@ plugin_init (GstPlugin * plugin) } -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, niimaq, - "NI-IMAQ source element", plugin_init, PACKAGE_VERSION, GST_LICENSE, PACKAGE_NAME, +GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, + GST_VERSION_MINOR, + niimaq, + "NI-IMAQ source element", + plugin_init, GST_PACKAGE_VERSION, GST_PACKAGE_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/sys/niimaqdx/CMakeLists.txt b/sys/niimaqdx/CMakeLists.txt index d30004c..2fd796b 100644 --- a/sys/niimaqdx/CMakeLists.txt +++ b/sys/niimaqdx/CMakeLists.txt @@ -1,5 +1,3 @@ -add_definitions (-DHAVE_CONFIG_H) - set (SOURCES gstniimaqdx.c) diff --git a/sys/niimaqdx/gstniimaqdx.c b/sys/niimaqdx/gstniimaqdx.c index cb7806a..a4f4ac9 100644 --- a/sys/niimaqdx/gstniimaqdx.c +++ b/sys/niimaqdx/gstniimaqdx.c @@ -1267,5 +1267,5 @@ plugin_init (GstPlugin * plugin) } GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, niimaqdx, - "NI-IMAQdx source element", plugin_init, PACKAGE_VERSION, GST_LICENSE, PACKAGE_NAME, - GST_PACKAGE_ORIGIN) + "NI-IMAQdx source element", plugin_init, GST_PACKAGE_VERSION, + GST_PACKAGE_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/sys/phoenix/CMakeLists.txt b/sys/phoenix/CMakeLists.txt index 6402765..8f2625e 100644 --- a/sys/phoenix/CMakeLists.txt +++ b/sys/phoenix/CMakeLists.txt @@ -1,5 +1,3 @@ -add_definitions (-DHAVE_CONFIG_H) - set (SOURCES gstphoenixsrc.c) diff --git a/sys/phoenix/gstphoenixsrc.c b/sys/phoenix/gstphoenixsrc.c index c24eb66..5614fbf 100644 --- a/sys/phoenix/gstphoenixsrc.c +++ b/sys/phoenix/gstphoenixsrc.c @@ -905,4 +905,5 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, phoenix, "Phoenix frame grabber source", - plugin_init, PACKAGE_VERSION, "LGPL", PACKAGE_NAME, GST_PACKAGE_ORIGIN) + plugin_init, GST_PACKAGE_VERSION, GST_PACKAGE_LICENSE, GST_PACKAGE_NAME, + GST_PACKAGE_ORIGIN) diff --git a/sys/pixci/CMakeLists.txt b/sys/pixci/CMakeLists.txt index a2a20aa..276d29f 100644 --- a/sys/pixci/CMakeLists.txt +++ b/sys/pixci/CMakeLists.txt @@ -1,5 +1,3 @@ -add_definitions (-DHAVE_CONFIG_H) - set (SOURCES gstpixcisrc.c) diff --git a/sys/pixci/gstpixcisrc.c b/sys/pixci/gstpixcisrc.c index 4ef64ac..48c5e11 100644 --- a/sys/pixci/gstpixcisrc.c +++ b/sys/pixci/gstpixcisrc.c @@ -784,4 +784,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, pixci, "Pixci frame grabber source", - plugin_init, PACKAGE_VERSION, "LGPL", PACKAGE_NAME, GST_PACKAGE_ORIGIN) + plugin_init, GST_PACKAGE_VERSION, GST_PACKAGE_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/sys/sapera/CMakeLists.txt b/sys/sapera/CMakeLists.txt index 7ba666a..d92500e 100644 --- a/sys/sapera/CMakeLists.txt +++ b/sys/sapera/CMakeLists.txt @@ -1,5 +1,3 @@ -add_definitions (-DHAVE_CONFIG_H) - set (SOURCES gstsaperasrc.cpp) diff --git a/sys/sapera/gstsaperasrc.cpp b/sys/sapera/gstsaperasrc.cpp index 63c7c43..2046088 100644 --- a/sys/sapera/gstsaperasrc.cpp +++ b/sys/sapera/gstsaperasrc.cpp @@ -768,4 +768,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, sapera, "Teledyne DALSA Sapera frame grabber source", - plugin_init, PACKAGE_VERSION, "LGPL", PACKAGE_NAME, GST_PACKAGE_ORIGIN) + plugin_init, GST_PACKAGE_VERSION, GST_PACKAGE_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)