From 3a20190095be8952a64e0510a0724cfbcd75092b Mon Sep 17 00:00:00 2001 From: Andras Becsi Date: Thu, 5 Dec 2013 16:17:20 +0100 Subject: Minor clean-up in core_gyp_generator.pro and gyp_run.pro - Use QMAKE_RESOLVED_TARGET to find out the core lib target name - Pass the NINJAFLAGS env var to ninja instead of passing the content - Remove invalid dependency rule for the ninja target, which is only parsed because it looks like a qmake condition. Change-Id: I09bba8f350308d3249369171d0a3d5824f184590 Reviewed-by: Pierre Rossi --- src/core/core_gyp_generator.pro | 8 ++++++-- src/core/gyp_run.pro | 3 +-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/core/core_gyp_generator.pro b/src/core/core_gyp_generator.pro index 4388cdb1c..01d123f38 100644 --- a/src/core/core_gyp_generator.pro +++ b/src/core/core_gyp_generator.pro @@ -83,8 +83,12 @@ HEADERS = \ qrc_protocol_handler_qt.h \ url_request_qrc_job_qt.h -OUTPUT_DIR = $$getOutDir()/$$getConfigDir() -target.files = $$OUTPUT_DIR/lib/lib$${TARGET}.so +VERSION = $$MODULE_VERSION +load(resolve_target) +TARGET_NAME = $$basename(QMAKE_RESOLVED_TARGET) +TARGET_NAME = $$replace(TARGET_NAME, .$${VERSION},) + +target.files = $$getOutDir()/$$getConfigDir()/lib/$$TARGET_NAME target.CONFIG += no_check_exist # Trust us, qmake... target.path = $$[QT_INSTALL_LIBS] INSTALLS += target diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro index 258d2f7c2..44e353e8b 100644 --- a/src/core/gyp_run.pro +++ b/src/core/gyp_run.pro @@ -60,8 +60,7 @@ cross_compile { } ninja.target = invoke_ninja -ninja.commands = $$findOrBuildNinja() $$(NINJAFLAGS) -C $$getOutDir()/$$getConfigDir() -ninja.depends: qmake +ninja.commands = $$findOrBuildNinja() \$\(NINJAFLAGS\) -C $$getOutDir()/$$getConfigDir() QMAKE_EXTRA_TARGETS += ninja build_pass:build_all:default_target.target = all -- cgit v1.2.3