Commit Graph

44877 Commits

Author SHA1 Message Date
Brad King
c4f2f01108 Merge topic 'rename-mutating-getfullpath-overload'
2d888e3390 cmSourceFile: Rename mutating GetFullPath() overload

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3757
2019-09-03 09:40:44 -04:00
Brad King
4684e64c84 Merge topic 'clang-ipo-support'
dca9c33abc Tests: Remove old IPO test
c856d4556b bindexplib: supporting llvm bitcode formats using llvm-nm
079b8e2916 Clang: prefer lld-link over link.exe
6e3655db2c Clang: add LTO support for GNU-command line clang on windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3527
2019-09-03 09:39:03 -04:00
Brad King
54b69bd642 Merge topic 'gtest-1.8.1'
aaf2435780 FindGTest: Add support for googletest 1.8.1 folder structure

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3756
2019-09-03 09:36:59 -04:00
Brad King
cee20ad537 Merge topic 'vs-cuda-custom-dir'
25f29b9741 cuda: Adapted tests to work with modified cuda toolset
ee86770a3f cuda: Added docs for extended cuda toolset
0ad180d712 cuda: Extend cuda compiler detection to work with custom cuda path
55b0532128 cuda: Extend vs10 target generator to use custom cuda path
df0247a371 cuda: Extend toolset argument to accept path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3713
2019-09-03 09:34:46 -04:00
Brad King
d8e3237611 Merge topic 'FindPkgConfig-module-name'
fe68387695 FindPkgConfig: return the module found by pkg_search_module

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3749
2019-09-03 09:33:02 -04:00
Brad King
2e6effd2e0 Merge topic 'cpack-install-multiple-configurations'
da5ac4bb60 cpack: Add `CPACK_INSTALL_CMAKE_CONFIGURATIONS` variable
d4e6b2ae25 Refactor: Use `unique_ptr` instead of raw pointer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3533
2019-09-03 09:30:15 -04:00
Brad King
d615ce4386 Merge topic 'xcode11-swift'
5c028c27eb Xcode: Relax swift compiler detection regex for Xcode 11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3758
2019-09-03 09:27:39 -04:00
Brad King
c1dbbef239 Merge branch 'release-3.15' 2019-09-03 09:26:03 -04:00
Brad King
ea63df139e Merge topic 'FindBoost-1.71'
7828577065 FindBoost: Add support for Boost 1.71
cf29fa18c8 FindBoost: Unwrap compatibility INTERFACE targets for legacy variables
d7df3cd73f FindBoost: Remove incorrect 1.70 timer dependency
8ff43de1a5 FindBoost: Simplify conditional block for last known version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Dennis Klein <d.klein@gsi.de>
Merge-request: !3763
2019-09-03 09:23:48 -04:00
Brad King
917cfecf12 Merge topic 'fileapi-CMP0037-OLD'
9da1c33cf1 fileapi: Fix codemodel v2 target file name for CMP0037 OLD behavior

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3760
2019-09-03 09:21:47 -04:00
Kitware Robot
cfae4c657f CMake Nightly Date Stamp 2019-09-03 00:01:04 -04:00
Kitware Robot
679f5a0ec7 CMake Nightly Date Stamp 2019-09-02 00:01:03 -04:00
Kitware Robot
ff7c31abfd CMake Nightly Date Stamp 2019-09-01 00:01:04 -04:00
Kitware Robot
45aacb7698 CMake Nightly Date Stamp 2019-08-31 00:01:04 -04:00
Brad King
3b8fa496e7 Merge branch 'FindBoost-1.71' into release-3.15
Merge-request: !3763
2019-08-30 14:54:30 -04:00
Brad King
7828577065 FindBoost: Add support for Boost 1.71
Run `Utilities/Scripts/BoostScanDeps.cmake` with the Boost 1.71.0
sources to compute dependencies.  They are the same as Boost 1.70.

