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
Merge branch 'vsr/26458'
[modules/smesh.git]
/
src
/
StdMeshersGUI
/
CMakeLists.txt
diff --git
a/src/StdMeshersGUI/CMakeLists.txt
b/src/StdMeshersGUI/CMakeLists.txt
index f4beaf1aff652705606d7b77d3732123597152e2..15150fd2e19e5a1099ffc2e694de2d8d911656e9 100644
(file)
--- a/
src/StdMeshersGUI/CMakeLists.txt
+++ b/
src/StdMeshersGUI/CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (C) 2012-20
16
CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-20
21
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,14
+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}
- ${VTK_INCLUDE_DIRS}
- ${CAS_INCLUDE_DIRS}
+ ${OpenCASCADE_INCLUDE_DIR}
${PYTHON_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS}
${GUI_INCLUDE_DIRS}
${PYTHON_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS}
${GUI_INCLUDE_DIRS}
@@
-33,6
+32,7
@@
INCLUDE_DIRECTORIES(
${Boost_INCLUDE_DIRS}
${QWT_INCLUDE_DIR}
${OMNIORB_INCLUDE_DIR}
${Boost_INCLUDE_DIRS}
${QWT_INCLUDE_DIR}
${OMNIORB_INCLUDE_DIR}
+ ${MEDCOUPLING_INCLUDE_DIRS}
${PROJECT_SOURCE_DIR}/src/SMESH
${PROJECT_SOURCE_DIR}/src/SMESHUtils
${PROJECT_SOURCE_DIR}/src/SMESH_I
${PROJECT_SOURCE_DIR}/src/SMESH
${PROJECT_SOURCE_DIR}/src/SMESHUtils
${PROJECT_SOURCE_DIR}/src/SMESH_I
@@
-48,7
+48,7
@@
INCLUDE_DIRECTORIES(
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
- ${
CAS
_DEFINITIONS}
+ ${
OpenCASCADE
_DEFINITIONS}
${BOOST_DEFINITIONS}
${OMNIORB_DEFINITIONS}
${QWT_DEFINITIONS}
${BOOST_DEFINITIONS}
${OMNIORB_DEFINITIONS}
${QWT_DEFINITIONS}
@@
-56,13
+56,12
@@
ADD_DEFINITIONS(
# libraries to link to
SET(_link_LIBRARIES
# libraries to link to
SET(_link_LIBRARIES
- ${GUI_SalomeApp}
- ${CAS_TKernel}
- ${CAS_TKBO}
- ${CAS_TKAdvTools}
+ ${OpenCASCADE_FoundationClasses_LIBRARIES}
+ ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
${QWT_LIBRARY}
SalomeIDLSMESH
SMESHFiltersSelection
${QWT_LIBRARY}
SalomeIDLSMESH
SMESHFiltersSelection
+ SMESHEngine
SMESH
SMESHObject
)
SMESH
SMESHObject
)
@@
-82,6
+81,8
@@
SET(_moc_HEADERS
StdMeshersGUI_CartesianParamCreator.h
StdMeshersGUI_RadioButtonsGrpWdg.h
StdMeshersGUI_PropagationHelperWdg.h
StdMeshersGUI_CartesianParamCreator.h
StdMeshersGUI_RadioButtonsGrpWdg.h
StdMeshersGUI_PropagationHelperWdg.h
+ StdMeshersGUI_NameCheckableGrpWdg.h
+ StdMeshersGUI_BlockRenumberCreator.h
)
IF(SALOME_USE_PLOT2DVIEWER)
)
IF(SALOME_USE_PLOT2DVIEWER)
@@
-101,7
+102,7
@@
SET(StdMeshersGUI_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
@@
-117,6
+118,8
@@
SET(_other_SOURCES
StdMeshersGUI_CartesianParamCreator.cxx
StdMeshersGUI_RadioButtonsGrpWdg.cxx
StdMeshersGUI_PropagationHelperWdg.cxx
StdMeshersGUI_CartesianParamCreator.cxx
StdMeshersGUI_RadioButtonsGrpWdg.cxx
StdMeshersGUI_PropagationHelperWdg.cxx
+ StdMeshersGUI_NameCheckableGrpWdg.cxx
+ StdMeshersGUI_BlockRenumberCreator.cxx
)
IF(SALOME_USE_PLOT2DVIEWER)
)
IF(SALOME_USE_PLOT2DVIEWER)
@@
-145,4
+148,4
@@
TARGET_LINK_LIBRARIES(StdMeshersGUI ${_link_LIBRARIES} )
INSTALL(TARGETS StdMeshersGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
INSTALL(FILES ${StdMeshersGUI_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS})
INSTALL(TARGETS StdMeshersGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})
INSTALL(FILES ${StdMeshersGUI_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}")