Merge branch 'hydro/imps_2015'

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

diff --git a/src/AdvancedGUI/CMakeLists.txt b/src/AdvancedGUI/CMakeLists.txt
index a4af292d2462cae12d4a179a0a62d4deb774ecf7..6a023ac702f2f7a6a0f00eee3ffe69a93e724271 100755 (executable)
--- a/src/AdvancedGUI/CMakeLists.txt
+++ b/src/AdvancedGUI/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2015  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
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,14 +17,12 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQtExt)
 
 # --- options ---
 
 # additional include directories
 INCLUDE_DIRECTORIES(
-  ${QT_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
   ${VTK_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
@@ -38,7 +36,11 @@ INCLUDE_DIRECTORIES(
   ${PROJECT_SOURCE_DIR}/src/GEOMImpl
   ${PROJECT_SOURCE_DIR}/src/GEOMGUI
   ${PROJECT_SOURCE_DIR}/src/GEOMBase
+  ${PROJECT_SOURCE_DIR}/src/GEOM
+  ${PROJECT_SOURCE_DIR}/src/GEOMAlgo
   ${PROJECT_SOURCE_DIR}/src/DlgRef
+  ${PROJECT_SOURCE_DIR}/src/AdvancedEngine
+  ${PROJECT_SOURCE_DIR}/src/GEOM_I
   ${PROJECT_BINARY_DIR}/src/DlgRef
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
@@ -54,6 +56,7 @@ ADD_DEFINITIONS(
 # libraries to link to
 SET(_link_LIBRARIES
   GEOMBase
+  SalomeIDLAdvancedGEOM
   )
 
 # --- resources ---
@@ -64,10 +67,10 @@ SET(_uic_files
 
 # resource files / to be processed by lrelease
 SET(AdvancedGUI_RESOURCES
-  AdvancedGUI_images.ts
-  AdvancedGUI_msg_en.ts
-  AdvancedGUI_msg_fr.ts
-  AdvancedGUI_msg_ja.ts
+  AdvancedGEOM_images.ts
+  AdvancedGEOM_msg_en.ts
+  AdvancedGEOM_msg_fr.ts
+  AdvancedGEOM_msg_ja.ts
   )
 
 # --- headers ---
@@ -91,14 +94,15 @@ SET(_moc_HEADERS
   )
 
 # header files / uic wrappings
-QT4_WRAP_UI(_uic_HEADERS ${_uic_files})
+QT_WRAP_UIC(_uic_HEADERS ${_uic_files})
 
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
 
 SET(AdvancedGUI_SOURCES
+  AdvancedGUI.cxx
   AdvancedGUI_PipeTShapeDlg.cxx
   AdvancedGUI_DividedDiskDlg.cxx
   AdvancedGUI_DividedCylinderDlg.cxx
@@ -114,4 +118,4 @@ ADD_LIBRARY(AdvancedGUI ${AdvancedGUI_SOURCES})
 TARGET_LINK_LIBRARIES(AdvancedGUI ${_link_LIBRARIES})
 INSTALL(TARGETS AdvancedGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
-QT4_INSTALL_TS_RESOURCES("${AdvancedGUI_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")
+QT_INSTALL_TS_RESOURCES("${AdvancedGUI_RESOURCES}" "${SALOME_GEOM_INSTALL_RES_DATA}")