Changed all the minimum OpenCV versions to 2.4.3

Rajandeep56 · Feb 12, 2014 · f114d36 · f114d36
1 parent 2e7628f
commit f114d36
Show file tree

Hide file tree

Showing 31 changed files with 33 additions and 33 deletions.
diff --git a/3dmmRendererGUI/CMakeLists.txt b/3dmmRendererGUI/CMakeLists.txt
@@ -7,7 +7,7 @@ SET( ${SUBPROJECT_NAME}_VERSION_MINOR 1 )
 MESSAGE(STATUS "=== Configuring ${SUBPROJECT_NAME} ===")
 
 #OpenCV:
-FIND_PACKAGE( OpenCV 2.3.1 REQUIRED core imgproc highgui)
+FIND_PACKAGE( OpenCV 2.4.3 REQUIRED core imgproc highgui)
 MESSAGE(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}")
 MESSAGE(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}")
 

diff --git a/adaptiveTrackingApp/CMakeLists.txt b/adaptiveTrackingApp/CMakeLists.txt
@@ -7,14 +7,14 @@ SET( ${SUBPROJECT_NAME}_VERSION_MINOR 1 )
 # find dependencies
 FIND_PACKAGE(BLAS REQUIRED)
 FIND_PACKAGE(Boost 1.48.0 COMPONENTS random system filesystem program_options REQUIRED)
-FIND_PACKAGE(OpenCV 2.3.1 REQUIRED core imgproc highgui video)
+FIND_PACKAGE(OpenCV 2.4.3 REQUIRED core imgproc highgui video)
 MESSAGE(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}")
 MESSAGE(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}")
 # Matlab
 SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 FIND_PACKAGE(MATLAB REQUIRED)
 
-IF(WIN32)
+IF(WIN32) # TODO Make use of new WITH_KINECT flag!
 	# In Windows only: Include Microsoft Kinect SDK
 	SET( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake )
 	FIND_PACKAGE(KinectSDK REQUIRED)
@@ -23,7 +23,7 @@ IF(WIN32)
 
 	# Fix for VS2012 that has _VARIADIC_MAX set to 5 (the C++11 standard requires a value
 	# of 10). Don't set too high because it increases compiler memory usage / compile-time.
-	add_definitions( -D_VARIADIC_MAX=9 )
+	add_definitions( -D_VARIADIC_MAX=9 ) # TODO I think we don't need that anymore with VS2013?
 ELSE()
 	SET(KINECT_LIBNAME "")
 ENDIF()

diff --git a/benchmarkApp/CMakeLists.txt b/benchmarkApp/CMakeLists.txt
@@ -7,7 +7,7 @@ SET( ${SUBPROJECT_NAME}_VERSION_MINOR 1 )
 # find dependencies
 FIND_PACKAGE(BLAS REQUIRED)
 FIND_PACKAGE(Boost 1.48.0 COMPONENTS random system filesystem program_options REQUIRED)
-FIND_PACKAGE(OpenCV 2.3.1 REQUIRED core imgproc highgui video)
+FIND_PACKAGE(OpenCV 2.4.3 REQUIRED core imgproc highgui video)
 MESSAGE(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}")
 MESSAGE(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}")
 # Matlab

diff --git a/faceDetectApp/CMakeLists.txt b/faceDetectApp/CMakeLists.txt
@@ -8,7 +8,7 @@ MESSAGE(STATUS "Configuring ${SUBPROJECT_NAME}:")
 MESSAGE(STATUS "-------------------------------")
 
 #OpenCV:
-FIND_PACKAGE( OpenCV 2.3.1 REQUIRED core imgproc highgui)
+FIND_PACKAGE( OpenCV 2.4.3 REQUIRED core imgproc highgui)
 MESSAGE(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}")
 MESSAGE(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}")
 

diff --git a/faceTrackingApp/CMakeLists.txt b/faceTrackingApp/CMakeLists.txt
@@ -6,7 +6,7 @@ SET( ${SUBPROJECT_NAME}_VERSION_MINOR 1 )
 
 # find dependencies
 FIND_PACKAGE(Boost 1.48.0 COMPONENTS random system filesystem program_options REQUIRED)
