Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try better handling CMAKE_BUILD_TYPE if xcode (supports multi-configurations, unlike Unix Makefiles)

Browse Source
This commit is contained in:
Shyotl
2014-12-22 02:42:31 -06:00
parent e0fb73414b
commit 28024d7a01
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/develop.py
View File

@@ -418,15 +418,17 @@ class DarwinSetup(UnixSetup):
word_size=self.word_size, word_size=self.word_size,
unattended=self.unattended, unattended=self.unattended,
project_name=self.project_name, project_name=self.project_name,
universal=self.universal, universal='',
type=self.build_type.upper(), type='',
) )
if(self.generator != 'Xcode'):
args['type'] = '-DCMAKE_BUILD_TYPE=%s' % self.build_type.upper()
if self.universal == 'ON': if self.universal == 'ON':
args['universal'] = '-DCMAKE_OSX_ARCHITECTURES:STRING=\'i386;ppc\'' args['universal'] = '-DCMAKE_OSX_ARCHITECTURES:STRING=\'i386;ppc\''
#if simple: #if simple:
# return 'cmake %(opts)s %(dir)r' % args # return 'cmake %(opts)s %(dir)r' % args
return ('cmake -G %(generator)r ' return ('cmake -G %(generator)r '
'-DCMAKE_BUILD_TYPE:STRING=%(type)s ' '%(type) '
'-DSTANDALONE:BOOL=%(standalone)s ' '-DSTANDALONE:BOOL=%(standalone)s '
'-DUNATTENDED:BOOL=%(unattended)s ' '-DUNATTENDED:BOOL=%(unattended)s '
'-DWORD_SIZE:STRING=%(word_size)s ' '-DWORD_SIZE:STRING=%(word_size)s '