mirrors/cmake
2
0 Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-10-05 04:03:22 +03:00
Code Activity
47,352 Commits 2 Branches 415 Tags
94de927cab19609aeeff032c64f16cfd257fca2f
Commit Graph
47352 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Daniel Eiband 10507c6dc0 cmMakefile: Add configurations getter with empty configuration default 2019-08-30 13:52:13 +02: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
Cristian Adam 8dfeb5d278 Unity build: Add support for Visual Studio generator 
It works as expected in Visual Studio.

Visual Studio 2017 will (partially) benefit from the build in
support for unity builds. The custom unity sources are used, because
the build in support doesn't allow batching of certain number of
files. It can do only batching by directory.
 2019-08-29 16:45:42 +02:00
Cristian Adam 7114c141e2 Unity build: Add support for Ninja and Makefile generators 2019-08-29 16:44:09 +02: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
Brad King 31c356e366 Merge topic 'find-no-name' 
84e33e6da4 Merge branch 'backport-find-no-name' into find-no-name
4c8760c9fb find_path: Fix crash on empty old-style list of names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3751
 2019-08-29 09:25:13 -04:00
Kitware Robot 2d0a24acc5 CMake Nightly Date Stamp 2019-08-29 00:01:03 -04:00
Brad King 689fdbfc61 Utilities/Release: Drop linux64 script in favor of docker build 
Drop also drop the CMakeNightlyLinux64 test that uses the script.
 2019-08-28 13:20:36 -04:00
Brad King 2d7cfd30ac Utilities/Release: Drop source archive generation in scripts 
We will generate the `.tar.gz` and `.zip` source archives using
`git archive` in the scripts that drive the Linux build with Docker.
 2019-08-28 13:20:36 -04:00
Brad King facc240a45 Utilities/Release: Add docker specs to build and test Linux binaries 
These will allow anyone to produce portable binaries like those
published on `cmake.org`.
 2019-08-28 13:20:36 -04:00
Brad King 3e93b2fa66 Merge topic 'vs-ConfigurationType-genex' 
8909a450a6 VS: Add support for generator expressions to VS_CONFIGURATION_TYPE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3746
 2019-08-28 11:53:12 -04:00
Brad King ffa1fa20e6 Merge topic 'sf-LANGUAGE-prop' 
41ba3e28e6 Tests: Collect SourceFileProperty tests
a40744c81a cmSourceFile: Move LANGUAGE to GetPropertyForUser
8cb3cffa42 cmSourceFile: Rename non-const GetLanguage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3744
 2019-08-28 11:52:04 -04:00
Brad King 606df71e48 Merge topic 'cpack-ifw-command-vectorization' 
9367f7dcdd CPack/IFW: Command vectorization

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3732
 2019-08-28 11:51:00 -04:00
Brad King ae861c196a Merge topic 'cmCommand_refactor_disallowed' 
54872b73b9 cmCommand refactor: remove cmDisallowedCommand class
11f35d340e cmCommand refactor: remove unused AddDisallowedCommand overload
ae51aa32f0 cmCommand refactor: cmVariableRequiresCommand
185fa2c4f3 cmCommand refactor: cmUtilitySourceCommand
c8deeac68f cmCommand refactor: cmSubdirDependsCommand
c2c222eba1 cmCommand refactor: cmOutputRequiredFilesCommand
7533e47ccc cmCommand refactor: cmLoadCommandCommand
9d6fc3f5ed cmCommand refactor: cmExportLibraryDependenciesCommand
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3736
 2019-08-28 11:49:32 -04:00
Cristian Adam 8da78d4efe Precompile headers: Update documentation 2019-08-28 11:47:51 -04:00
Cristian Adam 5772930164 Precompile headers: Add unit tests 2019-08-28 11:47:51 -04:00
Cristian Adam 519606704e Precompile headers: Add support for Visual Studio generators 
Tested with Visual C++ 2017 on Windows.

Co-Author: Daniel Pfeifer <daniel@pfeifer-mail.de>
 2019-08-28 11:47:51 -04:00
Cristian Adam 28be170fbc Precompile headers: Add support for Xcode generator 
Co-Author: Daniel Pfeifer <daniel@pfeifer-mail.de>
 2019-08-28 11:47:50 -04:00
Cristian Adam b8626261e9 Precompile headers: Add methods to generate PCH sources 
Co-Author: Daniel Pfeifer <daniel@pfeifer-mail.de>
 2019-08-28 11:47:40 -04:00
Brad King aeeccc3b15 Merge branch 'backport-find-no-name' into release-3.15 
Merge-request: !3751
 2019-08-28 11:28:59 -04:00
Brad King 3c7d09e465 Merge branch 'release-3.15' 2019-08-28 11:28:37 -04:00
Brad King 238be91529 Merge topic 'autogen_fix_use_after_move' 
e32f70036c Autogen: Fix AUTOUIC segfault, when file includes colliding ui_*.h file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3745
 2019-08-28 11:27:54 -04:00
Brad King 84e33e6da4 Merge branch 'backport-find-no-name' into find-no-name 2019-08-28 11:19:39 -04:00
Brad King 4c8760c9fb find_path: Fix crash on empty old-style list of names 
Fixes: #19651
 2019-08-28 11:18:53 -04:00
Robert Maynard b5f20da94d CMakeParseImplicitLinkInfo supports comma separated link lines 
It is currently presumed that the linker will generate
a space separated line. This is not the case for some
compilers such as IBM XL where it can output space or
comma separated. This is particularly apparent when IBM XL
is used as the host compiler for CUDA as it generates a comma
separated link line.
 2019-08-28 10:39:53 -04:00
Robert Maynard 2200bc068b Introduce a ParseImplicitLinkInfo test 
By sharing the information used by ParseImplicitIncludeInfo we can
also verify the parsing of implicit link info such as directories.
 2019-08-28 10:39:53 -04:00
Kitware Robot 96291764a1 CMake Nightly Date Stamp 2019-08-28 00:01:04 -04:00
Zsolt Parragi 079b8e2916 Clang: prefer lld-link over link.exe 
Objects compiled with -flto can only be linked with the llvm linker.
Before this change, clang-cl only supperted IPO with manual linker
selection.
 2019-08-27 20:19:29 +02:00
Zsolt Parragi 6e3655db2c Clang: add LTO support for GNU-command line clang on windows 2019-08-27 20:19:29 +02:00
Alan W. Irwin 79b2824251 Add per-lang variants of CMAKE_LINK_LIBRARY_{FILE_FLAG,SUFFIX} 
Extend the change from commit 689be6235e (Generator: support
per-language link library flag, 2019-08-08) to cover more link library
command-line flag components.  Allow compilers for different languages
to use different values for these linking-related variables within the
same build.

Closes: #19631
 2019-08-27 13:49:54 -04:00