X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FShapeRecognition%2FCMakeLists.txt;h=7853c5ff2a57691ca93efeb7339c4379196ff8a9;hb=d6f1d8730fa07983755573173bfdf8f708f91a17;hp=7e4e7fd4ed36c4c7502069f2e66ced3ab50cc630;hpb=6e0a5f1b4431410d81031a6d91b54dee6b259e1a;p=modules%2Fgeom.git diff --git a/src/ShapeRecognition/CMakeLists.txt b/src/ShapeRecognition/CMakeLists.txt old mode 100755 new mode 100644 index 7e4e7fd4e..7853c5ff2 --- a/src/ShapeRecognition/CMakeLists.txt +++ b/src/ShapeRecognition/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2019 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -22,7 +22,6 @@ # additional include directories INCLUDE_DIRECTORIES( - #${CAS_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS} ${OPENCV_INCLUDE_DIR} ${QT_INCLUDES} @@ -31,14 +30,18 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags 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} )