1. 13 Sep, 2017 2 commits
    • Brad King's avatar
      Merge branch 'backport-vs-fix-config-map' into release-3.9 · 9f66fe9a
      Brad King authored
      Merge-request: !1256
    • Brad King's avatar
      VS: Do not consider MAP_IMPORTED_CONFIG_<CONFIG> on non-imported targets · c5b5bb27
      Brad King authored
      Since commit v3.9.0-rc1~309^2 (include_external_msproject: Honor
      MAP_IMPORTED_CONFIG_<CONFIG>, 2017-04-04) we accidentally honor
      `MAP_IMPORTED_CONFIG_<CONFIG>` while generating the `.sln` file entries
      for normal targets.  This causes `devenv.com`-driven builds to use the
      mapping incorrectly for normal targets.  Check that a target really
      comes from `include_external_msproject` before considering the map.
      Furthermore, when we do use the map, we should only take the first entry
      if more than one configuration is specified.  Otherwise we end up giving
      VS a configuration name with a `;` in it.
      Fixes: #17276
  2. 07 Sep, 2017 3 commits
  3. 06 Sep, 2017 2 commits
  4. 05 Sep, 2017 10 commits
  5. 01 Sep, 2017 2 commits
    • Brad King's avatar
      Merge branch 'fix-genex-SOURCES' into release-3.9 · 2820de21
      Brad King authored
      Merge-request: !1218
    • Brad King's avatar
      Genex: Fix TARGET_PROPERTY value of SOURCES · 068cc545
      Brad King authored
      Refactoring in commit v3.8.0-rc1~445^2~2 (cmTarget: Move sanity checks
      and computed property access to callers, 2016-10-13) exposed a typo in
      commit v3.8.0-rc1~445^2~3 (cmGeneratorTarget: Implement
      cmTargetPropertyComputer interface, 2016-10-13).  Together they broke
      the `$<TARGET_PROPERTY:mytgt,SOURCES>` generator expression in the case
      that the `SOURCES` target property is populated in part by the
      `target_sources` command.  Add the missing `;`-separator.
      Fixes: #17243
  6. 29 Aug, 2017 4 commits
  7. 24 Aug, 2017 2 commits
  8. 23 Aug, 2017 2 commits
    • Brad King's avatar
      Merge branch 'ninja-cl-intl' into release-3.9 · 6fd0c721
      Brad King authored
      Merge-request: !1179
    • Brad King's avatar
      Ninja: Fix support for MSVC with non-English output · de9840d1
      Brad King authored
      With MSVC the Ninja generator extracts the `cl -showIncludes` prefix.
      When MSVC is configured to have non-English output, e.g. via
      `VSLANG=2052` in the environment, then `cl` prints the prefix encoded
      for the current code page, which is not necessarily UTF-8 encoding.
      Currently we fail to convert the prefix to our internal UTF-8 encoding,
      but assume it is UTF-8 later.
      While writing `rules.ninja`, the Ninja generator converts our internal
      UTF-8 encoding to the current code page.  The `msvc_deps_prefix =` line
      needs to be encoded as the current code page so that `ninja` can match
      in the output from `cl -showIncludes` during the build.
      Prior to commit v3.9.0-rc1~47^2 (codecvt: Re-implement do_out and
      do_unshift, 2017-05-25), the non-UTF-8 prefix extracted above was
      written without noticing its incorrect internal encoding.  The
      `rules.ninja` file was successfully written, but possibly with a mangled
      `msvc_deps_prefix`.  Since that commit the output stream correctly
      rejects the non-UTF-8 byte sequence and writing `rules.ninja` fails.
      Fix this by correctly converting the `cl -showIncludes` output from the
      current code page to our internal UTF-8 encoding.
      Fixes: #17191
  9. 22 Aug, 2017 3 commits
  10. 21 Aug, 2017 2 commits
  11. 15 Aug, 2017 8 commits