-FIND_PACKAGE(OpenCV 2.3.1 REQUIRED core imgproc highgui)
+FIND_PACKAGE(OpenCV 2.4.3 REQUIRED core imgproc highgui)
 MESSAGE(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}")
 MESSAGE(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}")
 # Matlab

diff --git a/facemodelTracking/CMakeLists.txt b/facemodelTracking/CMakeLists.txt
@@ -5,7 +5,7 @@ SET( ${SUBPROJECT_NAME}_VERSION_MAJOR 0 )
 SET( ${SUBPROJECT_NAME}_VERSION_MINOR 1 )
 
 #OpenCV:
-FIND_PACKAGE( OpenCV 2.3.1 REQUIRED core imgproc highgui calib3d )
+FIND_PACKAGE( OpenCV 2.4.3 REQUIRED core imgproc highgui calib3d )
 MESSAGE(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}")
 MESSAGE(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}")
 

diff --git a/ffpDetectApp/CMakeLists.txt b/ffpDetectApp/CMakeLists.txt
@@ -5,7 +5,7 @@ SET( ${SUBPROJECT_NAME}_VERSION_MAJOR 0 )
 SET( ${SUBPROJECT_NAME}_VERSION_MINOR 1 )
 
 #OpenCV:
-FIND_PACKAGE( OpenCV 2.3.1 REQUIRED core imgproc highgui calib3d)
+FIND_PACKAGE( OpenCV 2.4.3 REQUIRED core imgproc highgui calib3d)
 MESSAGE(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}")
 MESSAGE(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}")
 

diff --git a/ffpDetectAppExp/CMakeLists.txt b/ffpDetectAppExp/CMakeLists.txt
@@ -5,7 +5,7 @@ SET( ${SUBPROJECT_NAME}_VERSION_MAJOR 0 )
 SET( ${SUBPROJECT_NAME}_VERSION_MINOR 1 )
 
 #OpenCV:
-FIND_PACKAGE( OpenCV 2.3.1 REQUIRED core imgproc highgui calib3d)
+FIND_PACKAGE( OpenCV 2.4.3 REQUIRED core imgproc highgui calib3d)
 MESSAGE(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}")
 MESSAGE(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}")
 

diff --git a/fitter/CMakeLists.txt b/fitter/CMakeLists.txt
@@ -5,7 +5,7 @@ SET( ${SUBPROJECT_NAME}_VERSION_MAJOR 0 )
 SET( ${SUBPROJECT_NAME}_VERSION_MINOR 1 )
 
 #OpenCV:
-FIND_PACKAGE( OpenCV 2.3.1 REQUIRED core imgproc highgui calib3d )
+FIND_PACKAGE( OpenCV 2.4.3 REQUIRED core imgproc highgui calib3d )
 MESSAGE(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}")
 MESSAGE(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}")
 

diff --git a/frDbExp/CMakeLists.txt b/frDbExp/CMakeLists.txt
@@ -8,7 +8,7 @@ MESSAGE(STATUS "Configuring ${SUBPROJECT_NAME}:")
 MESSAGE(STATUS "-------------------------------")
 
 #OpenCV:
-FIND_PACKAGE( OpenCV 2.3.1 REQUIRED core imgproc highgui)
+FIND_PACKAGE( OpenCV 2.4.3 REQUIRED core imgproc highgui)
 MESSAGE(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}")
 MESSAGE(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}")
 

diff --git a/frDbTool/CMakeLists.txt b/frDbTool/CMakeLists.txt
@@ -8,7 +8,7 @@ MESSAGE(STATUS "Configuring ${SUBPROJECT_NAME}:")
 MESSAGE(STATUS "-------------------------------")
 
 #OpenCV:
-FIND_PACKAGE( OpenCV 2.3.1 REQUIRED core imgproc highgui)
+FIND_PACKAGE( OpenCV 2.4.3 REQUIRED core imgproc highgui)
 MESSAGE(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}")
 MESSAGE(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}")
 

diff --git a/frRunCogExp/CMakeLists.txt b/frRunCogExp/CMakeLists.txt
@@ -8,7 +8,7 @@ MESSAGE(STATUS "Configuring ${SUBPROJECT_NAME}:")
 MESSAGE(STATUS "-------------------------------")
 
 #OpenCV:
