Improve handling of external smesh

+ add SMESH_version.h.cmake to set full version number instead of using compiler define
+ do not set include path of smesh globally
+ do not set library path of smesh globally
+ do not set HAVE_NETGEN define globally
+ improve using debug and release libs of smesh for MSVC
This commit is contained in:
wmayer
2018-04-28 12:10:55 +02:00
parent 6548875fb2
commit 1633af4b94
18 changed files with 71 additions and 70 deletions

View File

@@ -50,7 +50,7 @@
#include "FemMesh.h"
#ifdef FC_USE_VTK
#include "FemVTKTools.h"
#include "FemVTKTools.h"
#endif
#include <boost/assign/list_of.hpp>
@@ -496,7 +496,7 @@ SMESH_Gen * FemMesh::getGenerator()
#if SMESH_VERSION_MAJOR < 7
return SMESH_Gen::get();
#else
if (! FemMesh::_mesh_gen)
if (!FemMesh::_mesh_gen)
FemMesh::_mesh_gen = new SMESH_Gen();
return FemMesh::_mesh_gen;
#endif