niimaqsrc: Move into subfolder of sys

CMakeLists.txt

@@ -8,7 +8,7 @@ find_package (Gstreamer REQUIRED)
 find_package (Glib2 REQUIRED)
 find_package (NIIMAQ)
 find_package (FreeImage)
-find_package (OpenCV REQUIRED)
+find_package (OpenCV)
 
 # conditional required packages
 include (CheckIncludeFiles)

sys/CMakeLists.txt

@@ -1,25 +1 @@
-add_definitions(-DHAVE_CONFIG_H)
+add_subdirectory (niimaq)
-
-set ( SOURCES
-    gstniimaq.c )
-    
-set ( HEADERS
-    gstniimaq.h )
-
-include_directories ( AFTER
-  .
-  ${NIIMAQ_INCLUDE_DIR} )
-
-add_library ( libgstimaq MODULE
-  ${SOURCES}
-  ${HEADERS} )
-
-target_link_libraries ( libgstimaq
-  general ${GLIB2_LIBRARIES}
-  general ${GSTREAMER_LIBRARIES}
-  general ${GSTREAMER_BASE_LIBRARY}
-  general ${GSTREAMER_INTERFACE_LIBRARY}
-  general ${NIIMAQ_LIBRARIES} )
-  
-install (TARGETS libgstimaq
-  LIBRARY DESTINATION lib/gstreamer-0.10)

sys/niimaq/CMakeLists.txt

@@ -0,0 +1,25 @@
+add_definitions(-DHAVE_CONFIG_H)
+
+set ( SOURCES
+    gstniimaq.c )
+    
+set ( HEADERS
+    gstniimaq.h )
+
+include_directories ( AFTER
+  .
+  ${NIIMAQ_INCLUDE_DIR} )
+
+add_library ( libgstimaq MODULE
+  ${SOURCES}
+  ${HEADERS} )
+
+target_link_libraries ( libgstimaq
+  general ${GLIB2_LIBRARIES}
+  general ${GSTREAMER_LIBRARIES}
+  general ${GSTREAMER_BASE_LIBRARY}
+  general ${GSTREAMER_INTERFACE_LIBRARY}
+  general ${NIIMAQ_LIBRARIES} )
+  
+install (TARGETS libgstimaq
+  LIBRARY DESTINATION lib/gstreamer-0.10)

sys/niimaq/gstniimaq.c

@@ -1162,5 +1162,5 @@ plugin_init (GstPlugin * plugin)
 }
 
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, "niimaq",
-    "NI-IMAQ source element", plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME,
+    "NI-IMAQ source element", plugin_init, VERSION, GST_LICENSE, PACKAGE_NAME,
     GST_PACKAGE_ORIGIN)