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
#16578 EDF - Scibian - ViscousLayer / SIGSEGV
[modules/smesh.git]
/
src
/
StdMeshersGUI
/
CMakeLists.txt
diff --git
a/src/StdMeshersGUI/CMakeLists.txt
b/src/StdMeshersGUI/CMakeLists.txt
index be0c2a4dd6698d69992eb2173f4678febe78be9d..e71e0c7795b435c4f5332b12bbe5aa16a6cea191 100644
(file)
--- a/
src/StdMeshersGUI/CMakeLists.txt
+++ b/
src/StdMeshersGUI/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,14
+17,14
@@
# 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}
${VTK_INCLUDE_DIRS}
# --- 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}
@@
-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}
@@
-57,12
+57,12
@@
ADD_DEFINITIONS(
# libraries to link to
SET(_link_LIBRARIES
${GUI_SalomeApp}
# 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
)
@@
-72,7
+72,6
@@
SET(_link_LIBRARIES
# header files / to be processed by moc
SET(_moc_HEADERS
StdMeshersGUI_StdHypothesisCreator.h
# header files / to be processed by moc
SET(_moc_HEADERS
StdMeshersGUI_StdHypothesisCreator.h
- StdMeshersGUI_DistrPreview.h
StdMeshersGUI_DistrTable.h
StdMeshersGUI_NbSegmentsCreator.h
StdMeshersGUI_ObjectReferenceParamWdg.h
StdMeshersGUI_DistrTable.h
StdMeshersGUI_NbSegmentsCreator.h
StdMeshersGUI_ObjectReferenceParamWdg.h
@@
-85,6
+84,12
@@
SET(_moc_HEADERS
StdMeshersGUI_PropagationHelperWdg.h
)
StdMeshersGUI_PropagationHelperWdg.h
)
+IF(SALOME_USE_PLOT2DVIEWER)
+ LIST(APPEND _moc_HEADERS
+ StdMeshersGUI_DistrPreview.h
+ )
+ENDIF()
+
# header files / no moc processing
SET(_other_HEADERS
SMESH_StdMeshersGUI.hxx
# header files / no moc processing
SET(_other_HEADERS
SMESH_StdMeshersGUI.hxx
@@
-96,13
+101,12
@@
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
StdMeshersGUI.cxx
StdMeshersGUI_StdHypothesisCreator.cxx
# sources / static
SET(_other_SOURCES
StdMeshersGUI.cxx
StdMeshersGUI_StdHypothesisCreator.cxx
- StdMeshersGUI_DistrPreview.cxx
StdMeshersGUI_DistrTable.cxx
StdMeshersGUI_NbSegmentsCreator.cxx
StdMeshersGUI_ObjectReferenceParamWdg.cxx
StdMeshersGUI_DistrTable.cxx
StdMeshersGUI_NbSegmentsCreator.cxx
StdMeshersGUI_ObjectReferenceParamWdg.cxx
@@
-115,6
+119,12
@@
SET(_other_SOURCES
StdMeshersGUI_PropagationHelperWdg.cxx
)
StdMeshersGUI_PropagationHelperWdg.cxx
)
+IF(SALOME_USE_PLOT2DVIEWER)
+ LIST(APPEND _other_SOURCES
+ StdMeshersGUI_DistrPreview.cxx
+ )
+ENDIF()
+
# sources / to compile
SET(StdMeshersGUI_SOURCES ${_other_SOURCES} ${_moc_SOURCES})
# sources / to compile
SET(StdMeshersGUI_SOURCES ${_other_SOURCES} ${_moc_SOURCES})
@@
-135,4
+145,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}")