adapted all nonfree header inclusion since it doesn't exist anymore as a module

samples/gpu/performance/CMakeLists.txt

@@ -3,15 +3,15 @@ set(the_target "example_gpu_performance")
 file(GLOB sources "performance/*.cpp")
 file(GLOB headers "performance/*.h")
 
-if(HAVE_opencv_nonfree)
-  ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/nonfree/include")
+if(HAVE_opencv_xfeatures2d)
+  ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/xfeatures2d/include")
 endif()
 
 add_executable(${the_target} ${sources} ${headers})
 ocv_target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${OPENCV_CUDA_SAMPLES_REQUIRED_DEPS})
 
-if(HAVE_opencv_nonfree)
-  ocv_target_link_libraries(${the_target} opencv_nonfree)
+if(HAVE_opencv_xfeatures2d)
+  ocv_target_link_libraries(${the_target} opencv_xfeatures2d)
 endif()
 
 set_target_properties(${the_target} PROPERTIES

samples/gpu/performance/tests.cpp

@@ -17,9 +17,9 @@
 
 #include "opencv2/opencv_modules.hpp"
 
-#ifdef HAVE_OPENCV_NONFREE
-#include "opencv2/nonfree/cuda.hpp"
-#include "opencv2/nonfree/nonfree.hpp"
+#ifdef HAVE_OPENCV_XFEATURES2D
+#include "opencv2/xfeatures2d/cuda.hpp"
+#include "opencv2/xfeatures2d/nonfree.hpp"
 #endif
 
 using namespace std;
@@ -274,7 +274,7 @@ TEST(meanShift)
     }
 }
 
-#ifdef HAVE_OPENCV_NONFREE
+#ifdef HAVE_OPENCV_XFEATURES2D
 
 TEST(SURF)
 {