From eccdfc27036e88e42f20862cb32a2c1270c8a571 Mon Sep 17 00:00:00 2001
From: "Joshua M. Doe" <oss@nvl.army.mil>
Date: Wed, 19 Jan 2011 11:00:46 -0500
Subject: [PATCH] niimaqsrc: Move into subfolder of sys

---
 CMakeLists.txt               |  2 +-
 sys/CMakeLists.txt           | 26 +-------------------------
 sys/niimaq/CMakeLists.txt    | 25 +++++++++++++++++++++++++
 sys/{ => niimaq}/gstniimaq.c |  2 +-
 sys/{ => niimaq}/gstniimaq.h |  0
 5 files changed, 28 insertions(+), 27 deletions(-)
 create mode 100644 sys/niimaq/CMakeLists.txt
 rename sys/{ => niimaq}/gstniimaq.c (99%)
 rename sys/{ => niimaq}/gstniimaq.h (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 01b8808..ef179be 100644
--- a/CMakeLists.txt
+++ b/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)
diff --git a/sys/CMakeLists.txt b/sys/CMakeLists.txt
index 310c2d7..1cf67b2 100644
--- a/sys/CMakeLists.txt
+++ b/sys/CMakeLists.txt
@@ -1,25 +1 @@
-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)
\ No newline at end of file
+add_subdirectory (niimaq)
diff --git a/sys/niimaq/CMakeLists.txt b/sys/niimaq/CMakeLists.txt
new file mode 100644
index 0000000..310c2d7
--- /dev/null
+++ b/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)
\ No newline at end of file
diff --git a/sys/gstniimaq.c b/sys/niimaq/gstniimaq.c
similarity index 99%
rename from sys/gstniimaq.c
rename to sys/niimaq/gstniimaq.c
index 43ca109..18b2c5e 100644
--- a/sys/gstniimaq.c
+++ b/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)
\ No newline at end of file
diff --git a/sys/gstniimaq.h b/sys/niimaq/gstniimaq.h
similarity index 100%
rename from sys/gstniimaq.h
rename to sys/niimaq/gstniimaq.h