Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
introduction of penta18 in VTK viewer
[modules/gui.git]
/
src
/
Qtx
/
CMakeLists.txt
diff --git
a/src/Qtx/CMakeLists.txt
b/src/Qtx/CMakeLists.txt
index 32df69661a4269ebccbe3ef6dae1df02b9ce36dd..ad1337ffc18e4aa47753c5d305fe0bf4e354330e 100755
(executable)
--- a/
src/Qtx/CMakeLists.txt
+++ b/
src/Qtx/CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (C) 2012-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-201
6
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
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@
-17,7
+17,7
@@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-INCLUDE(UseQt
4
Ext)
+INCLUDE(UseQtExt)
# --- options ---
# --- options ---
@@
-72,16
+72,20
@@
SET(_moc_HEADERS
QtxSlider.h
QtxSplash.h
QtxToolBar.h
QtxSlider.h
QtxSplash.h
QtxToolBar.h
+ QtxToolButton.h
QtxToolTip.h
QtxTreeView.h
QtxValidator.h
QtxToolTip.h
QtxTreeView.h
QtxValidator.h
- QtxWebBrowser.h
QtxWorkspace.h
QtxWorkspaceAction.h
QtxWorkstack.h
QtxWorkstackAction.h
)
QtxWorkspace.h
QtxWorkspaceAction.h
QtxWorkstack.h
QtxWorkstackAction.h
)
+IF(SALOME_GUI_ENABLE_QTXWEBBROWSER)
+ SET(_moc_HEADERS ${_moc_HEADERS} QtxWebBrowser.h)
+ENDIF()
+
# obsolete files: not migrated to Qt4
# _moc_HEADERS << QtxListBox.h QtxTable.h
# TODO: migrate or remove?
# obsolete files: not migrated to Qt4
# _moc_HEADERS << QtxListBox.h QtxTable.h
# TODO: migrate or remove?
@@
-111,11
+115,11
@@
SET(_ts_RESOURCES resources/Qtx_msg_fr.ts
# --- sources ---
# --- sources ---
-# sources / rcc wrappings
-QT4_ADD_RESOURCES(_rcc_SOURCES ${_rcc_RESOURCES})
-
# sources / moc wrappings
# sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${_moc_HEADERS})
+
+# sources / rcc wrappings
+QT_ADD_RESOURCES(_rcc_SOURCES ${_rcc_RESOURCES})
# sources / static
SET(_other_SOURCES
# sources / static
SET(_other_SOURCES
@@
-161,17
+165,21
@@
SET(_other_SOURCES
QtxSlider.cxx
QtxSplash.cxx
QtxToolBar.cxx
QtxSlider.cxx
QtxSplash.cxx
QtxToolBar.cxx
+ QtxToolButton.cxx
QtxToolTip.cxx
QtxTranslator.cxx
QtxTreeView.cxx
QtxValidator.cxx
QtxToolTip.cxx
QtxTranslator.cxx
QtxTreeView.cxx
QtxValidator.cxx
- QtxWebBrowser.cxx
QtxWorkspace.cxx
QtxWorkspaceAction.cxx
QtxWorkstack.cxx
QtxWorkstackAction.cxx
)
QtxWorkspace.cxx
QtxWorkspaceAction.cxx
QtxWorkstack.cxx
QtxWorkstackAction.cxx
)
+IF(SALOME_GUI_ENABLE_QTXWEBBROWSER)
+ SET(_other_SOURCES ${_other_SOURCES} QtxWebBrowser.cxx)
+ENDIF()
+
# obsolete files: not migrated to Qt4
# _other_SOURCES << QtxListBox.cxx QtxTable.cxx
# TODO: migrate or remove?
# obsolete files: not migrated to Qt4
# _other_SOURCES << QtxListBox.cxx QtxTable.cxx
# TODO: migrate or remove?
@@
-186,4
+194,4
@@
TARGET_LINK_LIBRARIES(qtx ${_link_LIBRARIES})
INSTALL(TARGETS qtx EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
INSTALL(FILES ${qtx_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
INSTALL(TARGETS qtx EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
INSTALL(FILES ${qtx_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
-QT
4
_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GUI_INSTALL_RES_DATA}")
+QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GUI_INSTALL_RES_DATA}")