Merge branch 'V8_2_BR'

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 01e412e6ae09b51a98893af00648282447b14850..8a3cd8af9beca55215921360f723e77e41a28b6c 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,7 @@ SET(${PROJECT_NAME_UC}_MINOR_VERSION 2)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
-SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
+SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
 
 # Common CMake macros
 # ===================

diff --git a/src/ShapeRecognition/CMakeLists.txt b/src/ShapeRecognition/CMakeLists.txt
index 5466dcb7511d994de9f6fc0840576cf0a0b880ce..78372f5ac9379dc7d0a5d3d028e8fca96849aed0 100755 (executable)
--- a/src/ShapeRecognition/CMakeLists.txt
+++ b/src/ShapeRecognition/CMakeLists.txt
@@ -34,11 +34,16 @@ ADD_DEFINITIONS(
   #${CAS_DEFINITIONS}
   ${QT_DEFINITIONS}
   )
+IF(NOT SALOME_GUI_BUILD_WITH_QT5)
+  SET(QT_QTCORE_LIB ${QT_QTCORE_LIBRARY})
+ELSE()
+  SET(QT_QTCORE_LIB ${Qt5Core_LIBRARIES})
+ENDIF()
 
 # libraries to link to
 SET(_link_LIBRARIES
   ${OpenCV_LIBS}
-  ${QT_QTCORE_LIBRARY} # ${QT_LIBRARIES}
+  ${QT_QTCORE_LIB}
   ${KERNEL_SALOMELocalTrace}
   )