X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSTLPlugin%2FCMakeLists.txt;h=1488ab4d26e62002d373960da3ee0091ea38dff9;hb=6fc8283dbbb497e617cb36deae082fdeae4e3844;hp=b4688f6b1b4eed8c8159c97457cfef8d6162bc16;hpb=6e2763b42437045fd4b18aa3a6197865020de84b;p=modules%2Fgeom.git

diff --git a/src/STLPlugin/CMakeLists.txt b/src/STLPlugin/CMakeLists.txt
index b4688f6b1..1488ab4d2 100644
--- a/src/STLPlugin/CMakeLists.txt
+++ b/src/STLPlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2014  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2014-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
@@ -18,15 +18,14 @@
 #
 
 IF(SALOME_BUILD_GUI)
-  INCLUDE(UseQt4Ext)
-  INCLUDE(${QT_USE_FILE})
+  INCLUDE(UseQtExt)
 ENDIF()
 
 # --- options ---
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${CAS_INCLUDE_DIRS}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${KERNEL_INCLUDE_DIRS}
   ${PROJECT_BINARY_DIR}/idl
   ${PROJECT_SOURCE_DIR}/src/GEOMAlgo
@@ -39,7 +38,6 @@ INCLUDE_DIRECTORIES(
   
 IF(SALOME_BUILD_GUI)
   INCLUDE_DIRECTORIES(
-    ${QT_INCLUDE_DIRS}
     ${GUI_INCLUDE_DIRS}
     ${PROJECT_SOURCE_DIR}/src/OBJECT
     ${PROJECT_SOURCE_DIR}/src/GEOMGUI
@@ -49,7 +47,7 @@ ENDIF()
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
-  ${CAS_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
   )
   
@@ -65,7 +63,7 @@ ENDIF()
 
 # libraries to link to
 SET(_link_engine_LIBRARIES
-  ${CAS_TKSTL}
+  ${OpenCASCADE_DataExchange_LIBRARIES}
   ${KERNEL_SALOMELocalTrace}
   ${KERNEL_OpUtil}
   SalomeIDLGEOM
@@ -110,7 +108,7 @@ ENDIF()
 
 IF(SALOME_BUILD_GUI)
   # sources / moc wrappings
-  QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+  QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
   SET(STLPluginGUI_SOURCES
     STLPlugin_GUI.cxx
@@ -147,7 +145,7 @@ IF(SALOME_BUILD_GUI)
   TARGET_LINK_LIBRARIES(STLPluginGUI ${_link_gui_LIBRARIES})
   INSTALL(TARGETS STLPluginGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
   
-  QT4_INSTALL_TS_RESOURCES("${STLPlugin_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")
+  QT_INSTALL_TS_RESOURCES("${STLPlugin_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")
 ENDIF()