From: ana Date: Mon, 12 Dec 2016 12:52:05 +0000 (+0300) Subject: Windows compatibility (Qt5) X-Git-Tag: V8_3_0a1~3 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3ac2c8a5e8868a7d8c18754e0edc5df9fb16f6be;p=modules%2Fgeom.git Windows compatibility (Qt5) --- diff --git a/src/ShapeRecognition/CMakeLists.txt b/src/ShapeRecognition/CMakeLists.txt index 5466dcb75..78372f5ac 100755 --- 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} )