X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FStdMeshers_I%2FCMakeLists.txt;h=c6262c72df6d945e0e83aa5be50fe3041fc901cf;hb=995410b1ca9c9c2fa6e2e28edb217023ae3f9096;hp=7e1ab27e81fdcfa3ba7f3a1fb165baa05559bc58;hpb=6bac08c1a81f34d3f21c550bd92f83654b2546a5;p=modules%2Fsmesh.git diff --git a/src/StdMeshers_I/CMakeLists.txt b/src/StdMeshers_I/CMakeLists.txt index 7e1ab27e8..c6262c72d 100644 --- a/src/StdMeshers_I/CMakeLists.txt +++ b/src/StdMeshers_I/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2021 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 @@ -20,14 +20,14 @@ # --- options --- # additional include directories INCLUDE_DIRECTORIES( - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${HDF5_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS} ${GEOM_INCLUDE_DIRS} ${MEDFILE_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} - ${VTK_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} + ${MEDCOUPLING_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/src/SMESHImpl ${PROJECT_SOURCE_DIR}/src/SMESH ${PROJECT_SOURCE_DIR}/src/SMESHUtils @@ -47,7 +47,7 @@ ENDIF(SALOME_SMESH_ENABLE_MEFISTO) # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${BOOST_DEFINITIONS} ${OMNIORB_DEFINITIONS} ) @@ -61,8 +61,7 @@ ENDIF(WIN32) SET(_link_LIBRARIES ${KERNEL_SALOMELocalTrace} ${KERNEL_SalomeGenericObj} - ${CAS_TKBRep} - ${CAS_TKG3d} + ${OpenCASCADE_ModelingData_LIBRARIES} SalomeIDLSMESH StdMeshers SMESHEngine @@ -119,6 +118,9 @@ SET(StdMeshersEngine_HEADERS StdMeshers_ViscousLayers2D_i.hxx StdMeshers_CartesianParameters3D_i.hxx StdMeshers_Cartesian_3D_i.hxx + StdMeshers_PolygonPerFace_2D_i.hxx + StdMeshers_PolyhedronPerSolid_3D_i.hxx + StdMeshers_BlockRenumber_i.hxx ) IF(SALOME_SMESH_ENABLE_MEFISTO) SET(StdMeshersEngine_HEADERS ${StdMeshersEngine_HEADERS} StdMeshers_MEFISTO_2D_i.hxx) @@ -173,6 +175,9 @@ SET(StdMeshersEngine_SOURCES StdMeshers_CartesianParameters3D_i.cxx StdMeshers_Cartesian_3D_i.cxx StdMeshers_Adaptive1D_i.cxx + StdMeshers_PolygonPerFace_2D_i.cxx + StdMeshers_PolyhedronPerSolid_3D_i.cxx + StdMeshers_BlockRenumber_i.cxx ) IF(SALOME_SMESH_ENABLE_MEFISTO)