Superres module enabled for Android. GPU samples build fixed for Android.

This commit is contained in:
Alexander Smorkalov
2014-03-05 12:31:04 +04:00
parent b3e18d23a3
commit b4e4f13f9e
12 changed files with 49 additions and 44 deletions

View File

@@ -41,7 +41,7 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${OPENCV_GPU_SAMPLES_REQUIRED_DEPS})
if(HAVE_CUDA)
if(HAVE_CUDA AND NOT ANDROID)
target_link_libraries(${the_target} ${CUDA_CUDA_LIBRARY})
endif()

View File

@@ -1,6 +1,7 @@
#include <iostream>
#include <iomanip>
#include <string>
#include <ctype.h>
#include "cvconfig.h"
#include "opencv2/core/core.hpp"

View File

@@ -7,6 +7,7 @@
#include <memory>
#include <exception>
#include <ctime>
#include <ctype.h>
#include "cvconfig.h"
#include <iostream>

View File

@@ -1,6 +1,8 @@
#include <iostream>
#include <iomanip>
#include <string>
#include <ctype.h>
#include "opencv2/core/core.hpp"
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/imgproc/imgproc.hpp"