Salome HOME
projects
/
plugins
/
canrecplugin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'V7_dev'
[plugins/canrecplugin.git]
/
src
/
CANRECPLUGINGUI
/
CMakeLists.txt
diff --git
a/src/CANRECPLUGINGUI/CMakeLists.txt
b/src/CANRECPLUGINGUI/CMakeLists.txt
index d8a91243e015d2dc14a9cb83e0cf708795f7a867..fff522c7698d9bb01440334032abef5a26e0844f 100644
(file)
--- a/
src/CANRECPLUGINGUI/CMakeLists.txt
+++ b/
src/CANRECPLUGINGUI/CMakeLists.txt
@@
-17,8
+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(UseQt4Ext)
-INCLUDE(${QT_USE_FILE})
+INCLUDE(UseQtExt)
# --- options ---
# additional include directories
# --- options ---
# additional include directories
@@
-43,13
+42,6
@@
ADD_DEFINITIONS(
# libraries to link to
SET(_link_LIBRARIES
# libraries to link to
SET(_link_LIBRARIES
-# ${GUI_SalomeApp}
-# ${GUI_qtx}
-# ${GUI_suit}
-# ${GUI_SalomeObject}
-# ${GUI_LightApp}
-# ${CAS_KERNEL}
-# ${GEOM_GEOM}
${GEOM_GEOMBase}
SalomeIDLCANRECPlugin
)
${GEOM_GEOMBase}
SalomeIDLCANRECPlugin
)
@@
-71,7
+63,7
@@
SET(CANRECPluginGUI_HEADERS ${_moc_HEADERS} ${_other_HEADERS})
# --- sources ---
# sources / moc wrappings
# --- sources ---
# sources / moc wrappings
-QT
4_WRAP_CPP
(_moc_SOURCES ${_moc_HEADERS})
+QT
_WRAP_MOC
(_moc_SOURCES ${_moc_HEADERS})
# sources / static
SET(_other_SOURCES
# sources / static
SET(_other_SOURCES
@@
-100,4
+92,4
@@
INSTALL(TARGETS CANRECPluginGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${
INSTALL(FILES ${CANRECPluginGUI_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
INSTALL(FILES ${CANRECPluginGUI_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
-QT
4
_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_CANRECPLUGIN_INSTALL_RES_DATA}")
+QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_CANRECPLUGIN_INSTALL_RES_DATA}")