Correction of bug MANTIS23234 CEA1726.

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

diff --git a/src/salomegui/CMakeLists.txt b/src/salomegui/CMakeLists.txt
index 6991dde61044915b5a2cee3c1c323ff50b8f1741..52111884db216703085e4c0d708a24241ae93e00 100644 (file)
--- a/src/salomegui/CMakeLists.txt
+++ b/src/salomegui/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D
+# Copyright (C) 2012-2015  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
 # 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,8 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQtExt)
 
 # --- options ---
 
@@ -45,23 +44,17 @@ INCLUDE_DIRECTORIES(
 
 # additional preprocessor / compiler flags
 ADD_DEFINITIONS(
-  -DYACS_PTHREAD
   ${PYTHON_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}
@@ -74,6 +67,7 @@ SET(YACS_RESOURCES
   resources/YACS_icons.ts
   resources/YACS_msg_en.ts
   resources/YACS_msg_fr.ts
+  resources/YACS_msg_ja.ts
 )
 
 SET(_res_files
@@ -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