CMake porting.

Enable Shape Recognition menu item if OpenCV is available

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 95f7c507eb73a484f3b97b63c2a5300099eef7da..05acda4628e82a781cc8eac4a3bd8d645e1eb6db 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -153,6 +153,9 @@ IF(SALOME_BUILD_GUI)
 ELSE()
   SET(SALOME_GEOM_USE_OPENCV OFF)
 ENDIF(SALOME_BUILD_GUI)
+IF(SALOME_GEOM_USE_OPENCV)
+  SET(OPENCV_DEFINITIONS "-DWITH_OPENCV")
+ENDIF()
 
 # Detection summary:
 SALOME_PACKAGE_REPORT()

diff --git a/src/EntityGUI/CMakeLists.txt b/src/EntityGUI/CMakeLists.txt
index 1e32b65b94177905c317e0b3063fbd4aeffe288d..bcbca2b6965240f50d20c1019b75ff0008ed2058 100755 (executable)
--- a/src/EntityGUI/CMakeLists.txt
+++ b/src/EntityGUI/CMakeLists.txt
@@ -50,6 +50,7 @@ ADD_DEFINITIONS(
   ${CAS_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
   ${QT_DEFINITIONS}
+  ${OPENCV_DEFINITIONS}
   )
 
 # libraries to link to
@@ -67,6 +68,7 @@ SET(_link_LIBRARIES
 IF(SALOME_GEOM_USE_OPENCV)
   SET( FeatureDetectorDlg_Sources EntityGUI_FeatureDetectorDlg.cxx )
   SET( FeatureDetectorDlg_moc_h   EntityGUI_FeatureDetectorDlg.h )
+  LIST(APPEND _link_LIBRARIES GEOMShapeRec)
 ENDIF()
 
 # --- resources ---

diff --git a/src/GEOMGUI/CMakeLists.txt b/src/GEOMGUI/CMakeLists.txt
index 5a7cb587e0d5557e91516120de6e853fedd9dded..f69a8d1acb27854a82a68ec359aa11c90d985280 100755 (executable)
--- a/src/GEOMGUI/CMakeLists.txt
+++ b/src/GEOMGUI/CMakeLists.txt
@@ -45,6 +45,7 @@ ADD_DEFINITIONS(
   ${CAS_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
   ${QT_DEFINITIONS}
+  ${OPENCV_DEFINITIONS}
   )
 
 # libraries to link to