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
IPAL54521: [TC-9.3.0]: Mesh information: Additinal Info tab: 'Compute' button for...
[modules/smesh.git]
/
src
/
StdMeshers_I
/
CMakeLists.txt
diff --git
a/src/StdMeshers_I/CMakeLists.txt
b/src/StdMeshers_I/CMakeLists.txt
index 7e1ab27e81fdcfa3ba7f3a1fb165baa05559bc58..ceed790b4cb1e5195e0af9cfccddf506c1e22c7b 100644
(file)
--- a/
src/StdMeshers_I/CMakeLists.txt
+++ b/
src/StdMeshers_I/CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (C) 2012-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-201
9
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
@@
-20,7
+20,7
@@
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
# --- options ---
# additional include directories
INCLUDE_DIRECTORIES(
- ${
CAS_INCLUDE_DIRS
}
+ ${
OpenCASCADE_INCLUDE_DIR
}
${HDF5_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS}
${GEOM_INCLUDE_DIRS}
${HDF5_INCLUDE_DIRS}
${KERNEL_INCLUDE_DIRS}
${GEOM_INCLUDE_DIRS}
@@
-47,7
+47,7
@@
ENDIF(SALOME_SMESH_ENABLE_MEFISTO)
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
# additional preprocessor / compiler flags
ADD_DEFINITIONS(
- ${
CAS
_DEFINITIONS}
+ ${
OpenCASCADE
_DEFINITIONS}
${BOOST_DEFINITIONS}
${OMNIORB_DEFINITIONS}
)
${BOOST_DEFINITIONS}
${OMNIORB_DEFINITIONS}
)
@@
-61,8
+61,7
@@
ENDIF(WIN32)
SET(_link_LIBRARIES
${KERNEL_SALOMELocalTrace}
${KERNEL_SalomeGenericObj}
SET(_link_LIBRARIES
${KERNEL_SALOMELocalTrace}
${KERNEL_SalomeGenericObj}
- ${CAS_TKBRep}
- ${CAS_TKG3d}
+ ${OpenCASCADE_ModelingData_LIBRARIES}
SalomeIDLSMESH
StdMeshers
SMESHEngine
SalomeIDLSMESH
StdMeshers
SMESHEngine
@@
-119,6
+118,7
@@
SET(StdMeshersEngine_HEADERS
StdMeshers_ViscousLayers2D_i.hxx
StdMeshers_CartesianParameters3D_i.hxx
StdMeshers_Cartesian_3D_i.hxx
StdMeshers_ViscousLayers2D_i.hxx
StdMeshers_CartesianParameters3D_i.hxx
StdMeshers_Cartesian_3D_i.hxx
+ StdMeshers_PolygonPerFace_2D_i.hxx
)
IF(SALOME_SMESH_ENABLE_MEFISTO)
SET(StdMeshersEngine_HEADERS ${StdMeshersEngine_HEADERS} StdMeshers_MEFISTO_2D_i.hxx)
)
IF(SALOME_SMESH_ENABLE_MEFISTO)
SET(StdMeshersEngine_HEADERS ${StdMeshersEngine_HEADERS} StdMeshers_MEFISTO_2D_i.hxx)
@@
-173,6
+173,7
@@
SET(StdMeshersEngine_SOURCES
StdMeshers_CartesianParameters3D_i.cxx
StdMeshers_Cartesian_3D_i.cxx
StdMeshers_Adaptive1D_i.cxx
StdMeshers_CartesianParameters3D_i.cxx
StdMeshers_Cartesian_3D_i.cxx
StdMeshers_Adaptive1D_i.cxx
+ StdMeshers_PolygonPerFace_2D_i.cxx
)
IF(SALOME_SMESH_ENABLE_MEFISTO)
)
IF(SALOME_SMESH_ENABLE_MEFISTO)