[EDF15946] bug with playground when nb of cores is small

[modules/yacs.git] / src / salomegui / CMakeLists.txt

diff --git a/src/salomegui/CMakeLists.txt b/src/salomegui/CMakeLists.txt
index 5ac4a5543b688c256603ca5649b45561b6d157f5..676f088c950ff5a5d0bf82b826fdb6a4f2bfe962 100644 (file)
--- a/src/salomegui/CMakeLists.txt
+++ b/src/salomegui/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2014  CEA/DEN, EDF R&D
+# Copyright (C) 2012-2016  CEA/DEN, EDF R&D
 #
 # 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 ---
 
@@ -49,18 +48,13 @@ ADD_DEFINITIONS(
   ${OMNIORB_DEFINITIONS}
   ${BOOST_DEFINITIONS}
   ${QT_DEFINITIONS}
-  ${QSCINTILLA_DEFINITIONS}
   ${GRAPHVIZ_DEFINITIONS}
   )
-IF(WIN32)
-  ADD_DEFINITIONS(-DNOGDI)
-ENDIF(WIN32)
 
 # libraries to link to
 SET(_link_LIBRARIES
   GenericGui
   ${QT_LIBRARIES}
-  ${QSCINTILLA_LIBRARIES}
   ${GUI_Event}
   ${GUI_SalomeApp}
   ${GUI_SalomeSession}
@@ -95,12 +89,12 @@ 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(YACS_SOURCES
   Yacsgui.cxx
@@ -118,7 +112,7 @@ TARGET_LINK_LIBRARIES(YACS ${_link_LIBRARIES})
 INSTALL(TARGETS YACS EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
 
 INSTALL(FILES ${YACS_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
-QT4_INSTALL_TS_RESOURCES("${YACS_RESOURCES}" "${SALOME_YACS_INSTALL_RES_DATA}")        
+QT_INSTALL_TS_RESOURCES("${YACS_RESOURCES}" "${SALOME_YACS_INSTALL_RES_DATA}") 
 
 INSTALL(FILES ${_res_files} DESTINATION ${SALOME_YACS_INSTALL_RES_DATA})
 SALOME_CONFIGURE_FILE(resources/YACSCatalog.xml.in