moved an include dirs setting to the root cmake file

diff --git a/CMakeLists.txt b/CMakeLists.txt
index aebdcd2..0ab15fc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -782,18 +782,29 @@ if(WITH_OPENNI)
     unset(OPENNI_LIBRARY CACHE)\r
     unset(PRIME_SENSOR_MODULES_FOR_OPENNI CACHE)\r
     find_library(OPENNI_LIBRARY "OpenNI" PATHS "/usr/lib" "c:/Program Files/OpenNI/Lib" DOC "OpenNI library")\r
-    if(OPENNI_LIBRARY)\r
+\r
+       if(OPENNI_LIBRARY)\r
         set(HAVE_OPENNI TRUE)\r
+\r
+        # set OpenNI include directory\r
+        if(WIN32)\r
+            set(OPENNI_INCLUDE_DIR "c:/Program Files/OpenNI/Include")\r
+        elseif(UNIX OR APPLE)\r
+            set(OPENNI_INCLUDE_DIR "/usr/include/ni")\r
+        endif()\r
+\r
         # the check: are PrimeSensor Modules for OpenNI installed?\r
-               if(WIN32)\r
-                       find_file(PRIME_SENSOR_MODULES_FOR_OPENNI "XnCore.dll" PATHS "c:/Program Files/Prime Sense/Sensor/Bin" DOC "Core library of PrimeSensor Modules for OpenNI")\r
-               elseif(UNIX OR APPLE)\r
-                       find_library(PRIME_SENSOR_MODULES_FOR_OPENNI "XnCore" PATHS "/usr/lib" DOC "Core library of PrimeSensor Modules for OpenNI")\r
-               endif()\r
-               if(PRIME_SENSOR_MODULES_FOR_OPENNI)\r
+        if(WIN32)\r
+            find_file(PRIME_SENSOR_MODULES_FOR_OPENNI "XnCore.dll" PATHS "c:/Program Files/Prime Sense/Sensor/Bin" DOC "Core library of PrimeSensor Modules for OpenNI")\r
+        elseif(UNIX OR APPLE)\r
+            find_library(PRIME_SENSOR_MODULES_FOR_OPENNI "XnCore" PATHS "/usr/lib" DOC "Core library of PrimeSensor Modules for OpenNI")\r
+        endif()\r
+        if(PRIME_SENSOR_MODULES_FOR_OPENNI)\r
             set(HAVE_PRIME_SENSOR_FOR_OPENNI TRUE)\r
         endif()\r
-    endif()\r
+\r
+    endif() #if(OPENNI_LIBRARY)\r
+\r
 endif() #if(WITH_OPENNI)\r
 \r
 ############################## Eigen2 ##############################\r

diff --git a/modules/highgui/CMakeLists.txt b/modules/highgui/CMakeLists.txt
index d59215b..e447d33 100644 (file)
--- a/modules/highgui/CMakeLists.txt
+++ b/modules/highgui/CMakeLists.txt
@@ -177,12 +177,6 @@ endif()
 #OpenNI
 if(WITH_OPENNI AND HAVE_OPENNI)
     set(highgui_srcs ${highgui_srcs} src/cap_openni.cpp)
-    if(WIN32)
-            set(OPENNI_INCLUDE_DIR "c:/Program Files/OpenNI/Include")
-    elseif(UNIX OR APPLE)
-            set(OPENNI_INCLUDE_DIR "/usr/include/ni")
-    endif()
-
     include_directories(${OPENNI_INCLUDE_DIR})
 endif()