summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindPython-specify-artifacts-directly'Brad King2019-09-038-847/+1408
|\ | | | | | | | | | | | | | | 06d9e67fbd FindPython: Add capability to specify directly artifacts cea2010b5c FindPython: Enhance python cache variables management. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3690
| * FindPython: Add capability to specify directly artifactsMarc Chevrier2019-09-028-205/+587
| | | | | | | | Fixes: #19492
| * FindPython: Enhance python cache variables management.Marc Chevrier2019-09-021-756/+935
| | | | | | | | | | | | Ensure multiple cmake runs without cache clean-up will preserve artifacts selected on first run. This change address the issue #19492.
* | Merge topic 'xcode11-bundles'Brad King2019-09-033-2/+12
|\ \ | | | | | | | | | | | | | | | | | | e29a92f525 Xcode: Make BundleTests compatible with Xcode 11 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3767
| * | Xcode: Make BundleTests compatible with Xcode 11Gregor Jasny2019-09-013-2/+12
| | |
* | | Merge topic 'add-non-empty-configurations-getter'Brad King2019-09-037-49/+34
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 10507c6dc0 cmMakefile: Add configurations getter with empty configuration default Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3759
| * | | cmMakefile: Add configurations getter with empty configuration defaultDaniel Eiband2019-08-307-49/+34
| | | |
* | | | Merge topic 'rename-mutating-getfullpath-overload'Brad King2019-09-0320-45/+46
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2d888e3390 cmSourceFile: Rename mutating GetFullPath() overload Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3757
| * | | | cmSourceFile: Rename mutating GetFullPath() overloadDaniel Eiband2019-08-2920-45/+46
| |/ / / | | | | | | | | | | | | Rename mutating GetFullPath() overload to ResolveFullPath().
* | | | Merge topic 'clang-ipo-support'Brad King2019-09-0315-23/+170
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Tests: Remove old IPO testZsolt Parragi2019-08-302-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | This test didn't really result in IPO compilation, there are other better tests for this.
| * | | | bindexplib: supporting llvm bitcode formats using llvm-nmZsolt Parragi2019-08-3011-12/+144
| | | | |
| * | | | Clang: prefer lld-link over link.exeZsolt Parragi2019-08-271-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Objects compiled with -flto can only be linked with the llvm linker. Before this change, clang-cl only supperted IPO with manual linker selection.
| * | | | Clang: add LTO support for GNU-command line clang on windowsZsolt Parragi2019-08-271-2/+9
| | | | |
* | | | | Merge topic 'gtest-1.8.1'Brad King2019-09-032-0/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aaf2435780 FindGTest: Add support for googletest 1.8.1 folder structure Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3756
| * | | | | FindGTest: Add support for googletest 1.8.1 folder structureKelby Faessler2019-08-302-0/+13
| | |/ / / | |/| | |
* | | | | Merge topic 'vs-cuda-custom-dir'Brad King2019-09-0316-21/+146
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | cuda: Adapted tests to work with modified cuda toolsetBenjamin Wozniak2019-08-307-7/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
| * | | | | cuda: Added docs for extended cuda toolsetBenjamin Wozniak2019-08-304-6/+28
| | | | | |
| * | | | | cuda: Extend cuda compiler detection to work with custom cuda pathBenjamin Wozniak2019-08-302-2/+9
| | | | | |
| * | | | | cuda: Extend vs10 target generator to use custom cuda pathBenjamin Wozniak2019-08-301-4/+25
| | | | | |
| * | | | | cuda: Extend toolset argument to accept pathBenjamin Wozniak2019-08-272-2/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously cuda could only be used with cmake if it is installed globally on the system. Sometimes this is not possible (eg docker, packaging with conan, etc.). Thus the cuda toolset argument is extended to take a path to a cuda install directory.
* | | | | | Merge topic 'FindPkgConfig-module-name'Brad King2019-09-034-0/+42
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe68387695 FindPkgConfig: return the module found by pkg_search_module Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3749
| * | | | | | FindPkgConfig: return the module found by pkg_search_moduleChristophe Giboudeaux2019-08-294-0/+42
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge topic 'cpack-install-multiple-configurations'Brad King2019-09-038-24/+84
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | cpack: Add `CPACK_INSTALL_CMAKE_CONFIGURATIONS` variableAlex Turbov2019-08-308-20/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | Refactor: Use `unique_ptr` instead of raw pointerAlex Turbov2019-08-191-5/+3
| | | | | | |
* | | | | | | Merge topic 'xcode11-swift'Brad King2019-09-031-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c028c27eb Xcode: Relax swift compiler detection regex for Xcode 11 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3758
| * | | | | | | Xcode: Relax swift compiler detection regex for Xcode 11Gregor Jasny2019-08-301-1/+1
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge branch 'release-3.15'Brad King2019-09-030-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'FindBoost-1.71' into release-3.15Brad King2019-08-302-18/+36
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3763
| * \ \ \ \ \ \ \ Merge branch 'fileapi-CMP0037-OLD' into release-3.15Brad King2019-08-301-0/+6
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3760
* | \ \ \ \ \ \ \ \ Merge topic 'FindBoost-1.71'Brad King2019-09-032-18/+36
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | FindBoost: Add support for Boost 1.71Brad King2019-08-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | FindBoost: Unwrap compatibility INTERFACE targets for legacy variablesBrad King2019-08-302-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | FindBoost: Remove incorrect 1.70 timer dependencyBrad King2019-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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`.
| * | | | | | | | | FindBoost: Simplify conditional block for last known versionBrad King2019-08-301-16/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | Merge topic 'fileapi-CMP0037-OLD'Brad King2019-09-031-0/+6
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9da1c33cf1 fileapi: Fix codemodel v2 target file name for CMP0037 OLD behavior Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3760
| * | | | | | | | | fileapi: Fix codemodel v2 target file name for CMP0037 OLD behaviorBrad King2019-08-301-0/+6
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With CMP0037 OLD behavior, executable and library target names may contain a slash. Avoid constructing file names with slashes. Fixes: #19653
* | | | | | | | | CMake Nightly Date StampKitware Robot2019-09-031-1/+1
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2019-09-021-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2019-09-011-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2019-08-311-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'doc-contrib-topic-name'Brad King2019-08-301-2/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | CONTRIBUTING: Clarify creation of topic branch from target branchBrad King2019-08-301-2/+3
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | Merge topic 'rel-nightly-test'Brad King2019-08-301-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2c71208a78 Tests: Fix nightly binary tests to fail on error Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3755
| * | | | | | | | Tests: Fix nightly binary tests to fail on errorBrad King2019-08-291-1/+2
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | Merge topic 'remove_directory-symlink'Brad King2019-08-306-4/+34
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e6c9a8bac3 cmake: Teach -E remove_directory to remove directory symlinks Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3738
| * | | | | | | | cmake: Teach -E remove_directory to remove directory symlinksJon Chronopoulos2019-08-306-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the argument to `remove_directory` is a symlink to a directory, remove the symlink instead. Issue: #19533
* | | | | | | | | Merge topic 'update-kwsys'Brad King2019-08-303-132/+82
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6a9de634b2 Merge branch 'upstream-KWSys' into update-kwsys f9a3f13415 KWSys 2019-08-29 (08f14d96) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3754