X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers_I%2FCMakeLists.txt;h=ceed790b4cb1e5195e0af9cfccddf506c1e22c7b;hb=341e363240adfbf291dbeeaa6ab989ffe46eb874;hp=e53bf5fa482e77b4ff495e52dc5ec91828fb9e72;hpb=5d68554076bbca0e1e95fb0db215a6c2b84b6c54;p=modules%2Fsmesh.git diff --git a/src/StdMeshers_I/CMakeLists.txt b/src/StdMeshers_I/CMakeLists.txt index e53bf5fa4..ceed790b4 100644 --- a/src/StdMeshers_I/CMakeLists.txt +++ b/src/StdMeshers_I/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2014 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2019 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,7 +20,7 @@ # --- options --- # additional include directories INCLUDE_DIRECTORIES( - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${HDF5_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS} ${GEOM_INCLUDE_DIRS} @@ -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,7 @@ SET(StdMeshersEngine_HEADERS 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) @@ -173,6 +173,7 @@ SET(StdMeshersEngine_SOURCES StdMeshers_CartesianParameters3D_i.cxx StdMeshers_Cartesian_3D_i.cxx StdMeshers_Adaptive1D_i.cxx + StdMeshers_PolygonPerFace_2D_i.cxx ) IF(SALOME_SMESH_ENABLE_MEFISTO)