X-Git-Url: https://git.ralfj.de/mass-build.git/blobdiff_plain/5144ec41af16647ac2cd974230a753ee2683f87d..d8ca509a6a8790a2470477c6011c039272f269f4:/build_system.py

diff --git a/build_system.py b/build_system.py
index bdca10a..971cf7b 100644
--- a/build_system.py
+++ b/build_system.py
@@ -18,16 +18,18 @@ class CMake:
 		if os.path.exists(cacheFile) and reconfigure: os.remove(cacheFile)
 		# Run cmake
 		os.putenv('PKG_CONFIG_PATH', os.path.join(self.config['installDir'], 'lib', 'pkgconfig')) # I found no way to do this within cmake
+		os.putenv('CMAKE_PREFIX_PATH', self.config['installDir'])
 		subprocess.check_call(['cmake', self.sourceFolder, '-DCMAKE_BUILD_TYPE='+self.config['buildType'],
 			'-DCMAKE_INSTALL_PREFIX='+self.config['installDir']]+self.config.get('cmakeParameters', []))
 		os.unsetenv('PKG_CONFIG_PATH')
+		os.unsetenv('CMAKE_PREFIX_PATH')
 		# if asked to do so, wait
 		if waitAfterConfig:
 			raw_input('Configuration done. Hit "Enter" to build the project. ')
 		# run compilation
-		subprocess.check_call(self.config['buildCmdPrefix'] + ['make', '-j'+str(self.config['jobs'])])
+		subprocess.check_call(self.config.get('buildCmdPrefix', []) + ['make', '-j'+str(self.config['jobs'])])
 		# run installation
-		subprocess.check_call(self.config['installCmdPrefix'] + ['make', 'install'])
+		subprocess.check_call(self.config.get('installCmdPrefix', []) + ['make', 'install'])
 
 # if auto-debuild is available, provide a wrapper for it
 try: