Update waf version and use RPATH now that waf fixed the problem with …

…unit tests and RPATH. http://code.google.com/p/waf/issues/detail?id=896
ereslibre · Mar 8, 2011 · 79240ce · 79240ce
1 parent 1addd85
commit 79240ce
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/src/core/tests/wscript b/src/core/tests/wscript
@@ -33,7 +33,7 @@ def build(bld):
 			    target       = testName,
 			    includes     = '.. ../..',
 			    install_path = None,
-			    use          = 'CPPUNIT idealcore')
+			    use          = 'CPPUNIT IDEAL idealcore')
 
 	if bld.is_install or bld.options.all_tests:
 		bld.options.all_tests = True

diff --git a/waf b/waf
diff --git a/wscript b/wscript
@@ -83,6 +83,8 @@ def configure(conf):
 	else:
 		conf.undefine('NDEBUG')
 
+	conf.env['RPATH_IDEAL'] = conf.env['PREFIX'] + '/lib'
+
 	if Options.options.release:
 		Logs.pprint('BLUE', '*** Going to compile in RELEASE mode')
 		conf.env['CXXFLAGS'] += ['-O2', '-w']