Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0021803: EDF 2351 : Available versions of MED in TUI function ExportMED aren't consis...
[modules/smesh.git]
/
src
/
SMESHGUI
/
CMakeLists.txt
diff --git
a/src/SMESHGUI/CMakeLists.txt
b/src/SMESHGUI/CMakeLists.txt
index f301031887924831ea01c15701801968f8febe9f..a06cac1571ce8964d8841ed66d46cacb0182cd00 100644
(file)
--- a/
src/SMESHGUI/CMakeLists.txt
+++ b/
src/SMESHGUI/CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (C) 2012-201
4
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 ---
# additional include directories
# --- options ---
# additional include directories
@@
-39,12
+39,10
@@
INCLUDE_DIRECTORIES(
${PROJECT_SOURCE_DIR}/src/SMESHFiltersSelection
${PROJECT_SOURCE_DIR}/src/SMDS
${PROJECT_SOURCE_DIR}/src/SMESHDS
${PROJECT_SOURCE_DIR}/src/SMESHFiltersSelection
${PROJECT_SOURCE_DIR}/src/SMDS
${PROJECT_SOURCE_DIR}/src/SMESHDS
- ${PROJECT_SOURCE_DIR}/src/SMESH
${PROJECT_SOURCE_DIR}/src/SMESHUtils
${PROJECT_SOURCE_DIR}/src/SMESHUtils
- ${PROJECT_SOURCE_DIR}/src/SMESH_I
${PROJECT_SOURCE_DIR}/src/Controls
${PROJECT_SOURCE_DIR}/src/SMESHClient
${PROJECT_SOURCE_DIR}/src/Controls
${PROJECT_SOURCE_DIR}/src/SMESHClient
- ${PROJECT_SOURCE_DIR}/src/MEDWrapper
/Base
+ ${PROJECT_SOURCE_DIR}/src/MEDWrapper
${PROJECT_BINARY_DIR}
${PROJECT_BINARY_DIR}/idl
)
${PROJECT_BINARY_DIR}
${PROJECT_BINARY_DIR}/idl
)
@@
-141,10
+139,16
@@
SET(_moc_HEADERS
SMESHGUI_ReorientFacesDlg.h
SMESHGUI_PropertiesDlg.h
SMESHGUI_Add0DElemsOnAllNodesDlg.h
SMESHGUI_ReorientFacesDlg.h
SMESHGUI_PropertiesDlg.h
SMESHGUI_Add0DElemsOnAllNodesDlg.h
+ SMESHGUI_FieldSelectorWdg.h
+ SMESHGUI_DisplayEntitiesDlg.h
+ SMESHGUI_SplitBiQuad.h
+ SMESHGUI_PreVisualObj.h
+ SMESHGUI_IdPreview.h
)
# header files / no moc processing
SET(_other_HEADERS
)
# header files / no moc processing
SET(_other_HEADERS
+ SMESHGUI_Operations.h
SMESHGUI_Utils.h
SMESHGUI_HypothesesUtils.h
SMESHGUI_Selection.h
SMESHGUI_Utils.h
SMESHGUI_HypothesesUtils.h
SMESHGUI_Selection.h
@@
-169,7
+173,7
@@
SET(SMESH_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
@@
-246,6
+250,11
@@
SET(_other_SOURCES
SMESHGUI_Filter.cxx
SMESHGUI_MeshEditPreview.cxx
SMESHGUI_FileValidator.cxx
SMESHGUI_Filter.cxx
SMESHGUI_MeshEditPreview.cxx
SMESHGUI_FileValidator.cxx
+ SMESHGUI_FieldSelectorWdg.cxx
+ SMESHGUI_DisplayEntitiesDlg.cxx
+ SMESHGUI_SplitBiQuad.cxx
+ SMESHGUI_PreVisualObj.cxx
+ SMESHGUI_IdPreview.cxx
)
# sources / to compile
)
# sources / to compile
@@
-269,4
+278,4
@@
INSTALL(TARGETS SMESH EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INS
INSTALL(FILES ${SMESH_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
INSTALL(FILES ${SMESH_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
-QT
4
_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_SMESH_INSTALL_RES_DATA}")
+QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_SMESH_INSTALL_RES_DATA}")