QuasarApp/QuasarAppCI
4
0
Fork 0
mirror of https://github.com/QuasarApp/QuasarAppCI.git synced 2025-04-26 05:44:31 +00:00
Code Issues Projects Releases Wiki Activity

fix make

Browse Source
This commit is contained in:
Andrei Yankovich 2022-01-22 00:19:15 +03:00
parent 3b9f3c29d0
commit 5d9e89ba20
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BuildBotLib/basemodule.py
View File

@ -97,7 +97,7 @@ class BaseModule:
return 'make'
def makeTarget(self, target, cxxFlags=None):
def makeTarget(self, target, cxxFlags=[]):
command = [self.make()]
return command + [target]

6
BuildBotLib/cmake.py
View File

@ -15,7 +15,7 @@ class CMake(Make):
def makePrefix(self):
return "C"
def makeTarget(self, target, cxxFlags=None):
def makeTarget(self, target, cxxFlags=[]):
command = 'cmake --build cmake_build --config Release'
if len(target):
@ -25,9 +25,7 @@ class CMake(Make):
if cpus:
command += ' --parallel ' + str(cpus)
cxx = []
if cxxFlags is not None:
cxx += cxxFlags
cxx = cxxFlags
if self.isiOS(''):
cxx += ['-allowProvisioningUpdates']

3
master.cfg
View File

@ -32,11 +32,12 @@ cmakeAndroid = CMake(BaseModule.P_Android)
wasm = CMake(BaseModule.P_Wasm)
docs = Docs(BaseModule.P_Linux)
iosBuilder = CMake(BaseModule.P_iOS)
repoGen = QIFRepogen()
release = Releaser()
iosBuilder = CMake(BaseModule.P_iOS)
bot.addBuilder("LinuxBuilder", qmakeLinux)
bot.addBuilder("WindowsBuilder", qmakeWindows)