Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

removing absolute paths from cmake scripts, added openni xml file to …

…repo
  • Loading branch information...
commit cc97059e5a6c9be6a0a08d946b35c9d03d9baba1 1 parent 393d5f3
@royshil royshil authored
View
6 .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
View
1  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})
View
9 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}
)
View
23 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>
View
24 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()
Please sign in to comment.
Something went wrong with that request. Please try again.