diff options
| author | Pierre Rossi <pierre.rossi@digia.com> | 2013-04-30 08:31:31 +0200 |
|---|---|---|
| committer | Pierre Rossi <pierre.rossi@digia.com> | 2013-05-02 20:02:21 +0200 |
| commit | 259a919a30cbdf867d7e2fef9c7e0ecf7056661e (patch) | |
| tree | 2a66215985536c4ff924f5873a329a9ea861c832 /build | |
| parent | 0a07a8e761ba628095e3301b7d7b671b87e49a0f (diff) | |
Define blinq_process path at compile time
This way we won't have to define the BLINQ_PROCESS_PATH environment variable
except in the case where we want to override that value.
Refactored some of the output dir logic in the process
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.pro | 4 | ||||
| -rw-r--r-- | build/qmake/mkspecs/features/default_pre.prf | 4 | ||||
| -rw-r--r-- | build/qmake/mkspecs/features/functions.prf | 5 |
3 files changed, 9 insertions, 4 deletions
diff --git a/build/build.pro b/build/build.pro index f869aee89..83c074d60 100644 --- a/build/build.pro +++ b/build/build.pro @@ -13,9 +13,7 @@ GYP_OUTPUT = $$system(./gyp_blinq) message($$GYP_OUTPUT) ninja.target = ninja -ninja.commands = $$CHROMIUM_SRC_DIR/../depot_tools/ninja -C -CONFIG(debug, debug|release): ninja.commands += $$BLINQ_ROOT/out/Debug -else: ninja.commands += $$BLINQ_ROOT/out/Release +ninja.commands = $$CHROMIUM_SRC_DIR/../depot_tools/ninja -C $$getOutDir() ninja.depends: qmake QMAKE_EXTRA_TARGETS += ninja diff --git a/build/qmake/mkspecs/features/default_pre.prf b/build/qmake/mkspecs/features/default_pre.prf index c54908efd..aee53ea1d 100644 --- a/build/qmake/mkspecs/features/default_pre.prf +++ b/build/qmake/mkspecs/features/default_pre.prf @@ -1,4 +1,6 @@ # Resolve root directories for sources BLINQ_ROOT = $$replace(PWD, /build/qmake/mkspecs/features$,) -# TODO: Build dir logic +BLINQ_PROCESS_NAME = blinq_process + +load(functions) diff --git a/build/qmake/mkspecs/features/functions.prf b/build/qmake/mkspecs/features/functions.prf index 8d0df1a4e..3ac1ffa12 100644 --- a/build/qmake/mkspecs/features/functions.prf +++ b/build/qmake/mkspecs/features/functions.prf @@ -7,3 +7,8 @@ defineReplace(toGypTargetType) { } return("none") } + +defineReplace(getOutDir) { + CONFIG(release, debug|release):return("$$BLINQ_ROOT/out/Release") + return("$$BLINQ_ROOT/out/Debug") +} |