mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-13 12:59:55 -05:00
Code Issues Packages Projects Releases Wiki Activity
50,994 Commits 2 Branches 393 Tags
f395caf49845dc233c31dd92eaaacaa4f16a1241
Commit Graph

50994 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Chevrier
f395caf498 Makefiles dependencies: enhance robustness of deps parser 2020-12-03 15:06:33 +01:00
Brad King
8bdde2b161 Merge topic 'nvidia-cuda-ninja-deps' 
8981e3e7cc NVIDIA-CUDA: rely on new capabilities for deps generation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5566
 2020-12-03 08:57:16 -05:00
Brad King
0eead931a3 Merge topic 'versionadded' 
5000f93a91 Help: Fix grammar in `.. versionadded` directives
8fea95319b Help: Add `.. versionadded` directives to module docs
8634561dca Help: Improve formatting for FindBoost and FindCUDA
ea59b0cd34 Help: Fix version note for CMAKE_PROJECT_<PROJECT-NAME>_INCLUDE
05c3060b10 Help: Fix cmake_parse_arguments version note
dafcef8b50 Help: Improve styling for versionadded/deprecated directives
6ae216daef Tests: Make RunCMake.CMP0106 expected output robust to line number changes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5560
 2020-12-03 08:49:25 -05:00
Brad King
d4992ca605 Merge branch 'release-3.19' 2020-12-03 08:37:21 -05:00
Brad King
a64f5aeea5 Merge topic 'llvm-rc-preprocess-as-c' 
bdfa5ac7f6 Merge branch 'master' into llvm-rc-preprocess-as-c
f7ff0d34f0 llvm-rc: Force C language for the clang gnu frontend

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5564
 2020-12-03 08:37:21 -05:00
Brad King
6cf88734a5 Merge topic 'llvm-rc-preprocess-as-c' into release-3.19 
f7ff0d34f0 llvm-rc: Force C language for the clang gnu frontend

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5564
 2020-12-03 08:37:21 -05:00
Kitware Robot
3815070fc7 CMake Nightly Date Stamp 2020-12-03 00:01:16 -05:00
Marc Chevrier
8981e3e7cc NVIDIA-CUDA: rely on new capabilities for deps generation 2020-12-02 17:31:02 +01:00
Nikita Nemkin
5000f93a91 Help: Fix grammar in .. versionadded directives 
Issue: #19715
 2020-12-02 21:00:31 +05:00
Nikita Nemkin
8fea95319b Help: Add .. versionadded directives to module docs 
Issue: #19715
 2020-12-02 21:00:30 +05:00
Nikita Nemkin
8634561dca Help: Improve formatting for FindBoost and FindCUDA 
* Split large literal blocks into definitions lists.
* Add section headers.
* Add links to standard commands and variables.
* Use inline literals liberally.
* Enable code highlighting in literal blocks.
* Format command signatures according to modern conventions.
 2020-12-02 21:00:29 +05:00
Nikita Nemkin
ea59b0cd34 Help: Fix version note for CMAKE_PROJECT_<PROJECT-NAME>_INCLUDE 
This variable predates 3.0.

Fixes: #21522
 2020-12-02 21:00:29 +05:00
Nikita Nemkin
05c3060b10 Help: Fix cmake_parse_arguments version note 
Don't imply that cmake_parse_arguments() requires CMake 3.5+.
 2020-12-02 21:00:28 +05:00
Nikita Nemkin
dafcef8b50 Help: Improve styling for versionadded/deprecated directives 
Sphinx theme CSS removes top margin for dd > p combination,
but directives add an intervening div and need a separate rule.

Issue: #19715
 2020-12-02 21:00:28 +05:00
Brad King
6ae216daef Tests: Make RunCMake.CMP0106 expected output robust to line number changes 2020-12-02 21:00:27 +05:00
Brad King
a0f2e8cbfa Merge topic 'cpackifw-package-wizard-show-page-list' 
8b5a0e0fef CPackIFW: Add CPACK_IFW_PACKAGE_WIZARD_SHOW_PAGE_LIST variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5545
 2020-12-02 09:30:07 -05:00
Brad King
9e76ad9ccd Merge topic 'ninja-deps-updates' 
f8d8faff8d Ninja Generators: Homogenize configuration with Makefiles

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5557
 2020-12-02 09:29:16 -05:00
Brad King
2b0152ce09 Merge topic 'issue-20955' 
5a6c199069 ctest: Provide hints about inspecting test failures

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5552
 2020-12-02 09:27:38 -05:00
Brad King
dee36398d2 Merge topic 'error_out_on_unknown_argument' 
1b6c5333a0 cmake: Error out on unknown arguments starting with `-`.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5553
 2020-12-02 09:25:26 -05:00
Brad King
79077df26b Merge topic 'FindHDF5-hdf5hl_fortran-variable' into release-3.19 
175beadd4c FindHDF5: support the hdf5hl_fortran-based variable names
adf108441e FindHDF5: improve error messages when a location variable isn't known

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5563
 2020-12-02 09:22:52 -05:00
Brad King
c30b65305e Merge branch 'release-3.19' 2020-12-02 09:22:52 -05:00
Brad King
3613b90726 Merge topic 'FindHDF5-hdf5hl_fortran-variable' 
175beadd4c FindHDF5: support the hdf5hl_fortran-based variable names
adf108441e FindHDF5: improve error messages when a location variable isn't known

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5563
 2020-12-02 09:22:52 -05:00
Brad King
859ecbe446 Merge topic 'ti-c-only-standard' into release-3.19 
8eeddb1f0a Compiler/TI: Fix C standard flags in C-only project

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5558
 2020-12-02 09:21:30 -05:00
