[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs
From:       Simon Hausmann <hausmann () kde ! org>
Date:       2005-09-02 22:47:02
Message-ID: 1125701222.739366.9778.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 456465 by hausmann:

- build some more of dcop. all build systems start with hacks after all ;-)
  I definitely see the need for .in substitution though


 M  +17 -2     SConstruct  


--- trunk/KDE/kdelibs/SConstruct #456464:456465
@@ -1,5 +1,7 @@
 #! /usr/bin/env python
 
+import os
+
 """
 help       -> scons -h
 compile    -> scons
@@ -28,8 +30,17 @@
 ###################################################################
 
 ## Load the builders in config
-env = Environment( tools=['default', 'generic', 'qt4'], toolpath=['./', './bksys'])
+env = Environment( tools=['default', 'generic', 'pkgconfig', 'qt4'], toolpath=['./', './bksys'])
 
+#if os.environ.has_key('QTDIR'):
+#	addon = ':' + os.environ['QTDIR'] + '/lib'
+#	if os.environ.has_key('PKG_CONFIG_PATH'):
+#		os.environ['PKG_CONFIG_PATH'] = os.environ['PKG_CONFIG_PATH'] + addon
+#	else:
+#		os.environ['PKG_CONFIG_PATH'] = addon
+#
+#env.pkgConfig_findPackage(env, "QtCore", "4.0.1")
+
 #env.KDEuse("environ rpath")
 #env.KDEuse("environ rpath lang_qt thread nohelp")
 
@@ -72,9 +83,13 @@
 import os
 if not os.path.exists('build/config.h'):
 	dest=open('build/config.h', 'w')
-	dest.write('#define kdemacros.h kdemacros.h.in\n')
 	dest.close()
 
+if not os.path.exists('build/kdemacros.h'):
+	dest = open('build/kdemacros.h', 'w')
+	dest.write('#include <kdemacros.h.in>\n')
+	dest.close()
+
 env.Append(CPPFLAGS = ['-Ibuild'])
 
 ###################################################################
[prev in list] [next in list] [prev in thread] [next in thread]