build: use CMakeLists.txt instead of config.h to define plugin macros

2017-09-26 12:46:55 -04:00 · 2017-09-26 12:46:55 -04:00 · bbba3dae51
commit bbba3dae51
parent 28f41f998a
28 changed files with 33 additions and 52 deletions
--- 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")
--- a/config.h
+++ b/config.h
@ -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"
--- 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)
--- 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);
--- 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)
--- 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);
--- a/sys/bitflow/CMakeLists.txt
+++ b/sys/bitflow/CMakeLists.txt
@ -1,5 +1,3 @@
-add_definitions (-DHAVE_CONFIG_H)
-
 set (SOURCES
  gstbitflowsrc.c)
    
--- 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)
--- 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
--- 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)
+    plugin_init, GST_PACKAGE_VERSION, GST_PACKAGE_LICENSE, GST_PACKAGE_NAME,
+    GST_PACKAGE_ORIGIN)
--- a/sys/euresys/CMakeLists.txt
+++ b/sys/euresys/CMakeLists.txt
@ -1,5 +1,3 @@
-add_definitions (-DHAVE_CONFIG_H)
-
 set (SOURCES
  gsteuresyssrc.c)
    
--- 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)
--- a/sys/idsueye/CMakeLists.txt
+++ b/sys/idsueye/CMakeLists.txt
@ -1,5 +1,3 @@
-add_definitions (-DHAVE_CONFIG_H)
-
 set (SOURCES
  gstidsueyesrc.c)
    
--- 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)
--- a/sys/imperx/CMakeLists.txt
+++ b/sys/imperx/CMakeLists.txt
@ -1,5 +1,3 @@
-add_definitions (-DHAVE_CONFIG_H)
-
 set (SOURCES
  gstframelinksrc.c)
    
--- 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)
--- a/sys/matrox/CMakeLists.txt
+++ b/sys/matrox/CMakeLists.txt
@ -1,5 +1,3 @@
-add_definitions (-DHAVE_CONFIG_H)
-
 set (SOURCES
  gstmatroxsrc.c)
    
--- 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)
--- a/sys/niimaq/CMakeLists.txt
+++ b/sys/niimaq/CMakeLists.txt
@ -1,5 +1,3 @@
-add_definitions (-DHAVE_CONFIG_H)
-
 set (SOURCES
  gstniimaq.c)
    
--- 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)
--- a/sys/niimaqdx/CMakeLists.txt
+++ b/sys/niimaqdx/CMakeLists.txt
@ -1,5 +1,3 @@
-add_definitions (-DHAVE_CONFIG_H)
-
 set (SOURCES
  gstniimaqdx.c)
    
--- 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)
--- a/sys/phoenix/CMakeLists.txt
+++ b/sys/phoenix/CMakeLists.txt
@ -1,5 +1,3 @@
-add_definitions (-DHAVE_CONFIG_H)
-
 set (SOURCES
  gstphoenixsrc.c)
    
--- 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)
--- a/sys/pixci/CMakeLists.txt
+++ b/sys/pixci/CMakeLists.txt
@ -1,5 +1,3 @@
-add_definitions (-DHAVE_CONFIG_H)
-
 set (SOURCES
  gstpixcisrc.c)
    
--- 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)
--- a/sys/sapera/CMakeLists.txt
+++ b/sys/sapera/CMakeLists.txt
@ -1,5 +1,3 @@
-add_definitions (-DHAVE_CONFIG_H)
-
 set (SOURCES
  gstsaperasrc.cpp)
    
--- 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)