Merge changes for HYDRO project : hydro/imps_2017_salome_84 branch.

[modules/geom.git] / src / DependencyTree / CMakeLists.txt

diff --git a/src/DependencyTree/CMakeLists.txt b/src/DependencyTree/CMakeLists.txt
index a3807832a017e0a4ed50e6347f433f13d941a50c..9c5543dae44d35aabc7d4e82bade080b48f625d8 100644 (file)
--- a/src/DependencyTree/CMakeLists.txt
+++ b/src/DependencyTree/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2014  CEA/DEN, EDF R&D
+# Copyright (C) 2012-2016  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,8 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQtExt)
 
 # --- options ---
 
@@ -26,47 +25,35 @@ INCLUDE(${QT_USE_FILE})
 INCLUDE_DIRECTORIES(
   ${QT_INCLUDES}
   ${GUI_INCLUDE_DIRS}
-  ${CAS_INCLUDE_DIRS}
-  ${OMNIORB_INCLUDE_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_BINARY_DIR}
+  ${OpenCASCADE_INCLUDE_DIR}
   ${PROJECT_SOURCE_DIR}/src/GEOMGUI
   ${PROJECT_SOURCE_DIR}/src/GEOMBase
-    ${PROJECT_SOURCE_DIR}/src/GEOM
-        ${PROJECT_SOURCE_DIR}/src/GEOMUtils
-    
-    
-      ${PROJECT_BINARY_DIR}/idl
-  ${PROJECT_BINARY_DIR}
+  ${PROJECT_SOURCE_DIR}/src/GEOM
   ${PROJECT_SOURCE_DIR}/src/OBJECT
-  ${PROJECT_SOURCE_DIR}/src/GEOMClient
-  ${PROJECT_SOURCE_DIR}/src/GEOMImpl
   ${PROJECT_SOURCE_DIR}/src/GEOMUtils
-  ${PROJECT_SOURCE_DIR}/src/DlgRef
-  ${PROJECT_BINARY_DIR}/src/DlgRef
-  
+  ${PROJECT_SOURCE_DIR}/src/GEOMClient
+  ${PROJECT_BINARY_DIR}/idl 
   )
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
   ${QT_DEFINITIONS}
   ${GUI_DEFINITIONS}
-    ${CAS_DEFINITIONS}
   ${OMNIORB_DEFINITIONS}
+  ${OpenCASCADE_DEFINITIONS}
   )
+IF(WIN32)
+  ADD_DEFINITIONS(-DNOGDI)
+ENDIF(WIN32)
 
 # libraries to link to
 SET(_link_LIBRARIES
   ${QT_LIBRARIES}
   ${GUI_SalomeApp}
-  ${GUI_suit}
-  ${GUI_qtx}
-  ${GUI_QxScene}
   ${GUI_GraphicsView}
-  ${GUI_SalomeObject}
-  GEOMUtils
-  ${KERNEL_SalomeDS}
-)
+  GEOM
+  GEOMBase
+  )
 
 # --- headers ---
 
@@ -74,27 +61,28 @@ SET(DependencyTree_HEADERS
   DependencyTree_Arrow.h
   DependencyTree_Object.h
   DependencyTree_Selector.h
+  DependencyTree.h
   )
 
 # header files / to be processed by moc
 SET(_moc_HEADERS
   DependencyTree_View.h
   DependencyTree_ViewModel.h
-)
+  )
 
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
 SET(DependencyTree_SOURCES
-  DependencyTree_View.cxx
-  DependencyTree_Object.cxx
   DependencyTree_Arrow.cxx
+  DependencyTree_Object.cxx
   DependencyTree_Selector.cxx
+  DependencyTree_View.cxx
   DependencyTree_ViewModel.cxx
   ${_moc_SOURCES}
-)
+  )
 
 # --- resources ---
 
@@ -103,7 +91,7 @@ SET(_res_files
   resources/DependencyTree_msg_en.ts     
   resources/DependencyTree_msg_fr.ts 
   resources/DependencyTree_msg_ja.ts          
-)
+  )
 
 # --- rules ---
 
@@ -113,4 +101,4 @@ INSTALL(TARGETS DependencyTree EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${S
 
 INSTALL(FILES ${DependencyTree_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
 
-QT4_INSTALL_TS_RESOURCES("${_res_files}" "${SALOME_GEOM_INSTALL_RES_DATA}")
+QT_INSTALL_TS_RESOURCES("${_res_files}" "${SALOME_GEOM_INSTALL_RES_DATA}")