diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-01 15:54:16 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-07-27 15:19:49 +0000 |
| commit | b6a0cd76dbb29e288bb041aca3125801126f8810 (patch) | |
| tree | f732665e9f9368adf787926798a7f2a44b669e32 /tools/buildscripts/gyp_qtwebengine | |
| parent | 808ca6e6917cf17e4c30fcd3ac609164b36594cc (diff) | |
Move core_generated.gyp to build directory
Changes core_generated.gyp from being generated in the source directory
to being generated in the build directory.
Task-number: QTBUG-43014
Change-Id: Ia67df47bfadbf5dfca6e60a613dcf7b162b468fd
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'tools/buildscripts/gyp_qtwebengine')
| -rwxr-xr-x | tools/buildscripts/gyp_qtwebengine | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/buildscripts/gyp_qtwebengine b/tools/buildscripts/gyp_qtwebengine index ee09de973..d6f12ee2f 100755 --- a/tools/buildscripts/gyp_qtwebengine +++ b/tools/buildscripts/gyp_qtwebengine @@ -108,7 +108,8 @@ if __name__ == '__main__': break if not gyp_file_specified: - args.append(os.path.join(root_dir, 'src/core/core.gyp')) + args.append(os.path.join(root_dir, 'src/core/resources/resources.gyp')) + args.append(os.path.join(output_dir, 'core_generated.gyp')) args.extend(['-I' + i for i in additional_include_files(args)]) @@ -155,7 +156,7 @@ if __name__ == '__main__': # Tweak the output location and format (hardcode ninja for now if not set) args.extend(['--generator-output', '.']) - args.extend(['-Goutput_dir='+ os.path.relpath(output_dir, qtwebengine_root)]) + args.extend(['-Goutput_dir='+ purifyGypVarPath(os.path.relpath(output_dir, qtwebengine_root))]) # Tell gyp not to try finding cl.exe on Windows, Qt already requires the env to be set prior to the build. args.extend(['-G', 'ninja_use_custom_environment_files']) |