Merge pull request #632 from StevenPuttemans:remove_redundant_CMAKE_check

Author: alalek

modules/cnn_3dobj/CMakeLists.txt

@@ -33,8 +33,8 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 if(${Caffe_FOUND})
   include_directories(${Caffe_INCLUDE_DIR})
 endif()
-  set(the_description "CNN for 3D object recognition and pose estimation including a completed Sphere View on 3D objects")
-  ocv_define_module(cnn_3dobj opencv_core opencv_imgproc opencv_viz opencv_highgui OPTIONAL WRAP python)
+set(the_description "CNN for 3D object recognition and pose estimation including a completed Sphere View on 3D objects")
+ocv_define_module(cnn_3dobj opencv_core opencv_imgproc opencv_viz opencv_highgui OPTIONAL WRAP python)
 
 if(${Caffe_FOUND})
   target_link_libraries(opencv_cnn_3dobj ${Caffe_LIBS} ${Glog_LIBS} ${Protobuf_LIBS})

modules/cvv/CMakeLists.txt

@@ -3,6 +3,9 @@ if(NOT HAVE_QT5)
   return()
 endif()
 
+set(the_description "Debug visualization framework")
+ocv_define_module(cvv opencv_core opencv_imgproc opencv_features2d ${CVV_LIBRARIES} WRAP python)
+
 # we need C++11 and want warnings:
 if(MSVC)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Qstd=c++11 /W4")
@@ -20,6 +23,3 @@ foreach(dt5_dep Core Gui Widgets)
   include_directories(${Qt5${dt5_dep}_INCLUDE_DIRS})
   list(APPEND CVV_LIBRARIES ${Qt5${dt5_dep}_LIBRARIES})
 endforeach()
-
-set(the_description "Debug visualization framework")
-ocv_define_module(cvv opencv_core opencv_imgproc opencv_features2d ${CVV_LIBRARIES} WRAP python)

modules/hdf/CMakeLists.txt

@@ -27,13 +27,13 @@ else()
     message(STATUS "HDF5:   NO")
 endif()
 
+set(the_description "Hierarchical Data Format I/O")
+ocv_define_module(hdf opencv_core WRAP python)
+
 if(HDF5_FOUND)
   include_directories(${HDF5_INCLUDE_DIRS})
 endif()
 
-set(the_description "Hierarchical Data Format I/O")
-ocv_define_module(hdf opencv_core WRAP python)
-
 if(HDF5_FOUND)
   target_link_libraries(opencv_hdf ${HDF5_LIBRARIES})
 endif()

modules/text/CMakeLists.txt

@@ -1,3 +1,6 @@
+set(the_description "Text Detection and Recognition")
+ocv_define_module(text opencv_ml opencv_highgui opencv_imgproc opencv_core opencv_features2d WRAP python)
+
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR})
 
 find_package(Tesseract)
@@ -17,9 +20,6 @@ if(${Tesseract_FOUND})
 include_directories(${Tesseract_INCLUDE_DIR})
 endif()
 
-set(the_description "Text Detection and Recognition")
-ocv_define_module(text opencv_ml opencv_highgui opencv_imgproc opencv_core opencv_features2d WRAP python)
-
 if(${Tesseract_FOUND})
   target_link_libraries(opencv_text ${Tesseract_LIBS})
 endif()