yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1979
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
branch nick: trunk
timestamp: Thu 2010-01-21 14:50:32 +0100
message:
  1. Added some more Eigen headers to check in SConstruct
  2. Commented the string in py/SConscript which made an error during compiling
  3. Added yadeEigen.hpp to make a wrapper for Eigen
modified:
  SConstruct
  py/SConscript


--
lp:yade
https://code.launchpad.net/~yade-dev/yade/trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription.

=== modified file 'SConstruct'
--- SConstruct	2010-01-20 16:08:01 +0000
+++ SConstruct	2010-01-21 13:50:32 +0000
@@ -375,6 +375,8 @@
 		if not ok: featureNotOK('cgal')
 	if 'eigen' in env['features']:
 		ok=conf.CheckCXXHeader('Eigen/Core')
+		ok=conf.CheckCXXHeader('Eigen/Array')
+		ok=conf.CheckCXXHeader('Eigen/Geometry')
 		if not ok: featureNotOK('eigen',note="You might have to add eigen header directory (e.g. /usr/include/eigen2) to CPPPATH.")
 
 	if env['useMiniWm3']: env.Append(LIBS='miniWm3',CPPDEFINES=['MINIWM3'])

=== modified file 'py/SConscript'
--- py/SConscript	2010-01-21 07:53:17 +0000
+++ py/SConscript	2010-01-21 13:50:32 +0000
@@ -33,7 +33,7 @@
 	env.File('system.py'),
 	env.File('export.py'),
 	env.File('post2d.py'),
-	env.File('ww.py'),
+	#env.File('ww.py'),
 	env.SharedLibrary('wrapper',['yadeWrapper/yadeWrapper.cpp'],SHLIBPREFIX='',LIBS=['PythonUI']+linkPlugins(['Shop','BoundDispatcher','InteractionGeometryDispatcher','InteractionPhysicsDispatcher','LawDispatcher','InteractionDispatchers','ParallelEngine','Clump','STLImporter',]+(['GeometricalModelMetaEngine','InteractingGeometryMetaEngine',] if 'geometricalmodel' in env['features'] else [])+(['StateMetaEngine',] if 'physpar' in env['features'] else []))),
 	env.SharedLibrary('_customConverters',['yadeWrapper/customConverters.cpp'],SHLIBPREFIX='',LIBS=env['LIBS']+linkPlugins(Split("BoundFunctor InteractionGeometryFunctor InteractionPhysicsFunctor LawFunctor")))
 ])