X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FShapeRecognition%2FCMakeLists.txt;h=7853c5ff2a57691ca93efeb7339c4379196ff8a9;hb=d6f1d8730fa07983755573173bfdf8f708f91a17;hp=fc919405052f3ab5bd5066de7e8b764f0de19fe6;hpb=8370b4a1c488f6ef18d8944869d6a8cd3a2d18d2;p=modules%2Fgeom.git

diff --git a/src/ShapeRecognition/CMakeLists.txt b/src/ShapeRecognition/CMakeLists.txt
old mode 100755
new mode 100644
index fc9194050..7853c5ff2
--- a/src/ShapeRecognition/CMakeLists.txt
+++ b/src/ShapeRecognition/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2016  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
@@ -17,11 +17,11 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+
 # --- options ---
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  #${CAS_INCLUDE_DIRS}
   ${KERNEL_INCLUDE_DIRS}
   ${OPENCV_INCLUDE_DIR}
   ${QT_INCLUDES}
@@ -30,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}
   )
 
@@ -60,5 +64,3 @@ TARGET_LINK_LIBRARIES(GEOMShapeRec ${_link_LIBRARIES})
 INSTALL(TARGETS GEOMShapeRec EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
 #INSTALL(FILES ${ShapeRecognition_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
-
-