-FIND_PACKAGE( OpenCV 2.3.1 REQUIRED core imgproc highgui)
+FIND_PACKAGE( OpenCV 2.4.3 REQUIRED core imgproc highgui)
 MESSAGE(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}")
 MESSAGE(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}")
 

diff --git a/generateSyntheticLandmarkDataKlaus/CMakeLists.txt b/generateSyntheticLandmarkDataKlaus/CMakeLists.txt
@@ -7,7 +7,7 @@ SET( ${SUBPROJECT_NAME}_VERSION_MINOR 1 )
 MESSAGE(STATUS "=== Configuring ${SUBPROJECT_NAME} ===")
 
 #OpenCV:
-FIND_PACKAGE( OpenCV 2.3.1 REQUIRED core imgproc highgui)
+FIND_PACKAGE( OpenCV 2.4.3 REQUIRED core imgproc highgui)
 MESSAGE(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}")
 MESSAGE(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}")
 

diff --git a/headTrackingApp/CMakeLists.txt b/headTrackingApp/CMakeLists.txt
@@ -7,7 +7,7 @@ SET( ${SUBPROJECT_NAME}_VERSION_MINOR 1 )
 # find dependencies
 FIND_PACKAGE(BLAS REQUIRED)
 FIND_PACKAGE(Boost 1.48.0 COMPONENTS random system filesystem program_options REQUIRED)
-FIND_PACKAGE(OpenCV 2.3.1 REQUIRED core imgproc highgui video)
+FIND_PACKAGE(OpenCV 2.4.3 REQUIRED core imgproc highgui video)
 MESSAGE(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}")
 MESSAGE(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}")
 # Matlab

diff --git a/landmarkEvaluation/CMakeLists.txt b/landmarkEvaluation/CMakeLists.txt
@@ -5,7 +5,7 @@ SET( ${SUBPROJECT_NAME}_VERSION_MAJOR 0 )
 SET( ${SUBPROJECT_NAME}_VERSION_MINOR 1 )
 
 #OpenCV:
-FIND_PACKAGE( OpenCV 2.3.1 REQUIRED core imgproc highgui objdetect features2d nonfree )
+FIND_PACKAGE( OpenCV 2.4.3 REQUIRED core imgproc highgui objdetect features2d nonfree )
 MESSAGE(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}")
 MESSAGE(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}")
 

diff --git a/landmarkVisualiser/CMakeLists.txt b/landmarkVisualiser/CMakeLists.txt
@@ -5,7 +5,7 @@ SET( ${SUBPROJECT_NAME}_VERSION_MAJOR 0 )
 SET( ${SUBPROJECT_NAME}_VERSION_MINOR 1 )
 
 #OpenCV:
-FIND_PACKAGE( OpenCV 2.3.1 REQUIRED core imgproc highgui calib3d )
+FIND_PACKAGE( OpenCV 2.4.3 REQUIRED core imgproc highgui calib3d )
 MESSAGE(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}")
 MESSAGE(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}")
 

diff --git a/libClassification/CMakeLists.txt b/libClassification/CMakeLists.txt
@@ -8,7 +8,7 @@ MESSAGE(STATUS "=== Configuring ${SUBPROJECT_NAME} ===")
 
 # find dependencies
 FIND_PACKAGE(Boost 1.48.0 REQUIRED)
-FIND_PACKAGE(OpenCV 2.3.1 REQUIRED core)
+FIND_PACKAGE(OpenCV 2.4.3 REQUIRED core)
 MESSAGE(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}")
 MESSAGE(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}")
 #Matlab:

diff --git a/libCondensation/CMakeLists.txt b/libCondensation/CMakeLists.txt
@@ -6,7 +6,7 @@ SET( ${SUBPROJECT_NAME}_VERSION_MINOR 1 )
 
 # find dependencies
 FIND_PACKAGE(Boost 1.48.0 REQUIRED)
-FIND_PACKAGE(OpenCV 2.3.1 REQUIRED core)
+FIND_PACKAGE(OpenCV 2.4.3 REQUIRED core)
 MESSAGE(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}")
 MESSAGE(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}")
 

diff --git a/libDetection/CMakeLists.txt b/libDetection/CMakeLists.txt
@@ -13,7 +13,7 @@ ELSE(Boost_FOUND)
   MESSAGE(FATAL_ERROR "Boost not found")
 ENDIF()
 # OpenCV:
-FIND_PACKAGE(OpenCV 2.3.1 REQUIRED core)
+FIND_PACKAGE(OpenCV 2.4.3 REQUIRED core)
 MESSAGE(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}")
 MESSAGE(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}")
 

diff --git a/libImageIO/CMakeLists.txt b/libImageIO/CMakeLists.txt
@@ -9,7 +9,7 @@ MESSAGE(STATUS "=== Configuring ${SUBPROJECT_NAME} ===")
 # find dependencies
 #FIND_PACKAGE(Boost 1.48.0 COMPONENTS filesystem REQUIRED)	# Patrik: I think we need 'system' too, if the app doesn't link to it, ImageIO fails to link.
 FIND_PACKAGE(Boost 1.48.0 REQUIRED) # We only want the headers in the lib?
-FIND_PACKAGE(OpenCV 2.3.1 REQUIRED core)
+FIND_PACKAGE(OpenCV 2.4.3 REQUIRED core)
 MESSAGE(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}")
 MESSAGE(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}")
 IF(WITH_MSKINECT_SDK)

diff --git a/libImageLogging/CMakeLists.txt b/libImageLogging/CMakeLists.txt
@@ -8,7 +8,7 @@ MESSAGE(STATUS "=== Configuring ${SUBPROJECT_NAME} ===")
 
 # find dependencies
 # OpenCV:
-FIND_PACKAGE(OpenCV 2.3.1 REQUIRED core)
+FIND_PACKAGE(OpenCV 2.4.3 REQUIRED core)
 MESSAGE(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}")
 MESSAGE(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}")
 

diff --git a/libImageProcessing/CMakeLists.txt b/libImageProcessing/CMakeLists.txt
@@ -9,7 +9,7 @@ MESSAGE(STATUS "=== Configuring ${SUBPROJECT_NAME} ===")
 # find dependencies
 FIND_PACKAGE(Boost 1.48.0 REQUIRED) # We only need the headers
 
-FIND_PACKAGE(OpenCV 2.3.1 REQUIRED core imgproc)
+FIND_PACKAGE(OpenCV 2.4.3 REQUIRED core imgproc)
 MESSAGE(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}")
 MESSAGE(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}")
 

diff --git a/libLinear/CMakeLists.txt b/libLinear/CMakeLists.txt
@@ -8,7 +8,7 @@ MESSAGE(STATUS "=== Configuring ${SUBPROJECT_NAME} ===")
 
 # find dependencies
 FIND_PACKAGE(BLAS REQUIRED)
-FIND_PACKAGE(OpenCV 2.3.1 REQUIRED core)
+FIND_PACKAGE(OpenCV 2.4.3 REQUIRED core)
 MESSAGE(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}")
 MESSAGE(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}")
 

diff --git a/libRender/CMakeLists.txt b/libRender/CMakeLists.txt
@@ -7,7 +7,7 @@ SET( ${SUBPROJECT_NAME}_VERSION_MINOR 1 )
 MESSAGE(STATUS "=== Configuring ${SUBPROJECT_NAME} ===")
 
 #OpenCV:
-FIND_PACKAGE( OpenCV 2.3.1 REQUIRED core imgproc highgui)
+FIND_PACKAGE( OpenCV 2.4.3 REQUIRED core imgproc highgui)
 MESSAGE(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}")
 MESSAGE(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}")
 

diff --git a/libShapeModels/CMakeLists.txt b/libShapeModels/CMakeLists.txt
@@ -6,7 +6,7 @@ SET( ${SUBPROJECT_NAME}_VERSION_MINOR 1 )
 
 # find dependencies
 FIND_PACKAGE(Boost 1.48.0 REQUIRED)
-FIND_PACKAGE(OpenCV 2.3.1 REQUIRED core calib3d features2d nonfree objdetect)
+FIND_PACKAGE(OpenCV 2.4.3 REQUIRED core calib3d features2d nonfree objdetect)
 
 #IF(WIN32)
 	#FIND_PACKAGE (HDF5 NAMES hdf5) # puts it in Config-mode

diff --git a/libSvm/CMakeLists.txt b/libSvm/CMakeLists.txt
@@ -7,7 +7,7 @@ SET( ${SUBPROJECT_NAME}_VERSION_MINOR 1 )
 MESSAGE(STATUS "=== Configuring ${SUBPROJECT_NAME} ===")
 
 # find dependencies
-FIND_PACKAGE(OpenCV 2.3.1 REQUIRED core)
+FIND_PACKAGE(OpenCV 2.4.3 REQUIRED core)
 MESSAGE(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}")
 MESSAGE(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}")
 

diff --git a/partiallyAdaptiveTrackingApp/CMakeLists.txt b/partiallyAdaptiveTrackingApp/CMakeLists.txt
@@ -6,7 +6,7 @@ SET( ${SUBPROJECT_NAME}_VERSION_MINOR 1 )
 
 # find dependencies
 FIND_PACKAGE(Boost 1.48.0 COMPONENTS random system filesystem program_options REQUIRED)
-FIND_PACKAGE(OpenCV 2.3.1 REQUIRED core imgproc highgui)
+FIND_PACKAGE(OpenCV 2.4.3 REQUIRED core imgproc highgui)
 MESSAGE(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}")
 MESSAGE(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}")
 # Matlab

diff --git a/patchConverter/CMakeLists.txt b/patchConverter/CMakeLists.txt
@@ -5,7 +5,7 @@ SET( ${SUBPROJECT_NAME}_VERSION_MAJOR 0 )
 SET( ${SUBPROJECT_NAME}_VERSION_MINOR 1 )
 
 #OpenCV:
-FIND_PACKAGE( OpenCV 2.3.1 REQUIRED core imgproc highgui)
+FIND_PACKAGE( OpenCV 2.4.3 REQUIRED core imgproc highgui)
 MESSAGE(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}")
 MESSAGE(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}")
 

diff --git a/sdmTracking/CMakeLists.txt b/sdmTracking/CMakeLists.txt
@@ -5,7 +5,7 @@ SET( ${SUBPROJECT_NAME}_VERSION_MAJOR 0 )
 SET( ${SUBPROJECT_NAME}_VERSION_MINOR 1 )
 
 #OpenCV:
-FIND_PACKAGE( OpenCV 2.3.1 REQUIRED core imgproc highgui objdetect features2d nonfree )
+FIND_PACKAGE( OpenCV 2.4.3 REQUIRED core imgproc highgui objdetect features2d nonfree )
 MESSAGE(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}")
 MESSAGE(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}")
 

diff --git a/sdmTraining/CMakeLists.txt b/sdmTraining/CMakeLists.txt
@@ -5,7 +5,7 @@ SET( ${SUBPROJECT_NAME}_VERSION_MAJOR 0 )
 SET( ${SUBPROJECT_NAME}_VERSION_MINOR 1 )
 
 #OpenCV:
-FIND_PACKAGE( OpenCV 2.3.1 REQUIRED core imgproc highgui objdetect features2d nonfree )
+FIND_PACKAGE( OpenCV 2.4.3 REQUIRED core imgproc highgui objdetect features2d nonfree )
 MESSAGE(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}")
 MESSAGE(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}")
 

diff --git a/trackerAppERT/CMakeLists.txt b/trackerAppERT/CMakeLists.txt
@@ -5,7 +5,7 @@ SET( ${SUBPROJECT_NAME}_VERSION_MAJOR 0 )
 SET( ${SUBPROJECT_NAME}_VERSION_MINOR 1 )
 
 #OpenCV:
-FIND_PACKAGE( OpenCV 2.3.1 REQUIRED core imgproc highgui)
+FIND_PACKAGE( OpenCV 2.4.3 REQUIRED core imgproc highgui)
 MESSAGE(STATUS "OpenCV include dir found at ${OpenCV_INCLUDE_DIRS}")
 MESSAGE(STATUS "OpenCV lib dir found at ${OpenCV_LIB_DIR}")