diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-06-06 15:48:41 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-06-06 15:48:41 +0200 |
| commit | 094c908e3ba57e7da30a41aedc616f91f7e204be (patch) | |
| tree | 42d416439c5569e3b77327e9e6e2dd05a40be2c9 /mkspecs | |
| parent | a1d3562d5115f5b06f9cb515df570e36c89ba187 (diff) | |
| parent | 7b4d55ddde308b6c716f2e5fe5a12ad8e99115a7 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ib61d4087aa999ae93240be620496e60f4fa73f63
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/gn_generator.prf | 35 |
1 files changed, 12 insertions, 23 deletions
diff --git a/mkspecs/features/gn_generator.prf b/mkspecs/features/gn_generator.prf index 78b56d123..863169c4d 100644 --- a/mkspecs/features/gn_generator.prf +++ b/mkspecs/features/gn_generator.prf @@ -26,8 +26,6 @@ isEmpty(GN_FILE): GN_FILE = $$system_path($$_PRO_FILE_PWD_/BUILD.gn) isEmpty(GN_RUN_BINARY_SCRIPT): GN_RUN_BINARY_SCRIPT = "//build/gn_run_binary.py" isEmpty(GN_FIND_MOCABLES_SCRIPT): GN_FIND_MOCABLES_SCRIPT = "//build/gn_find_mocables.py" -GN_CONTENTS += "import(\"//build/config/jumbo.gni\")" - # MOC SETUP GN_CONTENTS += "moc_source_h_files = exec_script(\"$$GN_FIND_MOCABLES_SCRIPT\"," @@ -176,26 +174,6 @@ GN_CONTENTS += "}" # TARGET SETUP -GN_CONTENTS += "jumbo_source_set(\"$${TARGET}_MOC\") {" -GN_CONTENTS += " configs += [ \":$${TARGET}_config\" ]" -GN_CONTENTS += " configs += [ \"//build/config:precompiled_headers\" ]" -GN_CONTENTS += " sources = []" -GN_CONTENTS += " deps = []" -GN_CONTENTS += " if (moc_source_h_files != []) {" -GN_CONTENTS += " deps += [" -GN_CONTENTS += " \":generate_h_mocs\"," -GN_CONTENTS += " ]" -# Add moc output files to compile -GN_CONTENTS += " sources += get_target_outputs(\":generate_h_mocs\")" -GN_CONTENTS += " }" -GN_CONTENTS += " if (moc_source_cpp_files != []) {" -GN_CONTENTS += " deps += [" -GN_CONTENTS += " \":generate_cpp_mocs\"," -GN_CONTENTS += " ]" -GN_CONTENTS += " }" -GN_CONTENTS += "}" - - TARGET_TYPE = $$getTargetType() GN_CONTENTS += "$${TARGET_TYPE}(\"$$TARGET\") {" @@ -248,7 +226,18 @@ win32 { CONFIG(rtti): GN_CONTENTS += " configs += [\"//build/config/compiler:rtti\"]" } -GN_CONTENTS += " deps += [ \":$${TARGET}_MOC\" ]" +GN_CONTENTS += " if (moc_source_h_files != []) {" +GN_CONTENTS += " deps += [" +GN_CONTENTS += " \":generate_h_mocs\"," +GN_CONTENTS += " ]" +# Add moc output files to compile +GN_CONTENTS += " sources += get_target_outputs(\":generate_h_mocs\")" +GN_CONTENTS += " }" +GN_CONTENTS += " if (moc_source_cpp_files != []) {" +GN_CONTENTS += " deps += [" +GN_CONTENTS += " \":generate_cpp_mocs\"," +GN_CONTENTS += " ]" +GN_CONTENTS += " }" GN_CONTENTS += "}" GN_CONTENTS += "" GN_CONTENTS += "if (!defined(core_include_dirs)) {"\ |