Fixes: #19658
2019-08-30 14:51:20 -04:00
Brad King
cf29fa18c8 FindBoost: Unwrap compatibility INTERFACE targets for legacy variables
Since commit 0dd6772a89 (FindBoost: Add legacy variables and targets for
compatibility, 2019-06-14, v3.15.0-rc2~3^2~1) we extract information
from imported targets provided by upstream `BoostConfig.cmake` files.
However, upstream Boost 1.71 provides some imported targets only for
compatibility.  They are just INTERFACE libraries that wrap around the
real target named by `INTERFACE_LINK_LIBRARIES`.  Unwrap this layer so
we can extract the real imported location.

Fixes: #19656
2019-08-30 14:51:03 -04:00
Brad King
d7df3cd73f FindBoost: Remove incorrect 1.70 timer dependency
Running `Utilities/Scripts/BoostScanDeps.cmake` with the Boost 1.70.0
sources shows that the `timer` component no longer depends on `system`.
This is consistent with upstream Boost Timer commit `43eecbd071`.
2019-08-30 14:51:03 -04:00
Brad King
8ff43de1a5 FindBoost: Simplify conditional block for last known version
A version newer than we know about will be large enough to enter the
block for the last known version so we can put the warning there.
2019-08-30 14:51:03 -04:00
Brad King
c0d21d763b Merge topic 'doc-contrib-topic-name'
2fa3361384 CONTRIBUTING: Clarify creation of topic branch from target branch

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !3761
2019-08-30 13:16:33 -04:00
Zsolt Parragi
dca9c33abc Tests: Remove old IPO test
This test didn't really result in IPO compilation, there are other
better tests for this.
2019-08-30 11:31:06 -04:00
Zsolt Parragi
c856d4556b bindexplib: supporting llvm bitcode formats using llvm-nm 2019-08-30 11:30:38 -04:00
Kelby Faessler
aaf2435780 FindGTest: Add support for googletest 1.8.1 folder structure 2019-08-30 11:24:27 -04:00
Brad King
2fa3361384 CONTRIBUTING: Clarify creation of topic branch from target branch
The sentence "Base all new work on the upstream master branch." may be
interpreted to mean that one should commit on a 'master' branch.
Precede this with an explicit step for creating a topic branch.
2019-08-30 11:12:30 -04:00
Alex Turbov
da5ac4bb60 cpack: Add CPACK_INSTALL_CMAKE_CONFIGURATIONS variable
For the multi-configuration generators one can specify the list
of configurations to include in the package.

E.g. having a project, where debug libraries have a suffix to
distinct them from the release builds, one can build the package
containing both `Debug` and `Release` binaries.
2019-08-30 11:02:43 -04:00
Brad King
2d01dcab29 Merge topic 'rel-nightly-test'
2c71208a78 Tests: Fix nightly binary tests to fail on error

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3755
2019-08-30 10:43:09 -04:00
Brad King
a38965db9a Merge topic 'remove_directory-symlink'
e6c9a8bac3 cmake: Teach -E remove_directory to remove directory symlinks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3738
2019-08-30 10:38:25 -04:00
Jon Chronopoulos
e6c9a8bac3 cmake: Teach -E remove_directory to remove directory symlinks
If the argument to `remove_directory` is a symlink to a directory,
remove the symlink instead.

Issue: #19533
2019-08-30 10:37:30 -04:00
Brad King
f8917685f3 Merge topic 'update-kwsys'
6a9de634b2 Merge branch 'upstream-KWSys' into update-kwsys
f9a3f13415 KWSys 2019-08-29 (08f14d96)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3754
2019-08-30 10:36:07 -04:00
Brad King
9141fbe0c1 Merge topic 'docker-rel-linux'
2c95c35c51 Utilities/Release: Add docker spec for STGZ package on Linux

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3753
2019-08-30 10:35:09 -04:00
Brad King
1ae24ee108 Merge branch 'fileapi-CMP0037-OLD' into release-3.15
Merge-request: !3760
2019-08-30 10:21:29 -04:00
Brad King
9da1c33cf1 fileapi: Fix codemodel v2 target file name for CMP0037 OLD behavior
With CMP0037 OLD behavior, executable and library target names may
contain a slash.  Avoid constructing file names with slashes.

Fixes: #19653
2019-08-30 10:20:12 -04:00
Gregor Jasny
5c028c27eb Xcode: Relax swift compiler detection regex for Xcode 11
The Xcode 11 output:

