From 3ac2c8a5e8868a7d8c18754e0edc5df9fb16f6be Mon Sep 17 00:00:00 2001 From: ana Date: Mon, 12 Dec 2016 15:52:05 +0300 Subject: [PATCH] Windows compatibility (Qt5) --- src/ShapeRecognition/CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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} ) -- 2.39.2