Salome HOME
projects
/
plugins
/
ghs3dplugin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
#17784 [EDF] MESH-GEMS-2.9.6 Meshers options
[plugins/ghs3dplugin.git]
/
src
/
GUI
/
CMakeLists.txt
diff --git
a/src/GUI/CMakeLists.txt
b/src/GUI/CMakeLists.txt
index 79a4e05a7b70ba349041681c337046ddfeda6c54..e381f5f705c3138b4e97e451b538c23c0036b2c6 100644
(file)
--- a/
src/GUI/CMakeLists.txt
+++ b/
src/GUI/CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (C) 2012-201
4 CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-201
9 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
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@
-17,13
+17,13
@@
# 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 ---
# additional include directories
INCLUDE_DIRECTORIES(
${QT_INCLUDES}
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
${QT_INCLUDES}
- ${
CAS_INCLUDE_DIRS
}
+ ${
OpenCASCADE_INCLUDE_DIR
}
${KERNEL_INCLUDE_DIRS}
${GUI_INCLUDE_DIRS}
${GEOM_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS}
${GUI_INCLUDE_DIRS}
${GEOM_INCLUDE_DIRS}
@@
-33,13
+33,14
@@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
${PROJECT_BINARY_DIR}/idl
${PROJECT_SOURCE_DIR}/src/GHS3DPlugin
${CMAKE_CURRENT_BINARY_DIR}
${PROJECT_BINARY_DIR}/idl
${PROJECT_SOURCE_DIR}/src/GHS3DPlugin
+ ${PROJECT_SOURCE_DIR}/src/GUI
)
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
${QT_DEFINITIONS}
${OMNIORB_DEFINITIONS}
)
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
${QT_DEFINITIONS}
${OMNIORB_DEFINITIONS}
- ${
CAS
_DEFINITIONS}
+ ${
OpenCASCADE
_DEFINITIONS}
${BOOST_DEFINITIONS}
)
${BOOST_DEFINITIONS}
)
@@
-49,13
+50,13
@@
SET(_link_LIBRARIES
${KERNEL_SALOMELocalTrace}
${GEOM_GEOM}
${SMESH_SMESH}
${KERNEL_SALOMELocalTrace}
${GEOM_GEOM}
${SMESH_SMESH}
- ${SMESH_
GeomSelectionToo
ls}
+ ${SMESH_
PluginUti
ls}
${SMESH_StdMeshersGUI}
${SMESH_SMESHFiltersSelection}
${GUI_suit}
${GUI_qtx}
${GUI_SalomeApp}
${SMESH_StdMeshersGUI}
${SMESH_SMESHFiltersSelection}
${GUI_suit}
${GUI_qtx}
${GUI_SalomeApp}
- ${
CAS_KERNEL
}
+ ${
OpenCASCADE_FoundationClasses_LIBRARIES
}
SalomeIDLGHS3DPLUGIN
)
SalomeIDLGHS3DPLUGIN
)
@@
-65,6
+66,7
@@
SET(_link_LIBRARIES
SET(_moc_HEADERS
GHS3DPluginGUI_HypothesisCreator.h
GHS3DPluginGUI_Dlg.h
SET(_moc_HEADERS
GHS3DPluginGUI_HypothesisCreator.h
GHS3DPluginGUI_Dlg.h
+ GHS3DPluginGUI_TreeWidget.h
)
# header files / no moc processed
)
# header files / no moc processed
@@
-77,13
+79,14
@@
SET(GHS3DPluginGUI_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
GHS3DPluginGUI.cxx
GHS3DPluginGUI_HypothesisCreator.cxx
GHS3DPluginGUI_AdvWidget.cxx
# sources / static
SET(_other_SOURCES
GHS3DPluginGUI.cxx
GHS3DPluginGUI_HypothesisCreator.cxx
GHS3DPluginGUI_AdvWidget.cxx
+ GHS3DPluginGUI_TreeWidget.cxx
)
# --- resources ---
)
# --- resources ---
@@
-102,7
+105,7
@@
SET(_uic_files
)
# header files / uic wrappings
)
# header files / uic wrappings
-QT
4_WRAP_UI
(_uic_HEADERS ${_uic_files})
+QT
_WRAP_UIC
(_uic_HEADERS ${_uic_files})
# sources / to compile
SET(GHS3DPluginGUI_SOURCES ${_other_SOURCES} ${_moc_SOURCES} ${_uic_HEADERS})
# sources / to compile
SET(GHS3DPluginGUI_SOURCES ${_other_SOURCES} ${_moc_SOURCES} ${_uic_HEADERS})
@@
-114,4
+117,4
@@
TARGET_LINK_LIBRARIES(GHS3DPluginGUI ${_link_LIBRARIES} )
INSTALL(TARGETS GHS3DPluginGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
INSTALL(FILES ${GHS3DPluginGUI_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
INSTALL(TARGETS GHS3DPluginGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
INSTALL(FILES ${GHS3DPluginGUI_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
-QT
4
_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GHS3DPLUGIN_INSTALL_RES_DATA}")
+QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_GHS3DPLUGIN_INSTALL_RES_DATA}")