X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FMakefile.am;h=e831115fa0fa62d2afc4bc91b6ae74b182accc67;hb=16fcf4dea0b9901aa6345f13b629c72f46b139da;hp=a19f6796343acdade2771df2e0dcf7d5141b349a;hpb=2ef67f753e648003d6ce9b1157f723461ec2251a;p=modules%2Fsmesh.git diff --git a/src/StdMeshers/Makefile.am b/src/StdMeshers/Makefile.am index a19f67963..e831115fa 100644 --- a/src/StdMeshers/Makefile.am +++ b/src/StdMeshers/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 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 @@ -75,7 +75,10 @@ salomeinclude_HEADERS = \ StdMeshers_ImportSource.hxx \ StdMeshers_Import_1D.hxx \ StdMeshers_Import_1D2D.hxx \ - StdMeshers_ViscousLayers.hxx + StdMeshers_ViscousLayers.hxx \ + StdMeshers_Projection_1D2D.hxx \ + StdMeshers_CartesianParameters3D.hxx \ + StdMeshers_Cartesian_3D.hxx # Libraries targets @@ -129,8 +132,10 @@ dist_libStdMeshers_la_SOURCES = \ StdMeshers_ImportSource.cxx \ StdMeshers_Import_1D.cxx \ StdMeshers_Import_1D2D.cxx \ - StdMeshers_ViscousLayers.cxx - + StdMeshers_ViscousLayers.cxx \ + StdMeshers_Projection_1D2D.cxx \ + StdMeshers_CartesianParameters3D.cxx \ + StdMeshers_Cartesian_3D.cxx # additionnal information to compil and link file libStdMeshers_la_CPPFLAGS = \ @@ -139,8 +144,8 @@ libStdMeshers_la_CPPFLAGS = \ $(VTK_INCLUDES) \ $(KERNEL_CXXFLAGS) \ $(GUI_CXXFLAGS) \ - -I$(srcdir)/../SMESHImpl \ -I$(srcdir)/../MEFISTO2 \ + -I$(srcdir)/../SMESHUtils \ -I$(srcdir)/../SMESH \ -I$(srcdir)/../SMESHDS \ -I$(srcdir)/../SMDS \ @@ -149,8 +154,12 @@ libStdMeshers_la_CPPFLAGS = \ libStdMeshers_la_LDFLAGS = \ ../SMESH/libSMESHimpl.la \ - ../SMESH_I/libSMESHEngine.la \ ../SMESHDS/libSMESHDS.la \ ../MEFISTO2/libMEFISTO2D.la \ $(KERNEL_LDFLAGS) -lSALOMELocalTrace -lOpUtil \ $(CAS_LDPATH) -lTKAdvTools -lTKTopAlgo -lTKG3d + +if WITH_TBB + libStdMeshers_la_CPPFLAGS += $(TBB_INCLUDES) + libStdMeshers_la_LDFLAGS += $(TBB_LIBS) +endif