yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2034
committer: Václav Šmilauer <eudoxos@xxxxxxxx>
branch nick: trunk
timestamp: Thu 2010-02-18 08:59:29 +0100
message:
  1. do not build miniWm3 at all if not needed
modified:
  SConstruct
  core/SConscript
  lib/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-02-14 19:36:17 +0000
+++ SConstruct	2010-02-18 07:59:29 +0000
@@ -391,7 +391,7 @@
 	if 'nowm3' in env['features'] and 'eigen' not in env['features']:
 		featureNotOK("You selected the 'nowm3' feature; you MUST also select the 'eigen' feature in such case.")
 
-	if env['useMiniWm3']: env.Append(LIBS='miniWm3',CPPDEFINES=['MINIWM3'])
+	if env['useMiniWm3'] and not 'nowm3' in env['features']: env.Append(LIBS='miniWm3',CPPDEFINES=['MINIWM3'])
 
 	env.Append(CPPDEFINES=['YADE_'+f.upper() for f in env['features']])
 

=== modified file 'core/SConscript'
--- core/SConscript	2010-02-06 16:01:07 +0000
+++ core/SConscript	2010-02-18 07:59:29 +0000
@@ -56,9 +56,10 @@
 			),
 		LIBS=env['LIBS']+[
 			'yade-support',
-			'miniWm3',
 			'rt', # realtime lib, for clock_gettime 
 			]+
-			(['$QGLVIEWER_LIB','yade-opengl'] if 'YADE_OPENGL' in env['CPPDEFINES'] else []),
+			(['$QGLVIEWER_LIB','yade-opengl'] if 'YADE_OPENGL' in env['CPPDEFINES'] else [])
+			+(['miniWm3'] if 'nowm3' not in env['features'] else [])
+			,
 	)
 ])

=== modified file 'lib/SConscript'
--- lib/SConscript	2010-02-14 19:36:17 +0000
+++ lib/SConscript	2010-02-18 07:59:29 +0000
@@ -53,8 +53,8 @@
 	yadeStaticOrSharedLib('yade-opengl',env.Combine('yade-opengl.cpp',['opengl/FpsTracker.cpp','opengl/GLTextLabel.cpp','opengl/GLWindow.cpp','opengl/GLWindowsManager.cpp','opengl/GLUtils.cpp']),LIBS=env['LIBS']+['glut','GL','$QGLVIEWER_LIB']),
 #env.Install('$PREFIX/lib/yade$SUFFIX/lib',env.StaticLibrary
 yadeStaticOrSharedLib('yade-support',[
-	env.Combine('yade-support.cpp',['base/yadeEigenWrapper.cpp' if 'nowm3' in env['features'] else 'base/yadeWm3Extra.cpp',
-			'computational-geometry/MarchingCube.cpp',
+	env.Combine('yade-support.cpp',(['base/yadeEigenWrapper.cpp'] if 'nowm3' in env['features'] else ['base/yadeWm3Extra.cpp'])+
+		['computational-geometry/MarchingCube.cpp',
 			'factory/ClassFactory.cpp','serialization/SerializableSingleton.cpp','factory/DynLibManager.cpp','factory/FactoryExceptions.cpp',
 			'multimethods/Indexable.cpp','multimethods/MultiMethodsExceptions.cpp',
 			'serialization-xml/XMLFormatManager.cpp','serialization-xml/XMLSaxParser.cpp','serialization/Archive.cpp','serialization/IOFormatManager.cpp','serialization/IOManagerExceptions.cpp',
@@ -70,9 +70,10 @@
 ###### 3rd party libs
 #######################
 
-yadeStaticOrSharedLib('miniWm3',
-	env.Combine('miniWm3.cpp',['miniWm3/Wm3Math.cpp','miniWm3/Wm3Matrix3.cpp','miniWm3/Wm3Quaternion.cpp','miniWm3/Wm3Vector3.cpp','miniWm3/Wm3Vector2.cpp','miniWm3/Wm3Memory.cpp','miniWm3/Wm3String.cpp','miniWm3/Wm3System.cpp']),
-	# miniWm3 cannot link with itself, filter it out.
-	LIBS=filter(lambda l: l!='miniWm3',env['LIBS']),
-	# miniWm3 will be always optimized and without debugging info, even in debug builds; suppress all warnings
-	CXXFLAGS=env['CXXFLAGS']+['-O3','-g0','-w'])
+if not 'nowm3' in env['features']:
+	yadeStaticOrSharedLib('miniWm3',
+		env.Combine('miniWm3.cpp',['miniWm3/Wm3Math.cpp','miniWm3/Wm3Matrix3.cpp','miniWm3/Wm3Quaternion.cpp','miniWm3/Wm3Vector3.cpp','miniWm3/Wm3Vector2.cpp','miniWm3/Wm3Memory.cpp','miniWm3/Wm3String.cpp','miniWm3/Wm3System.cpp']),
+		# miniWm3 cannot link with itself, filter it out.
+		LIBS=filter(lambda l: l!='miniWm3',env['LIBS']),
+		# miniWm3 will be always optimized and without debugging info, even in debug builds; suppress all warnings
+		CXXFLAGS=env['CXXFLAGS']+['-O3','-g0','-w'])