```
  CompileSwift normal x86_64
  /Users/gregorj/Git/cmake/_build_xcode/Tests/SwiftOnly/CMakeFiles/3.15.20190826-g89479bd/CompilerIdSwift/CompilerId/main.swift
  (in target 'CompilerIdSwift' from project 'CompilerIdSwift')

      cd /Users/gregorj/Git/cmake/_build_xcode/Tests/SwiftOnly/CMakeFiles/3.15.20190826-g89479bd/CompilerIdSwift
      /Applications/Xcode-beta.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/swift -frontend -c -primary-file /Users/gregorj/Git/cmake/_build_xcode/Tests/SwiftOnly/CMakeFiles/3.15.20190826-g89479bd/CompilerIdSwift/CompilerId/main.swift ...
```

The Xcode 10 output:

```
CompileSwiftSources normal x86_64 com.apple.xcode.tools.swift.compiler
    cd /Users/gjasny/src/cmake/Tests/SwiftOnly
    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/swiftc -incremental -module-name SwiftOnly -O -enable-batch-mode -enforce-exclusivity=checked -swift-version 5.0 -sdk /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -target x86_64-apple-macosx10.14 -g -Xfrontend -serialize-debugging-options -swift-version 5 -Xlinker -rpath -Xlinker /usr/lib/swift -I /Users/gjasny/src/cmake/_build_xcode/Tests/SwiftOnly/Debug -F /Users/gjasny/src/cmake/_build_xcode/Tests/SwiftOnly/Debug -c -j24 /Users/gjasny/src/cmake/Tests/SwiftOnly/main.swift ...

CompileSwift normal x86_64 /Users/gjasny/src/cmake/Tests/SwiftOnly/main.swift
    cd /Users/gjasny/src/cmake/Tests/SwiftOnly
    /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/swift -frontend -c -primary-file /Users/gjasny/src/cmake/Tests/SwiftOnly/main.swift ...

```

The Xcode 11 output lacks the CompileSwiftSources action but the
CompileSwift action is present for both and also look suitable.
2019-08-30 10:53:58 +02:00
Benjamin Wozniak
25f29b9741 cuda: Adapted tests to work with modified cuda toolset
- cuda version is only recognized if it contains no other characters
  than "0123456789."
- cuda path is only tested with dummy value . Otherwise a cuda toolkit
  must be copied to the integration test machine
2019-08-30 08:14:01 +02:00
Benjamin Wozniak
ee86770a3f cuda: Added docs for extended cuda toolset 2019-08-30 08:14:00 +02:00
Benjamin Wozniak
0ad180d712 cuda: Extend cuda compiler detection to work with custom cuda path 2019-08-30 08:14:00 +02:00
Benjamin Wozniak
55b0532128 cuda: Extend vs10 target generator to use custom cuda path 2019-08-30 08:13:58 +02:00
Kitware Robot
8720353d4a CMake Nightly Date Stamp 2019-08-30 00:01:35 -04:00
Daniel Eiband
2d888e3390 cmSourceFile: Rename mutating GetFullPath() overload
Rename mutating GetFullPath() overload to ResolveFullPath().
2019-08-29 22:51:58 +02:00
Christophe Giboudeaux
fe68387695 FindPkgConfig: return the module found by pkg_search_module
When running `pkg_search_module`, it may be useful to get the matching
module name in order to run `pkg_get_variable`.

`pkg_search_module` now defines `<prefix>_MODULE_NAME` which contains
the first matching module name.

Fixes: #19648
2019-08-29 21:50:49 +02:00
Brad King
2c71208a78 Tests: Fix nightly binary tests to fail on error
We generate a small shell script to drive the steps.  Previously a
failure in the `release_cmake.cmake` script was not diagnosed and hidden
from the script exit code by the following upload step.  Tell the shell
to terminate with failure on the first command that fails.
2019-08-29 14:39:05 -04:00
Brad King
6a9de634b2 Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2019-08-29 (08f14d96)
2019-08-29 13:07:11 -04:00
KWSys Upstream
f9a3f13415 KWSys 2019-08-29 (08f14d96)
Code extracted from:

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

at commit 08f14d96b449e5d1e166998b363da16167a3ac82 (master).

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

Ben Boeckel (1):
      9afecb09 SystemTools: fix typo in junction functions

