X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FDriverMED%2FCMakeLists.txt;h=797f0ed4afe8129e13443c503c609025b560287a;hb=49ff23c94f469a0bd9de9981fb709eef8a8c4417;hp=35f2fdd65afd36141ca41896cd953f767bd3d573;hpb=b0a908c0d20341651771d0249fb10882f54b2aad;p=modules%2Fsmesh.git diff --git a/src/DriverMED/CMakeLists.txt b/src/DriverMED/CMakeLists.txt index 35f2fdd65..797f0ed4a 100644 --- a/src/DriverMED/CMakeLists.txt +++ b/src/DriverMED/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 @@ -20,13 +20,13 @@ # --- options --- # additional include directories INCLUDE_DIRECTORIES( + ${MEDFILE_INCLUDE_DIRS} ${HDF5_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${VTK_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} - ${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/SMDS ${PROJECT_SOURCE_DIR}/src/SMESHUtils @@ -36,7 +36,7 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( ${HDF5_DEFINITIONS} - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${BOOST_DEFINITIONS} ) @@ -45,8 +45,6 @@ SET(_link_LIBRARIES ${Boost_LIBRARIES} MeshDriver MEDWrapper - MEDWrapperBase - MEDWrapper_V2_2 ) SET(_link_LIBRARIES_bin @@ -67,6 +65,7 @@ SET(MeshDriverMED_HEADERS DriverMED_R_SMESHDS_Mesh.h DriverMED_W_SMESHDS_Mesh.h DriverMED_Family.h + DriverMED_W_Field.h SMESH_DriverMED.hxx ) @@ -77,6 +76,7 @@ SET(MeshDriverMED_SOURCES DriverMED_R_SMESHDS_Mesh.cxx DriverMED_W_SMESHDS_Mesh.cxx DriverMED_Family.cxx + DriverMED_W_Field.cxx ) # --- rules ---