backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-05-11 00:58:14 +08:00
Code Issues Projects Releases Wiki Activity

merged 1.3 r1009:1010 into 1.4 and trunk

Browse Source
This commit is contained in:
Nick Bolton
2011-05-21 02:47:10 +00:00
parent 5a315324ca
commit b4918163a7
3 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tools/build/toolchain.py
View File

@@ -162,8 +162,8 @@ class InternalCommands:
print 'Defaulting target to: ' + self.defaultTarget
target = self.defaultTarget
# for non-vs always specify a build type (debug, release, etc)
if not generator.cmakeName.startswith('Visual Studio'):
# for makefiles always specify a build type (debug, release, etc)
if generator.cmakeName.find('Unix Makefiles') != -1:
cmake_args += ' -DCMAKE_BUILD_TYPE=' + target.capitalize()
# if not visual studio, use parent dir
@@ -290,17 +290,16 @@ class InternalCommands:
for target in targets:
self.ensureConfHasRun(target, skipConfig)
cmd = ''
if generator.find("Unix Makefiles") != -1:
print 'Building with GNU Make...'
cmd = self.make_cmd
elif generator == 'Xcode':
print 'Building with Xcode...'
cmd = self.xcodebuild_cmd
else:
raise Exception('Build command not supported with generator: ' + generator)
for target in targets:
cmd = ''
if generator.find("Unix Makefiles") != -1:
print 'Building with GNU Make...'
cmd = self.make_cmd
elif generator == 'Xcode':
print 'Building with Xcode...'
cmd = self.xcodebuild_cmd + ' -configuration ' + target.capitalize()
else:
raise Exception('Build command not supported with generator: ' + generator)
self.try_chdir(self.getBuildDir(target))
err = os.system(cmd)
self.restore_chdir()