diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2017-04-11 22:53:54 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-04-11 21:07:10 +0000 |
| commit | 3b7091813e38631b9ca03ce9657c170ee8826439 (patch) | |
| tree | 29180c82de5218a2b559ed2d1b4c826f0de66d5a /Tools | |
| parent | 928cd15d3d3ab82734f49eb9d694faf59c3a0c6d (diff) | |
Import WebKit commit 1686903dfa4ab621a1b16a1a87529c88b07414a6
Change-Id: I07d705b9195c04d2d269586d67604150a5bda554
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/qmake/projects/run_cmake.pro | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Tools/qmake/projects/run_cmake.pro b/Tools/qmake/projects/run_cmake.pro index ac8767154..45d97e976 100644 --- a/Tools/qmake/projects/run_cmake.pro +++ b/Tools/qmake/projects/run_cmake.pro @@ -112,13 +112,17 @@ build_pass|!debug_and_release { QMAKE_EXTRA_TARGETS += default_target # When debug and release are built at the same time, don't install data files twice - debug_and_release:build_all:CONFIG(debug, debug|release): cmake_install_args = "-DCOMPONENT=Code" + debug_and_release:build_all:CONFIG(debug, debug|release) { + cmake_install_args = "-DCOMPONENT=Code" + # TODO: Fix macOS frameworks installation in debug_and_release + macos: destdir_suffix = "/debug" + } install_impl_target.target = install_impl install_impl_target.commands = cd $$cmake_build_dir && cmake $$cmake_install_args -P cmake_install.cmake QMAKE_EXTRA_TARGETS += install_impl_target install_target.target = install - install_target.commands = $(MAKE) -f $(MAKEFILE) install_impl $$make_args DESTDIR=$(INSTALL_ROOT) + install_target.commands = $(MAKE) -f $(MAKEFILE) install_impl $$make_args DESTDIR=$(INSTALL_ROOT)$$destdir_suffix QMAKE_EXTRA_TARGETS += install_target } |