From cc97059e5a6c9be6a0a08d946b35c9d03d9baba1 Mon Sep 17 00:00:00 2001
From: Roy Shilkrot <roy.shil@gmail.com>
Date: Mon, 5 Mar 2012 09:26:29 -0500
Subject: [PATCH] removing absolute paths from cmake scripts, added openni xml
 file to repo

---
 .gitignore                                    |  6 +++++
 firebreath-plugin/CMakeLists.txt              |  1 +
 firebreath-plugin/Mac/projectDef.cmake        |  9 +++----
 firebreath-plugin/Sample-Tracking.xml         | 23 ++++++++++++++++++
 .../cmake/Modules/FindNITE.cmake              | 24 ++++++++++---------
 5 files changed, 46 insertions(+), 17 deletions(-)
 create mode 100644 firebreath-plugin/Sample-Tracking.xml

diff --git a/.gitignore b/.gitignore
index d143ea0..a6b8eb8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,8 @@
 *.swp
 app/bin/*
 *.pyc
+new_cv/*
+cv/*
 
 # xcode noise
 build/*
@@ -12,6 +14,10 @@ build/*
 *.mode1v3
 *.perspectivev3
 # webkit-plugin-mac/build  # precompiled version should be up at the repo
+firebreath-plugin/build/*
+firebreath-plugin/Debug/*
+firebreath-plugin/FireBreath.build/*
+webkit-plugin-mac/build/*
 
 # old skool
 .svn
diff --git a/firebreath-plugin/CMakeLists.txt b/firebreath-plugin/CMakeLists.txt
index 2ab72d8..15b75a4 100644
--- a/firebreath-plugin/CMakeLists.txt
+++ b/firebreath-plugin/CMakeLists.txt
@@ -17,6 +17,7 @@ file (GLOB GENERAL RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
     [^.]*.h
 	[^.]*.hpp
     [^.]*.cmake
+	${CMAKE_MODULE_PATH}/*
     )
 
 include_directories(${PLUGIN_INCLUDE_DIRS})
diff --git a/firebreath-plugin/Mac/projectDef.cmake b/firebreath-plugin/Mac/projectDef.cmake
index 94241ea..aa65dcb 100644
--- a/firebreath-plugin/Mac/projectDef.cmake
+++ b/firebreath-plugin/Mac/projectDef.cmake
@@ -24,10 +24,8 @@ find_library(QUARTZ_CORE_FRAMEWORK QuartzCore)
 find_library(CORE_FOUNDATION_FRAMEWORK CoreFoundation)
 
 include_directories(${CORE_FOUNDATION_FRAMEWORK})
-include_directories("/Users/royshilkrot/Downloads/NITE-Bin-MacOSX-v1.4.1.2/Include")
-include_directories("/Users/royshilkrot/Downloads/OpenNI-Bin-MacOSX-v1.3.2.3/Include")
  
-set(OPENNI_XML_FILE "/Users/royshilkrot/Downloads/NITE-Bin-MacOSX-v1.4.1.2/Data/Sample-Tracking.xml")
+set(OPENNI_XML_FILE "Sample-Tracking.xml")
 set_source_files_properties(
 	${OPENNI_XML_FILE}
 	PROPERTIES
@@ -55,7 +53,6 @@ target_link_libraries(${PROJECT_NAME}
 	${OPENGL_FRAMEWORK}
 	${QUARTZ_CORE_FRAMEWORK}
 	${CORE_FOUNDATION_FRAMEWORK}
-	/Users/royshilkrot/Downloads/OpenNI-Bin-MacOSX-v1.3.2.3/Lib/libOpenNI.dylib
-	/Users/royshilkrot/Downloads/NITE-Bin-MacOSX-v1.4.1.2/Bin/libXnVNite_1_4_1.dylib
-	/Users/royshilkrot/Downloads/NITE-Bin-MacOSX-v1.4.1.2/Bin/libXnVHandGenerator_1_4_1.dylib
+	${OpenNI_LIBS}
+	${NITE_LIBS}
     )
diff --git a/firebreath-plugin/Sample-Tracking.xml b/firebreath-plugin/Sample-Tracking.xml
new file mode 100644
index 0000000..12e2e58
--- /dev/null
+++ b/firebreath-plugin/Sample-Tracking.xml
@@ -0,0 +1,23 @@
+<OpenNI>
+	<Licenses>
+		<License vendor="PrimeSense" key="insert key here"/>
+	</Licenses>
+	<Log writeToConsole="true" writeToFile="false">
+		<!-- 0 - Verbose, 1 - Info, 2 - Warning, 3 - Error (default) -->
+		<LogLevel value="3"/>
+		<Masks>
+			<Mask name="ALL" on="false"/>
+		</Masks>
+		<Dumps>
+		</Dumps>
+	</Log>
+	<ProductionNodes>
+		<Node type="Depth">
+			<Configuration>
+				<Mirror on="true"/>
+			</Configuration>
+		</Node>
+		<Node type="Gesture" />
+		<Node type="Hands" />
+	</ProductionNodes>
+</OpenNI>
diff --git a/firebreath-plugin/cmake/Modules/FindNITE.cmake b/firebreath-plugin/cmake/Modules/FindNITE.cmake
index 421dc2d..90986b5 100644
--- a/firebreath-plugin/cmake/Modules/FindNITE.cmake
+++ b/firebreath-plugin/cmake/Modules/FindNITE.cmake
@@ -50,19 +50,21 @@ find_library(NITE_LIBRARY
 if(NITE_LIBRARY STREQUAL "NITE_LIBRARY-NOTFOUND")
 	message(STATUS "can't find NITE library, looking more aggressively")
 	foreach(NITE_LOOKUP_PATH ${NITE_LIB_SEARCH_PATHS})
-		file(GLOB NITE_LIBRARY "${NITE_LOOKUP_PATH}/*XnVNITE*")
+		file(GLOB NITE_LIBRARY "${NITE_LOOKUP_PATH}/*XnV*")
 		message(STATUS "looking in ${NITE_LOOKUP_PATH} resulted in ${NITE_LIBRARY}")
-		if(NOT ${NITE_LIBRARY} STREQUAL "")
-			#found NITE library
-			#but there may be many files found..
-			foreach(NITE_LIBRARY_FOUND ${NITE_LIBRARY})
-				string(REGEX MATCH "jni" FOUND_JNI_IN_FILE ${NITE_LIBRARY_FOUND})
-				if(NOT FOUND_JNI_IN_FILE)
-					set(NITE_LIBRARY ${NITE_LIBRARY_FOUND})
-					break()
-				endif()
-			endforeach()
+		if(NITE_LIBRARY)
+#			#found NITE library
+#			#but there may be many files found..
+#			foreach(NITE_LIBRARY_FOUND ${NITE_LIBRARY})
+#				message(STATUS "checking ${NITE_LIBRARY_FOUND}")
+#				string(REGEX MATCH "jni" FOUND_JNI_IN_FILE ${NITE_LIBRARY_FOUND})
+#				if(NOT FOUND_JNI_IN_FILE)
+#					set(NITE_LIBRARY_TMP ${NITE_LIBRARY_TMP} ${NITE_LIBRARY_FOUND})
+#					break()
+#				endif()
+#			endforeach()
 			break()
+#			set(NITE_LIBRARY ${NITE_LIBRARY_TMP})
 		endif()
 	endforeach()
 endif()