diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-03-05 18:02:18 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-07 18:19:31 +0100 |
| commit | 7e78765a0ced3ee5dd831d47925270037e39feb2 (patch) | |
| tree | 06789f868a2e9f6061a1f1133fc4bd6143df2c2d /src | |
| parent | 3c2af9e9e5fe6f90dfa3d4a58bd30d60e0e211a8 (diff) | |
Use the shadow build directory for the ninja output
The gyp/ninja build is moved from out/(Debug|Release) to
src/core/(Debug|Release).
The ninja build as well as generated gyp files and python
intermediate files all stay in the source tree for the moment.
Change-Id: I6948380c45896540fe508238ceef9fe48e41f5af
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/core.pro | 4 | ||||
| -rw-r--r-- | src/core/core_module.pro | 2 | ||||
| -rw-r--r-- | src/core/gyp_run.pro | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/core/core.pro b/src/core/core.pro index 5f0c3c29d..31a9c17f7 100644 --- a/src/core/core.pro +++ b/src/core/core.pro @@ -24,7 +24,7 @@ SUBDIRS += core_gyp_generator \ gyp_run \ core_module -REPACK_DIR = $$getOutDir()/$$getConfigDir()/gen/repack +REPACK_DIR = $$OUT_PWD/$$getConfigDir()/gen/repack locales.files = $$REPACK_DIR/qtwebengine_locales locales.CONFIG += no_check_exist locales.path = $$[QT_INSTALL_TRANSLATIONS] @@ -40,7 +40,7 @@ win32 { PLUGIN_PREFIX = } -plugins.files = $$getOutDir()/$$getConfigDir()/$${PLUGIN_PREFIX}ffmpegsumo$${PLUGIN_EXTENSION} +plugins.files = $$OUT_PWD/$$getConfigDir()/$${PLUGIN_PREFIX}ffmpegsumo$${PLUGIN_EXTENSION} plugins.CONFIG += no_check_exist plugins.path = $$[QT_INSTALL_PLUGINS]/qtwebengine diff --git a/src/core/core_module.pro b/src/core/core_module.pro index 22d3d8646..23503e32e 100644 --- a/src/core/core_module.pro +++ b/src/core/core_module.pro @@ -5,7 +5,7 @@ QT += qml quick QT_PRIVATE += qml-private quick-private gui-private core-private # Look for linking information produced by gyp for our target according to core_generated.gyp -!include($$getOutDir()/$$getConfigDir()/$${TARGET}_linking.pri) { +!include($$OUT_PWD/$$getConfigDir()/$${TARGET}_linking.pri) { error("Could not find the linking information that gyp should have generated.") } diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro index 830844fe8..5ef289b1b 100644 --- a/src/core/gyp_run.pro +++ b/src/core/gyp_run.pro @@ -61,19 +61,19 @@ cross_compile { win32 { # Libvpx build needs additional search path on Windows. git_chromium_src_dir = $$system("git config qtwebengine.chromiumsrcdir") -GYP_ARGS += "-D qtwe_chromium_obj_dir=\"$$getOutDir()/$$getConfigDir()/obj/$$git_chromium_src_dir\"" +GYP_ARGS += "-D qtwe_chromium_obj_dir=\"$$OUT_PWD/$$getConfigDir()/obj/$$git_chromium_src_dir\"" # Use path from environment for perl, bison and gperf instead of values set in WebKit's core.gypi. GYP_ARGS += "-D perl_exe=\"perl.exe\" -D bison_exe=\"bison.exe\" -D gperf_exe=\"gperf.exe\"" } !build_pass { - message(Running gyp_qtwebengine $${GYP_ARGS}...) - !system("python $$QTWEBENGINE_ROOT/tools/buildscripts/gyp_qtwebengine $${GYP_ARGS}"): error("-- running gyp_qtwebengine failed --") + message("Running gyp_qtwebengine \"$$OUT_PWD\" $${GYP_ARGS}...") + !system("python $$QTWEBENGINE_ROOT/tools/buildscripts/gyp_qtwebengine \"$$OUT_PWD\" $${GYP_ARGS}"): error("-- running gyp_qtwebengine failed --") } ninja.target = invoke_ninja -ninja.commands = $$findOrBuildNinja() \$\(NINJAFLAGS\) -C $$getOutDir()/$$getConfigDir() +ninja.commands = $$findOrBuildNinja() \$\(NINJAFLAGS\) -C "$$OUT_PWD/$$getConfigDir()" QMAKE_EXTRA_TARGETS += ninja build_pass:build_all:default_target.target = all |