prepare.py do not use grouped builders in case of makefile / ninja generators

This feature is only relevant in case of IDE where you want to have a single project handling all libraries at once. In any other case, it's easier to deal with project one by one.
parent bd7859d4
...@@ -42,7 +42,7 @@ except Exception as e: ...@@ -42,7 +42,7 @@ except Exception as e:
class DesktopTarget(prepare.Target): class DesktopTarget(prepare.Target):
def __init__(self): def __init__(self, use_group="NO"):
prepare.Target.__init__(self, '') prepare.Target.__init__(self, '')
current_path = os.path.dirname(os.path.realpath(__file__)) current_path = os.path.dirname(os.path.realpath(__file__))
if platform.system() == 'Windows': if platform.system() == 'Windows':
...@@ -53,7 +53,7 @@ class DesktopTarget(prepare.Target): ...@@ -53,7 +53,7 @@ class DesktopTarget(prepare.Target):
self.additional_args = [ self.additional_args = [
'-DCMAKE_INSTALL_MESSAGE=LAZY', '-DCMAKE_INSTALL_MESSAGE=LAZY',
'-DLINPHONE_BUILDER_EXTERNAL_SOURCE_PATH=' + current_path + '/submodules', '-DLINPHONE_BUILDER_EXTERNAL_SOURCE_PATH=' + current_path + '/submodules',
'-DLINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS=YES' '-DLINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS=' + use_group
] ]
...@@ -165,7 +165,7 @@ def main(argv=None): ...@@ -165,7 +165,7 @@ def main(argv=None):
'-f', '--force', help="Force preparation, even if working directory already exist.", action='store_true') '-f', '--force', help="Force preparation, even if working directory already exist.", action='store_true')
argparser.add_argument( argparser.add_argument(
'-G', '--generator', help="CMake build system generator (default: let CMake choose, use cmake -h to get the complete list).", '-G', '--generator', help="CMake build system generator (default: let CMake choose, use cmake -h to get the complete list).",
default=None, dest='generator') default="Unix Makefiles", dest='generator')
argparser.add_argument( argparser.add_argument(
'-L', '--list-cmake-variables', help="List non-advanced CMake cache variables.", action='store_true', dest='list_cmake_variables') '-L', '--list-cmake-variables', help="List non-advanced CMake cache variables.", action='store_true', dest='list_cmake_variables')
argparser.add_argument( argparser.add_argument(
...@@ -231,12 +231,13 @@ def main(argv=None): ...@@ -231,12 +231,13 @@ def main(argv=None):
elif args.python_raspberry: elif args.python_raspberry:
target = PythonRaspberryTarget() target = PythonRaspberryTarget()
else: else:
target = DesktopTarget() # for simple Makefile / ninja builds, we do not want to use grouped feature
if args.generator is not None: # to ease development by having each project separated from each other
target.generator = args.generator ungrouped_generators = [ "Unix Makefiles", "Ninja" ]
if target.generator is None: use_group = "NO" if any(generator in args.generator for generator in ungrouped_generators) else "YES"
# Default to "Unix Makefiles" if no target specific generator is set and the user has not defined one target = DesktopTarget(use_group=use_group)
target.generator = "Unix Makefiles"
target.generator = args.generator
if args.clean or args.veryclean: if args.clean or args.veryclean:
if args.veryclean: if args.veryclean:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment