From d6211124124218ae9a34e5ae743500deacbae246 Mon Sep 17 00:00:00 2001
From: matlabbe <matlabbe@gmail.com>
Date: Fri, 19 Jun 2015 18:12:52 -0400
Subject: [PATCH] OpenCV3 support: Added missing changes from CMakeLists.txt

---
 CMakeLists.txt | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 11158b8d..0176c653 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,11 +122,6 @@ ENDIF(APPLE)
 
 ####### DEPENDENCIES #######
 FIND_PACKAGE(OpenCV REQUIRED)
-IF(OPENCV_NONFREE_FOUND)
-  SET(NONFREE 1)
-ELSE()
-  SET(NONFREE 0)
-ENDIF()
 FIND_PACKAGE(PCL 1.7 REQUIRED)
 FIND_PACKAGE(VTK REQUIRED)
 IF("${VTK_MAJOR_VERSION}" EQUAL 5)
@@ -176,6 +171,10 @@ ENDIF(APPLE AND BUILD_AS_BUNDLE)
 
 
 ####### SOURCES (Projects) #######
+SET(NONFREE 0)
+IF(OPENCV_NONFREE_FOUND OR OPENCV_XFEATURES2D_FOUND)
+   SET(NONFREE 1)
+ENDIF(OPENCV_NONFREE_FOUND OR OPENCV_XFEATURES2D_FOUND)
 CONFIGURE_FILE(Version.h.in ${PROJECT_SOURCE_DIR}/corelib/include/${PROJECT_PREFIX}/core/Version.h)
 
 ADD_SUBDIRECTORY( utilite )
@@ -328,11 +327,21 @@ IF(APPLE)
 MESSAGE(STATUS "  BUILD_AS_BUNDLE = ${BUILD_AS_BUNDLE}")
 ENDIF(APPLE)
 
-IF(OPENCV_NONFREE_FOUND)
-MESSAGE(STATUS "  With OpenCV nonfree module (SIFT/SURF) = YES")
-ELSE()
-MESSAGE(STATUS "  With OpenCV nonfree module (SIFT/SURF) = NO (not found)")
-ENDIF()
+IF(OpenCV_FOUND)
+  IF(OpenCV_VERSION_MAJOR EQUAL 2)
+    IF(OPENCV_NONFREE_FOUND)
+      MESSAGE(STATUS "  With OpenCV 2 nonfree module (SIFT/SURF) = YES")
+    ELSE()
+      MESSAGE(STATUS "  With OpenCV 2 nonfree module (SIFT/SURF) = NO (not found)")
+    ENDIF()
+  ELSE()
+    IF(OPENCV_XFEATURES2D_FOUND)
+      MESSAGE(STATUS "  With OpenCV 3 xfeatures2d module (SIFT/SURF/BRIEF/FREAK) = YES")
+    ELSE()
+      MESSAGE(STATUS "  With OpenCV 3 xfeatures2d module (SIFT/SURF/BRIEF/FREAK) = NO (not found)")
+    ENDIF()
+  ENDIF()
+ENDIF(OpenCV_FOUND)
 
 IF(Freenect_FOUND)
 MESSAGE(STATUS "  With Freenect = YES")