GitLab

Brad King authored Oct 23, 2018 and Kitware Robot committed Oct 23, 2018

75f73dde Utilities/Scripts: Remove temporary block-style comment conversion script
df4ed1e9 Help: Convert remaining modules to block-style comments
7115aa6c

 Utilities/Scripts: Add temporary block-style comment conversion script
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2510

Brad King authored Oct 23, 2018 and Kitware Robot committed Oct 23, 2018

b2d7ab8b

 GNUInstallDirs: Don't use BSD info and man paths on GNU/kFreeBSD
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2511

Brad King authored Oct 23, 2018 and Kitware Robot committed Oct 23, 2018

03100245 curl: Update build within CMake to account for 7.61 changes
b9d11077 curl: Backport to work with CMake 3.1 again
e9e8dcee Merge branch 'upstream-curl' into update-curl
18812a9c curl 2018-09-04 (432eb5f5)
ded211ae

 curl: Update script to get curl 7.61.1
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2509

Brad King authored Oct 23, 2018 and Kitware Robot committed Oct 23, 2018

3dc484e5

 curl: add missing type sizes for 'long long' and '__int64'
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2513

Merge-request: !2511

Merge-request: !2509

Merge-request: !2513

Brad King authored Oct 22, 2018 and Kitware Robot committed Oct 22, 2018

dd4f8b2a install: Record TARGET mode backtraces internally
753ab3c9 Add generator APIs to get build settings with backtraces
52311484

 cmLocalGenerator: Make MoveSystemIncludesToEnd file-local
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2502

Brad King authored Oct 22, 2018 and Kitware Robot committed Oct 22, 2018

7ddc9e35 ExternalProject: option LOG_MERGED_STDOUTERR to combine stdout and stderr
b6f6cac3

 ExternalProject: add LOG_DIR option that allows overriding of log location
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2488

Brad King authored Oct 22, 2018 and Kitware Robot committed Oct 22, 2018

a833c24c Merge branch 'upstream-KWSys' into update-kwsys
43cb2576

 KWSys 2018-10-19 (c2f29d2e)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2506

When generating `curl_config.h`, add size information for `long long`
and `__int64` types.  These are needed as candidates for defining the
`ssize_t` type because on MSVC, `long` is not the same size as `size_t`.

This problem did not affect upstream curl because it computes the
`ssize_t` type in CMake code where all sizes are available.  CMake's
port computes it in preprocessor logic because universal binaries on
macOS do not know type sizes until compile time.

Fixes: #18477

The_CURL_STATICLIB option was replaced by BUILD_SHARED_LIBS.

Drop our own CURL_STATICLIB compile definition because it is now
provided by curl's usage requirements.

Curl 7.61.1 requires CMake 3.4 to build from source and also exposes
a dependency on OpenSSL imported targets.  Revert that part of the
changes imported from curl upstream.

* upstream-curl:
  curl 2018-09-04 (432eb5f5)

Curl Upstream authored Sep 04, 2018 and Brad King committed Oct 22, 2018

Code extracted from:

    https://github.com/curl/curl.git

at commit 432eb5f5c254ee8383b2522ce597c9219877923e (curl-7_61_1).

In some circumstances the user of ExternalProject may not desire the
split log files for stdout and stderr. In particular with a project has
many errors it can be difficult to correlate the output error with the
command that it resulted from.

This commit adds the LOG_MERGED_STDOUTERR option that when enabled
outputs into a unified <name>-<step>.log for each step. If disabled it
will default to the previous behaviour of <name>-<step>-out.log and
<name>-<step>-err.log.

In some situations it can be helpful to separate out the location of the
log files from the location of the stamp files. For instance if you have
a continuous integration that exposes the location where log files are
stored.

This commit adds an option that allows a user to override the default
behaviour of putting the log files in STAMP_DIR called LOG_DIR. The
previous behaviour of putting the log files into the STAMP_DIR applies
if LOG_DIR is not specified.

Merge-request: !2506

Brad King authored Oct 19, 2018 and Kitware Robot committed Oct 19, 2018

31b6825b Merge branch 'master' into deployqt4-cmp0080-fix
15bbff05 DeployQt4: Do not include BundleUtilities at configure time
65bea5b9 DeployQt4: Convert to 2-space indentation
9bfb63bd

 Help: Convert DeployQt4 to block-style comment
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2494

Merge-request: !2494

* upstream-KWSys:
  KWSys 2018-10-19 (c2f29d2e)

Kitware Robot authored Oct 19, 2018 and Brad King committed Oct 19, 2018

Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit c2f29d2e929e58e36b4986d3ff5364a0d825cfca (master).

Upstream Shortlog
-----------------

Ben Boeckel (1):
      a5caf8a4 cmake: support an alias target

Modestas Vainius (1):
      162b3ed7 SystemInformation: Fix compilation on GNU/{kFreeBSD,Hurd}

Brad King authored Oct 19, 2018 and Kitware Robot committed Oct 19, 2018

dacbb414 Track backtraces in target dependencies internally
a6e02f88 add_dependencies: Track backtraces internally
a093b1a4 cmLinkItem: Add backtrace
e022e2d8 cmListFileCache: Add ExpandListWithBacktrace helper
f1dd0eea

 cmListFileCache: Add wrapper template for values with a backtrace
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2498

Brad King authored Oct 19, 2018 and Kitware Robot committed Oct 19, 2018

84e7920b

 FindFontconfig: Add module to find Fontconfig
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2487

Brad King authored Oct 19, 2018 and Kitware Robot committed Oct 19, 2018

95b4b913

 Declare support for CMake versions through 3.12 for own build
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2496

Brad King authored Oct 19, 2018 and Kitware Robot committed Oct 19, 2018

c88fb949

 FindLibinput: do not set Libinput_VERSION_STRING
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2501