forked from qt-creator/qt-creator
build.py: Apply additional config to all builds
Not only Qt Creator but also cdbextension & wininterrupt. Otherwise there is no way to pass additional configuration to these. Change-Id: I2bd4894f212df9795e1d66577bb25a26b29224a4 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
@@ -146,6 +146,8 @@ def common_cmake_arguments(args):
|
|||||||
# Qt otherwise adds dependencies on libGLX and libOpenGL
|
# Qt otherwise adds dependencies on libGLX and libOpenGL
|
||||||
cmake_args += ['-DOpenGL_GL_PREFERENCE=LEGACY']
|
cmake_args += ['-DOpenGL_GL_PREFERENCE=LEGACY']
|
||||||
|
|
||||||
|
cmake_args += args.config_args
|
||||||
|
|
||||||
return cmake_args
|
return cmake_args
|
||||||
|
|
||||||
def build_qtcreator(args, paths):
|
def build_qtcreator(args, paths):
|
||||||
@@ -194,8 +196,6 @@ def build_qtcreator(args, paths):
|
|||||||
if common.is_linux_platform():
|
if common.is_linux_platform():
|
||||||
cmake_args += ['-DCPACK_INSTALL_PREFIX=/opt/qt-creator']
|
cmake_args += ['-DCPACK_INSTALL_PREFIX=/opt/qt-creator']
|
||||||
|
|
||||||
cmake_args += args.config_args
|
|
||||||
|
|
||||||
common.check_print_call(cmake_args + [paths.src], paths.build)
|
common.check_print_call(cmake_args + [paths.src], paths.build)
|
||||||
build_args = ['cmake', '--build', '.']
|
build_args = ['cmake', '--build', '.']
|
||||||
if args.make_args:
|
if args.make_args:
|
||||||
|
Reference in New Issue
Block a user