X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH%2FCMakeLists.txt;h=ad34d18d8806e53098880a77759757f06aaa775f;hp=e96f78f1ba598b8c2d62f05e4432deff4240a5bf;hb=34a8a37aeeeda95e0e2dad6cdf51b45bbde5cbb8;hpb=d3e1cabf77f67408ac401e2d387e721605cb3b10 diff --git a/src/SMESH/CMakeLists.txt b/src/SMESH/CMakeLists.txt index e96f78f1b..ad34d18d8 100644 --- a/src/SMESH/CMakeLists.txt +++ b/src/SMESH/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2016 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 @@ -22,10 +22,10 @@ INCLUDE_DIRECTORIES( ${KERNEL_INCLUDE_DIRS} ${GEOM_INCLUDE_DIRS} - ${CAS_INCLUDE_DIRS} - ${VTK_INCLUDE_DIRS} + ${OpenCASCADE_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${HDF5_INCLUDE_DIRS} + ${TBB_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/src/Controls ${PROJECT_SOURCE_DIR}/src/MEDWrapper ${PROJECT_SOURCE_DIR}/src/Driver @@ -38,11 +38,12 @@ INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/src/SMDS ${PROJECT_SOURCE_DIR}/src/SMESHDS ${PROJECT_SOURCE_DIR}/src/SMESHUtils + ${MEDCOUPLING_INCLUDE_DIRS} ) # 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} @@ -68,6 +68,7 @@ SET(_link_LIBRARIES MeshDriverUNV MeshDriverGMF ${DriverCGNS_LIB} + ${MEDCoupling_medloader} ) # --- headers --- @@ -87,6 +88,7 @@ SET(SMESHimpl_HEADERS SMESH_MesherHelper.hxx SMESH_ProxyMesh.hxx SMESH_SMESH.hxx + MG_ADAPT.hxx ) # --- sources --- @@ -105,11 +107,17 @@ SET(SMESHimpl_SOURCES SMESH_HypoFilter.cxx SMESH_ProxyMesh.cxx SMESH_MesherHelper.cxx + MG_ADAPT.cxx ) # --- rules --- ADD_LIBRARY(SMESHimpl ${SMESHimpl_SOURCES}) +IF(WIN32) + TARGET_COMPILE_OPTIONS(SMESHimpl PRIVATE /bigobj) + ADD_DEFINITIONS(-DNOMINMAX) +ENDIF(WIN32) + TARGET_LINK_LIBRARIES(SMESHimpl ${_link_LIBRARIES} ) INSTALL(TARGETS SMESHimpl EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS})