From 7b414fb192340c55fcea9c634175b6dd4f39ebd0 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 12 Jan 2016 10:31:04 +0100 Subject: [PATCH 1/6] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 2130afe5f..9b216dadc 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 2130afe5f90108d9885af79c25c3ce506ce6f7b5 +Subproject commit 9b216dadc9bfbaf6611e262b3a8c4def4f5bd709 From b0eb2cd903e40039f2ea38e9c8410d6696c48690 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 12 Jan 2016 10:38:48 +0100 Subject: [PATCH 2/6] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 9b216dadc..207dddc8e 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 9b216dadc9bfbaf6611e262b3a8c4def4f5bd709 +Subproject commit 207dddc8e1824cf47f6f636120a4f8858ab2132b From dc1a6d76b7d18c0e27f300b24d460285f9819932 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 12 Jan 2016 10:53:41 +0100 Subject: [PATCH 3/6] Specify Visual Studio 2013 as the default generator on Windows. --- prepare.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/prepare.py b/prepare.py index fd47b66a6..34a0b9e52 100755 --- a/prepare.py +++ b/prepare.py @@ -47,6 +47,8 @@ class DesktopTarget(prepare.Target): if platform.system() == 'Windows': current_path = current_path.replace('\\', '/') self.config_file = 'configs/config-desktop.cmake' + if platform.system() == 'Windows': + self.generator = 'Visual Studio 12 2013' self.additional_args = [ '-DCMAKE_INSTALL_MESSAGE=LAZY', '-DLINPHONE_BUILDER_EXTERNAL_SOURCE_PATH=' + From 4937f87b1c35531edb85d88664658d415c99dcd8 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 12 Jan 2016 11:02:10 +0100 Subject: [PATCH 4/6] Prevent overwriting target generator with default argument value. --- prepare.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/prepare.py b/prepare.py index 34a0b9e52..b1ceba6a9 100755 --- a/prepare.py +++ b/prepare.py @@ -180,7 +180,6 @@ def main(argv=None): args, additional_args = argparser.parse_known_args() - additional_args += ["-G", args.generator] additional_args += ["-DLINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS=YES"] if args.only_submodules: @@ -227,6 +226,8 @@ def main(argv=None): target = PythonRaspberryTarget() else: target = DesktopTarget() + if target.generator is None: + additional_args += ["-G", args.generator] if args.clean or args.veryclean: if args.veryclean: target.veryclean() From 490ceb07dcfcee04f1197c2744debd176258cb58 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 12 Jan 2016 11:10:23 +0100 Subject: [PATCH 5/6] Really fix handling of generator. --- prepare.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/prepare.py b/prepare.py index b1ceba6a9..abd4e3cd0 100755 --- a/prepare.py +++ b/prepare.py @@ -164,7 +164,7 @@ def main(argv=None): argparser.add_argument( '-f', '--force', help="Force preparation, even if working directory already exist.", action='store_true') argparser.add_argument( - '-G', '--generator', help="CMake build system generator (default: Unix Makefiles, use cmake -h to get the complete list).", default='Unix Makefiles', dest='generator') + '-G', '--generator', help="CMake build system generator (default: let CMake choose, use cmake -h to get the complete list).", default=None, dest='generator') argparser.add_argument( '-L', '--list-cmake-variables', help="List non-advanced CMake cache variables.", action='store_true', dest='list_cmake_variables') argparser.add_argument( @@ -226,8 +226,9 @@ def main(argv=None): target = PythonRaspberryTarget() else: target = DesktopTarget() - if target.generator is None: - additional_args += ["-G", args.generator] + if args.generator is not None: + target.generator = args.generator + if args.clean or args.veryclean: if args.veryclean: target.veryclean() From 354b175a6b584f47bae5d5ace80342d1b31d1fc7 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 12 Jan 2016 16:11:26 +0100 Subject: [PATCH 6/6] Fix prepare.py error related to generator. --- prepare.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/prepare.py b/prepare.py index abd4e3cd0..9383bb81d 100755 --- a/prepare.py +++ b/prepare.py @@ -244,18 +244,18 @@ def main(argv=None): retcode = 0 return retcode # only generated makefile if we are using Ninja or Makefile - if args.generator.endswith('Ninja'): + if target.generator.endswith('Ninja'): if not check_is_installed("ninja", "it"): return 1 generate_makefile('ninja -C') info("You can now run 'make' to build.") - elif args.generator.endswith("Unix Makefiles"): + elif target.generator.endswith("Unix Makefiles"): generate_makefile('$(MAKE) -C') info("You can now run 'make' to build.") - elif args.generator == "Xcode": + elif target.generator == "Xcode": info("You can now open Xcode project with: open WORK/cmake/Project.xcodeproj") else: - warning("Not generating meta-makefile for generator {}.".format(args.generator)) + warning("Not generating meta-makefile for generator {}.".format(target.generator)) return 0