Jon Chronopoulos (1):
      38486236 SystemTools: do not special case a junction in RemoveFile

Rolf Eike Beer (3):
      b747462d CMake: drop needless x${VAR} tricks
      1ed70242 tests: verify SystemTools::CopyFileIfDifferent()
      f73d1b4f SystemTools: factor out "dest is directory" case from CopyFileIfDifferent()
2019-08-29 13:07:10 -04:00
Brad King
2c95c35c51 Utilities/Release: Add docker spec for STGZ package on Linux
The spec added by commit facc240a45 (Utilities/Release: Add docker specs
to build and test Linux binaries, 2019-08-23) generates only the TGZ
package, but the old `Utilities/Release/linux64_release.cmake` script
also generated a STGZ package.
2019-08-29 13:04:27 -04:00
Brad King
3ec986ce8e Merge topic 'per-lang-link-library-flag'
79b2824251 Add per-lang variants of CMAKE_LINK_LIBRARY_{FILE_FLAG,SUFFIX}

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3747
2019-08-29 09:41:06 -04:00
Brad King
ee945a590b Merge topic 'CMakeParseImplicitLinkInfo-comma-separated'
b5f20da94d CMakeParseImplicitLinkInfo supports comma separated link lines
2200bc068b Introduce a ParseImplicitLinkInfo test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3730
2019-08-29 09:40:12 -04:00
Brad King
fa36e2151d Merge topic 'precompile-headers'
8da78d4efe Precompile headers: Update documentation
5772930164 Precompile headers: Add unit tests
519606704e Precompile headers: Add support for Visual Studio generators
28be170fbc Precompile headers: Add support for Xcode generator
b8626261e9 Precompile headers: Add methods to generate PCH sources
375d01c680 PCH: add example/test
9b6797e71d PCH: add target_precompile_headers command
0467a2f91b PCH: add PRECOMPILE_HEADERS to special properties

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Daniel Pfeifer <daniel@pfeifer-mail.de>
Acked-by: Ivan171 <heavenandhell171@gmail.com>
Acked-by: Stanislav Ershov <digital.stream.of.mind@gmail.com>
Acked-by: Steve Mokris <smokris@softpixel.com>
Acked-by: Evgeniy Dushistov <dushistov@mail.ru>
Acked-by: Danila Malyutin <flashmozzg@gmail.com>
Acked-by: Viktor Kirilov <vik.kirilov@gmail.com>
Acked-by: Lucas Zhao <zhaopf6@163.com>
Merge-request: !3553
2019-08-29 09:38:21 -04:00
Brad King
030570d71f Merge topic 'autogen_strcat'
32b15d320f Autogen: cmQtAutoMocUic settings hash computation optimizations
b66cd3fe63 Autogen: cmQtAutoMocUic string concatenation cleanups
619a92eacd Autogen: cmQtAutoRcc settings hash computation optimizations
10dc684508 Autogen: cmQtAutoRcc string concatenation cleanups
da6c4b1273 Autogen: cmQtAutoGenInitializer string concatenation cleanups
7a78d15415 Autogen: Let cmQtAutoGenerator::Logger methods accept cm::string_view
c797148e85 Autogen: Use cm::string_view for AUTO{MOC,UIC,RCC} generator names
8586077baa Autogen: Modernize cmQtAutoGen methods using cm::string_view

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3742
2019-08-29 09:36:36 -04:00
Brad King
4929453504 Merge topic 'docker-rel-linux'
689fdbfc61 Utilities/Release: Drop linux64 script in favor of docker build
2d7cfd30ac Utilities/Release: Drop source archive generation in scripts
facc240a45 Utilities/Release: Add docker specs to build and test Linux binaries
bf832ccf01 Utilities/Release: Add README.rst describing directory content
ab153f17bf Utilities/Release: Drop machine-specific README
ed294c1664 Add option to skip CMake tests that need network access
4b8a864d52 Add option to test CMake itself against its hosting CMake

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Gregor Jasny <gjasny@googlemail.com>
Merge-request: !3727
2019-08-29 09:32:13 -04:00
Brad King
e009076780 Merge branch 'release-3.15' 2019-08-29 09:25:45 -04:00