Brad King
af0e0fa9e2 Merge branch 'release-3.19' 2020-12-02 09:21:30 -05:00
Brad King
ed958ba685 Merge topic 'ti-c-only-standard' 
8eeddb1f0a Compiler/TI: Fix C standard flags in C-only project

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5558
 2020-12-02 09:21:30 -05:00
Brad King
c14d1f1be5 Merge topic 'cray-compiler-detection' into release-3.19 
9ee4a42813 Cray: Fix Cray compiler detection on new platforms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5561
 2020-12-02 09:20:07 -05:00
Brad King
d099acf5bd Merge branch 'release-3.19' 2020-12-02 09:20:07 -05:00
Brad King
5f96bc9aff Merge topic 'cray-compiler-detection' 
9ee4a42813 Cray: Fix Cray compiler detection on new platforms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5561
 2020-12-02 09:20:07 -05:00
Brad King
dd1f26e22e Merge topic 'export-namelink' into release-3.19 
38bcb5c0a3 export: Do not fail generation for separate namelink only case

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5556
 2020-12-02 09:17:50 -05:00
Brad King
ab2fd7a117 Merge branch 'release-3.19' 2020-12-02 09:17:50 -05:00
Brad King
130132ffb3 Merge topic 'export-namelink' 
38bcb5c0a3 export: Do not fail generation for separate namelink only case

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5556
 2020-12-02 09:17:50 -05:00
Brad King
bdfa5ac7f6 Merge branch 'master' into llvm-rc-preprocess-as-c 2020-12-02 08:21:12 -05:00
Thomas Bernard
f7ff0d34f0 llvm-rc: Force C language for the clang gnu frontend 
When preprocessing the rc file using the clang gnu front end we need to
force the source file type to a c file for the preprocessing to take
place.

Fixes: #21472
 2020-12-02 08:19:44 -05:00
Kitware Robot
ee431954a1 CMake Nightly Date Stamp 2020-12-02 00:01:10 -05:00
Ben Boeckel
175beadd4c FindHDF5: support the hdf5hl_fortran-based variable names 
Fixes: #21537
 2020-12-01 15:31:47 -05:00
Ben Boeckel
adf108441e FindHDF5: improve error messages when a location variable isn't known 2020-12-01 15:31:21 -05:00
Justin LaPolla
9ee4a42813 Cray: Fix Cray compiler detection on new platforms 
Customer reported problems detecting the Cray compiler on their Apollo80
system. We were checking for the __CRAYXC and __CRAYXE predefined
macros. These macros reflect the platform that the compiler is running
on, i.e. Cray XC and Cray XE machines. Naturally, this didn't work on
Apollo80.

This commit uses the official Cray compiler identification macros which
are defined on every platform:

    CCE Version     C Macro     C++ Macro    Fortran Macro
    ============    ========    =========    =============
    version <  9    _CRAYC      _CRAYC       _CRAYFTN
    version >= 9    __cray__    __cray__     _CRAYFTN
 2020-12-01 12:20:47 -05:00
Adam Weisi
8eeddb1f0a Compiler/TI: Fix C standard flags in C-only project 
Use our compiler architecture variable for C rather than CXX.
 2020-12-01 12:14:38 -05:00
Marc Chevrier
f8d8faff8d Ninja Generators: Homogenize configuration with Makefiles 
* Use same configuration variables to configure dependencies
* Abstract Ninja deps format from compiler one
 2020-12-01 15:50:01 +01:00
Brad King
628d7ef672 Merge topic 'cuda_env_archs' 
c57541d874 CUDA: Fix tests with CUDAARCHS set
c4ae9384ff CUDA: Initialize CMAKE_CUDA_ARCHITECTURES using $ENV{CUDAARCHS}

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5533
 2020-12-01 09:37:07 -05:00
Brad King
e557ff81ee Merge topic 'cmprop-improve' 
4d9b1b42bc cmCTestBuildCommand: code improvement

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5548
 2020-12-01 09:35:13 -05:00
Brad King
29d27f67fd Merge topic 'Help-FindPython-add-version-information' 
ee6f37d606 Help: FindPython: add version information

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5554
 2020-12-01 09:34:34 -05:00
Brad King
f07b9d9e51 Merge topic 'xcode-check-object-lib-subprojects-fixed' 
31d3e64080 Tests: Add Xcode cases fixed by switch to the "new build system"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5549
 2020-12-01 09:33:36 -05:00
Brad King
cbe2c0119d Merge branch 'release-3.19' 2020-12-01 09:32:08 -05:00
Brad King
644f190abb Merge topic 'windows-clang-LINKER-prefix' 
9ac9876757 Clang on Windows: 'LINKER:' prefix must be honored

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5551
 2020-12-01 09:32:08 -05:00
Brad King
f264f1d783 Merge topic 'windows-clang-LINKER-prefix' into release-3.19 
9ac9876757 Clang on Windows: 'LINKER:' prefix must be honored

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5551
 2020-12-01 09:32:07 -05:00
Brad King
ee4310c3d9 Merge topic 'compile_def_doc' 
4b9fcadc9a Help: Describe definition values in target_compile_definitions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5547
 2020-12-01 09:30:50 -05:00
Brad King
97adf4ce1a Merge branch 'release-3.19' 2020-12-01 09:29:12 -05:00
Brad King
5d49943504 Merge topic 'ninja-regen-metadata' 
73d1c78bf4 ci: update to use ninja 1.10.2
11f4259362 Ninja: Clean metadata after regen during build on Windows with 1.10.2+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5555
 2020-12-01 09:29:12 -05:00
Brad King
b76013b515 Merge topic 'ninja-regen-metadata' into release-3.19 
73d1c78bf4 ci: update to use ninja 1.10.2
11f4259362 Ninja: Clean metadata after regen during build on Windows with 1.10.2+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5555
 2020-12-01 09:29:11 -05:00