summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2019-09-051-1/+1
|
* Merge branch 'release-3.15'Brad King2019-09-040-0/+0
|\
| * CMake 3.15.3v3.15.3Brad King2019-09-041-1/+1
| |
* | Merge branch 'release-3.15'Brad King2019-09-040-0/+0
|\ \ | |/
| * Merge branch 'FindBoost-1.71' into release-3.15Brad King2019-09-041-9/+15
| |\ | | | | | | | | | Merge-request: !3780
* | \ Merge topic 'FindBoost-1.71'Brad King2019-09-041-9/+15
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | 907d3ed824 FindBoost: Tolerate future Boost INTERFACE libraries 2d357b7a68 FindBoost: Clarify role of legacy variables in warning message Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3780
| * | FindBoost: Tolerate future Boost INTERFACE librariesBrad King2019-09-041-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 0dd6772a89 (FindBoost: Add legacy variables and targets for compatibility, 2019-06-14, v3.15.0-rc2~3^2~1) we query imported targets provided by `BoostConfig.cmake` for their `IMPORTED_LOCATION_<cfg>`. Querying this property is not allowed on INTERFACE libraries, so add a condition to avoid doing so in case Boost adds one in the future. Suggested-by: Alexander Grund <alexander.grund@tu-dresden.de> Issue: #19656, #19402
| * | FindBoost: Clarify role of legacy variables in warning messageBrad King2019-09-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revise the wording of the warning added by commit 0dd6772a89 (FindBoost: Add legacy variables and targets for compatibility, 2019-06-14, v3.15.0-rc2~3^2~1) to refer to the old variables as "legacy" rather than "standard". Suggested-by: Alexander Grund <alexander.grund@tu-dresden.de> Issue: #19402
* | | Merge topic 'pch-fix-vs-test'Brad King2019-09-041-11/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 383bf3b5e7 Precompile Headers: Fix Visual Studio 10 unit test Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3770
| * | | Precompile Headers: Fix Visual Studio 10 unit testCristian Adam2019-09-031-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | The unit test is more roboust, problems like c: vs C: or having relative paths of cmake_pch.cxx instead of absolute paths.
* | | | Merge topic 'tidy-use-using'Brad King2019-09-0480-162/+164
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 62e5f72289 clang-tidy: Replace typedef with using Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3731
| * | | | clang-tidy: Replace typedef with usingRegina Pfeifer2019-09-0380-162/+164
| | | | |
* | | | | Merge topic 'fortran-INCLUDE-defines'Brad King2019-09-046-6/+39
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fb9da8e6f4 Ninja: Pass preprocessor definitions when compiling with Intel Fortran Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3764
| * | | | | Ninja: Pass preprocessor definitions when compiling with Intel FortranBrad King2019-09-036-6/+39
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Intel Fortran compiler supports an extension that allows conditional compilation based on preprocessor definitions specified on the command line even when not preprocessing. Fixes: #19664
* | | | | Merge topic 'fix-copy-directory-docs'Brad King2019-09-041-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b96155f228 Help: Fix copy_directory description Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3769
| * | | | | Help: Fix copy_directory descriptionLeonid Pospelov2019-09-021-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2019-09-041-1/+1
| |/ / / / |/| | | |
* | | | | Merge topic 'lint-updates'Brad King2019-09-0312-16/+29
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | de0a2354fc IWYU: Add missing cstddef includes for size_t and nullptr_t 1aa0a18c41 cmCTestTestHandler: Re-order includes to follow our convention Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3774
| * | | | | IWYU: Add missing cstddef includes for size_t and nullptr_tBrad King2019-09-0312-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | The IWYU tool we use for CI now diagnoses these.
| * | | | | cmCTestTestHandler: Re-order includes to follow our conventionBrad King2019-09-031-16/+17
|/ / / / /
* | | | | 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
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |