X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH_I%2FCMakeLists.txt;h=b5183dbe7b14c9c54ad8ce8b211bc582686bb724;hb=c600d3a4e74936fe2f8356cabab66c766f2fdc6f;hp=3643f0928f6fdc8c82bccaa8de9e0f4d6d30fc57;hpb=df5faa3c63b7a8984092e9c04a3c3c480f054a59;p=modules%2Fsmesh.git diff --git a/src/SMESH_I/CMakeLists.txt b/src/SMESH_I/CMakeLists.txt index 3643f0928..b5183dbe7 100644 --- a/src/SMESH_I/CMakeLists.txt +++ b/src/SMESH_I/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2014 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2016 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 @@ -21,7 +21,7 @@ # additional include directories INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIR} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${HDF5_INCLUDE_DIRS} ${VTK_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} @@ -31,8 +31,7 @@ INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/src/Controls ${PROJECT_SOURCE_DIR}/src/SMDS ${PROJECT_SOURCE_DIR}/src/SMESHDS - ${PROJECT_SOURCE_DIR}/src/MEDWrapper/Base - ${PROJECT_SOURCE_DIR}/src/MEDWrapper/Factory + ${PROJECT_SOURCE_DIR}/src/MEDWrapper ${PROJECT_SOURCE_DIR}/src/Driver ${PROJECT_SOURCE_DIR}/src/DriverMED ${PROJECT_SOURCE_DIR}/src/DriverCGNS @@ -45,7 +44,7 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( ${OMNIORB_DEFINITIONS} - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${BOOST_DEFINITIONS} ) @@ -70,11 +69,11 @@ SET(_link_LIBRARIES ${KERNEL_SalomeGenericObj} ${KERNEL_SalomeIDLKERNEL} ${KERNEL_SALOMELocalTrace} - ${CAS_TKCDF} - ${CAS_TKBO} - ${CAS_TKShHealing} + ${KERNEL_SalomeKernelHelpers} + ${OpenCASCADE_ApplicationFramework_LIBRARIES} + ${OpenCASCADE_ModelingAlgorithms_LIBRARIES} ${GEOM_GEOMClient} - ${GEOM_SalomeIDLGEOM} + ${GEOM_SalomeIDLGEOM} SalomeIDLSMESH SMESHimpl SMDS @@ -115,7 +114,7 @@ SET(SMESHEngine_HEADERS SET(SMESHEngine_SOURCES SMESH_Gen_i.cxx SMESH_Gen_i_1.cxx - SMESH_DumpPython.cxx + SMESH_PythonDump.cxx SMESH_Mesh_i.cxx SMESH_subMesh_i.cxx SMESH_MeshEditor_i.cxx