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

added messages to CMake log; fixed sample

Browse Source
This commit is contained in:
Maria Dimashova 2011-02-04 15:36:41 +00:00
parent 0747f2d863
commit eedd42f192
2 changed files with 45 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenCVFindOpenNI.cmake
View File

@ -63,18 +63,21 @@ if(OPENNI_LIBRARY)
set(OPENNI_LIB_DIR_INTERNAL "${OPENNI_LIB_DIR}" CACHE INTERNAL "This is the value of the last time OPENNI_LIB_DIR was set successfully." FORCE) set(OPENNI_LIB_DIR_INTERNAL "${OPENNI_LIB_DIR}" CACHE INTERNAL "This is the value of the last time OPENNI_LIB_DIR was set successfully." FORCE)
else() else()
set(OPENNI_LIB_DIR "${OPENNI_LIB_DIR}-NOTFOUND or does not have OpenNI libraries" CACHE PATH ${OPENNI_LIB_DESCR} FORCE) set(OPENNI_LIB_DIR "${OPENNI_LIB_DIR}-NOTFOUND or does not have OpenNI libraries" CACHE PATH ${OPENNI_LIB_DESCR} FORCE)
message( WARNING, " OpenNI library directory (set by OPENNI_LIB_DIR variable) is not found or does not have OpenNI libraries." )
endif() endif()
if(OPENNI_INCLUDES) if(OPENNI_INCLUDES)
set(OPENNI_INCLUDE_DIR_INTERNAL "${OPENNI_INCLUDE_DIR}" CACHE INTERNAL "This is the value of the last time OPENNI_INCLUDE_DIR was set successfully." FORCE) set(OPENNI_INCLUDE_DIR_INTERNAL "${OPENNI_INCLUDE_DIR}" CACHE INTERNAL "This is the value of the last time OPENNI_INCLUDE_DIR was set successfully." FORCE)
else() else()
set(OPENNI_INCLUDE_DIR "${OPENNI_INCLUDE_DIR}-NOTFOUND or does not have OpenNI includes" CACHE PATH ${OPENNI_INCLUDE_DESCR} FORCE) set(OPENNI_INCLUDE_DIR "${OPENNI_INCLUDE_DIR}-NOTFOUND or does not have OpenNI includes" CACHE PATH ${OPENNI_INCLUDE_DESCR} FORCE)
message( WARNING, " OpenNI include directory (set by OPENNI_INCLUDE_DIR variable) is not found or does not have OpenNI includes." )
endif() endif()
if(OPENNI_PRIME_SENSOR_MODULE) if(OPENNI_PRIME_SENSOR_MODULE)
set(OPENNI_PRIME_SENSOR_MODULE_BIN_DIR_INTERNAL "${OPENNI_PRIME_SENSOR_MODULE_BIN_DIR}" CACHE INTERNAL "This is the value of the last time OPENNI_PRIME_SENSOR_MODULE_BIN_DIR was set successfully." FORCE) set(OPENNI_PRIME_SENSOR_MODULE_BIN_DIR_INTERNAL "${OPENNI_PRIME_SENSOR_MODULE_BIN_DIR}" CACHE INTERNAL "This is the value of the last time OPENNI_PRIME_SENSOR_MODULE_BIN_DIR was set successfully." FORCE)
else() else()
set(OPENNI_PRIME_SENSOR_MODULE_BIN_DIR "${OPENNI_PRIME_SENSOR_MODULE_BIN_DIR}-NOTFOUND or does not have PrimeSensor Module binaries" CACHE PATH ${OPENNI_PRIME_SENSOR_MODULE_BIN_DESCR} FORCE) set(OPENNI_PRIME_SENSOR_MODULE_BIN_DIR "${OPENNI_PRIME_SENSOR_MODULE_BIN_DIR}-NOTFOUND or does not have PrimeSensor Module binaries" CACHE PATH ${OPENNI_PRIME_SENSOR_MODULE_BIN_DESCR} FORCE)
message( WARNING, " PrimeSensor Module binaries directory (set by OPENNI_PRIME_SENSOR_MODULE_BIN_DIR variable) is not found or does not have PrimeSensor Module binaries." )
endif() endif()
mark_as_advanced(FORCE OPENNI_PRIME_SENSOR_MODULE) mark_as_advanced(FORCE OPENNI_PRIME_SENSOR_MODULE)

9
samples/cpp/kinect_maps.cpp
View File

@ -95,7 +95,9 @@ void parseCommandLine( int argc, char* argv[], bool& isColorizeDisp, bool& isFix
{ {
// set defaut values // set defaut values
isColorizeDisp = true; isColorizeDisp = true;
isFixedMaxDisp = false;
isSetSXGA = false; isSetSXGA = false;
retrievedImageFlags[0] = false; retrievedImageFlags[0] = false;
retrievedImageFlags[1] = true; retrievedImageFlags[1] = true;
retrievedImageFlags[2] = false; retrievedImageFlags[2] = false;
@ -110,7 +112,7 @@ void parseCommandLine( int argc, char* argv[], bool& isColorizeDisp, bool& isFix
{ {
for( int i = 1; i < argc; i++ ) for( int i = 1; i < argc; i++ )
{ {
if( !strcmp( argv[i], "--help" ) ) if( !strcmp( argv[i], "--help" ) || !strcmp( argv[i], "-h" ) )
{ {
printCommandLineParams(); printCommandLineParams();
exit(0); exit(0);
@ -148,6 +150,11 @@ void parseCommandLine( int argc, char* argv[], bool& isColorizeDisp, bool& isFix
exit(0); exit(0);
} }
} }
else
{
cout << "Unsupported command line argument: " << argv[i] << "." << endl;
exit(-1);
}
} }
} }
} }