generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

moved an include dirs setting to the root cmake file

Browse Source
This commit is contained in:
Maria Dimashova 2011-02-03 09:55:17 +00:00
parent 6590711b8b
commit ed77955635
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -782,8 +782,17 @@ if(WITH_OPENNI)
unset(OPENNI_LIBRARY CACHE) unset(OPENNI_LIBRARY CACHE)
unset(PRIME_SENSOR_MODULES_FOR_OPENNI CACHE) unset(PRIME_SENSOR_MODULES_FOR_OPENNI CACHE)
find_library(OPENNI_LIBRARY "OpenNI" PATHS "/usr/lib" "c:/Program Files/OpenNI/Lib" DOC "OpenNI library") find_library(OPENNI_LIBRARY "OpenNI" PATHS "/usr/lib" "c:/Program Files/OpenNI/Lib" DOC "OpenNI library")
if(OPENNI_LIBRARY) if(OPENNI_LIBRARY)
set(HAVE_OPENNI TRUE) set(HAVE_OPENNI TRUE)
# set OpenNI include directory
if(WIN32)
set(OPENNI_INCLUDE_DIR "c:/Program Files/OpenNI/Include")
elseif(UNIX OR APPLE)
set(OPENNI_INCLUDE_DIR "/usr/include/ni")
endif()
# the check: are PrimeSensor Modules for OpenNI installed? # the check: are PrimeSensor Modules for OpenNI installed?
if(WIN32) if(WIN32)
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") 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")
@ -793,7 +802,9 @@ if(WITH_OPENNI)
if(PRIME_SENSOR_MODULES_FOR_OPENNI) if(PRIME_SENSOR_MODULES_FOR_OPENNI)
set(HAVE_PRIME_SENSOR_FOR_OPENNI TRUE) set(HAVE_PRIME_SENSOR_FOR_OPENNI TRUE)
endif() endif()
endif()
endif() #if(OPENNI_LIBRARY)
endif() #if(WITH_OPENNI) endif() #if(WITH_OPENNI)
############################## Eigen2 ############################## ############################## Eigen2 ##############################

6
modules/highgui/CMakeLists.txt
View File

@ -177,12 +177,6 @@ endif()
#OpenNI #OpenNI
if(WITH_OPENNI AND HAVE_OPENNI) if(WITH_OPENNI AND HAVE_OPENNI)
set(highgui_srcs ${highgui_srcs} src/cap_openni.cpp) 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}) include_directories(${OPENNI_INCLUDE_DIR})
endif() endif()