X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH%2FCMakeLists.txt;h=3e41c626a54e45ada33fe715206ec5b9fcb31061;hb=ba0f42528409764a2a1819e90caaf00dd5e29387;hp=a23c8c468a3d071107cb18d412fc9ed8ee3e8c65;hpb=0c5188fd2cf587b6c74c6adce920158f7edd4419;p=modules%2Fsmesh.git diff --git a/src/SMESH/CMakeLists.txt b/src/SMESH/CMakeLists.txt index a23c8c468..3e41c626a 100644 --- a/src/SMESH/CMakeLists.txt +++ b/src/SMESH/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 @@ -22,12 +22,13 @@ INCLUDE_DIRECTORIES( ${KERNEL_INCLUDE_DIRS} ${GEOM_INCLUDE_DIRS} - ${CAS_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${VTK_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${HDF5_INCLUDE_DIRS} + ${TBB_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/src/Controls - ${PROJECT_SOURCE_DIR}/src/MEDWrapper/Base + ${PROJECT_SOURCE_DIR}/src/MEDWrapper ${PROJECT_SOURCE_DIR}/src/Driver ${PROJECT_SOURCE_DIR}/src/DriverDAT ${PROJECT_SOURCE_DIR}/src/DriverMED @@ -42,7 +43,7 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - ${CAS_DEFINITIONS} + ${OpenCASCADE_DEFINITIONS} ${BOOST_DEFINITIONS} ) @@ -53,10 +54,9 @@ ENDIF(SALOME_SMESH_USE_CGNS) # libraries to link to SET(_link_LIBRARIES - ${CAS_TKShHealing} - ${CAS_TKPrim} - ${CAS_TKG2d} - ${CAS_TKCDF} + ${OpenCASCADE_ModelingAlgorithms_LIBRARIES} + ${OpenCASCADE_ModelingData_LIBRARIES} + ${OpenCASCADE_ApplicationFramework_LIBRARIES} ${GEOM_NMTTools} ${GEOM_GEOMUtils} ${Boost_LIBRARIES}