mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-09 01:09:30 -05:00
Code Issues Packages Projects Releases Wiki Activity
49,564 Commits 2 Branches 392 Tags
269d1a86249ea037a2884133daffc8c44a38d926
Commit Graph

49564 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kitware Robot
269d1a8624 CMake Nightly Date Stamp 2020-08-23 00:01:09 -04:00
Kitware Robot
08170b1b57 CMake Nightly Date Stamp 2020-08-22 00:01:14 -04:00
Brad King
6cbaa8eb93 Merge topic 'clang-cl-restore-preprocess' 
7b083d59c2 clang-cl: Restore rules to create preprocessed and assembly output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5142
 2020-08-21 09:31:08 -04:00
Kitware Robot
692bc2de94 CMake Nightly Date Stamp 2020-08-21 00:01:09 -04:00
Brad King
8de3a25ec3 Merge branch 'release-3.18' 2020-08-20 09:21:33 -04:00
Brad King
aaa5eab410 CMake 3.18.2 v3.18.2 2020-08-20 08:20:32 -04:00
Brad King
2a8f363a54 Merge topic 'fix-file-generate-cmp0070' 
462b6d83e8 file(GENERATE): Test source properties
1977f7833b file(GENERATE): Update existing tests
04fbd7566a file(GENERATE): Fix missing check for policy CMP0070
2dc2732f67 file(GENERATE): Refactor outputFileName calculation
a9602bb41e file(GENERATE): Refactor inputFileName calculation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5090
 2020-08-20 07:59:23 -04:00
Brad King
692d259f9e Merge topic 'doc-git-describe' 
e05b200be2 Help/dev: Update CMake Review Process document to suggest 'git describe'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5149
 2020-08-20 07:57:19 -04:00
Brad King
4fc1dd2ff1 Merge topic 'FindMPI-cuda-pthread' into release-3.18 
47abe5f225 FindMPI: Fix regression in pthread guard

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Raul Tambre <raul@tambre.ee>
Merge-request: !5147
 2020-08-20 07:55:23 -04:00
Brad King
579ada3043 Merge branch 'release-3.18' 2020-08-20 07:55:23 -04:00
Brad King
e029cb1ca6 Merge topic 'FindMPI-cuda-pthread' 
47abe5f225 FindMPI: Fix regression in pthread guard

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Raul Tambre <raul@tambre.ee>
Merge-request: !5147
 2020-08-20 07:55:23 -04:00
Brad King
590b8791a0 Merge topic 'gitlab-ci-msvc-14.27' into release-3.18 
983cb0c891 gitlab-ci: Update Windows builds to MSVC 19.27

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5144
 2020-08-20 07:53:12 -04:00
Brad King
84148558fd Merge branch 'release-3.18' 2020-08-20 07:53:12 -04:00
Brad King
453596374e Merge topic 'gitlab-ci-msvc-14.27' 
983cb0c891 gitlab-ci: Update Windows builds to MSVC 19.27

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5144
 2020-08-20 07:53:12 -04:00
Brad King
4abd3a6519 Merge branch 'release-3.18' 2020-08-20 07:49:28 -04:00
Brad King
eeaa890147 Merge topic 'msvc_c11' into release-3.18 
f4373feda8 Tests: Fix RunCMake.try_compile test for C standards with MSVC 19.27

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5145
 2020-08-20 07:49:27 -04:00
Brad King
d13b010321 Merge topic 'msvc_c11' 
f4373feda8 Tests: Fix RunCMake.try_compile test for C standards with MSVC 19.27

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5145
 2020-08-20 07:49:27 -04:00
Brad King
e05b200be2 Help/dev: Update CMake Review Process document to suggest 'git describe' 
Using `git describe --contains` is the preferred way to reference a
commit relative to a tag.
 2020-08-20 07:29:06 -04:00
Axel Huebl
47abe5f225 FindMPI: Fix regression in pthread guard 
Fix a regression with MPI and CUDA<10.2 that did let `-pthread` flags
slip to nvcc again.  In commit b725a19072 (FindMPI: Deny -fexceptions
from NVCC, 2020-07-02, v3.18.0-rc4~12^2) we accidentally forgot to use
the variable containing the replacement result.

Fixes: #21108
 2020-08-20 06:52:45 -04:00
Kitware Robot
b544a1ebec CMake Nightly Date Stamp 2020-08-20 00:01:12 -04:00
Brad King
983cb0c891 gitlab-ci: Update Windows builds to MSVC 19.27 2020-08-19 14:53:46 -04:00
Brad King
f4373feda8 Tests: Fix RunCMake.try_compile test for C standards with MSVC 19.27 
Since commit f7347f28c7 (MSVC: Record support for C11 and c_restrict,
2020-08-09) we know about MSVC C language standards.  Update the
`RunCMake.try_compile` test to be aware of this even when CMake is
itself configured by an older CMake that does not know this.
 2020-08-19 14:52:52 -04:00
Brad King
162583bb19 Merge topic 'CMakeDetermineCXXCompiler-clang-typo' 
10d7445dd8 clang: Fix the typo for CMAKE_CXX_COMPILER_ID_TEST_FLAGS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5140
 2020-08-19 11:51:03 -04:00
Brad King
80b9c4411b Merge topic 'ccmake-no-form-warnings' 
16accdc76e ccmake: suppress warnings in third-party form code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5141
 2020-08-19 11:49:18 -04:00
Brad King
cb5c8e6f25 Merge topic 'cpack-wix-custom-xmlns' 
267de3ba30 CPack/WiX: Add support for custom XML namespaces

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5132
 2020-08-19 11:48:24 -04:00
Brad King
fed08ce4cf Merge topic 'ExternalProject-retry-only-recoverable' 
116b06870d ExternalProject: add INACTIVITY_TIMEOUT argument
f24e34975a ExternalProject: retry download on recoverable errors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5034
 2020-08-19 11:47:34 -04:00
Brad King
f1ec88708d Merge topic 'CMakeDependentOption-doc' 
91f791b498 CMakeDependentOption: Expand documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5138
 2020-08-19 11:46:29 -04:00
Brad King
5d77051a43 Merge topic 'buildsystem_documentation_update' 
cfcb71c530 Help: Update cmake-buildsystem documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5123
 2020-08-19 11:45:38 -04:00
Brad King
28ae9d8d59 Merge branch 'release-3.18' 2020-08-19 11:40:03 -04:00
Brad King
db160604f7 Merge topic 'ep-patch-skip-update-dep' 
715324742f ExternalProject: Stop configure target from always appearing out-of-date
c0b7198ad9 ExternalProject: Stop patch target from always appearing out-of-date

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5136
 2020-08-19 11:40:03 -04:00
Brad King
281a87f834 Merge topic 'ep-patch-skip-update-dep' into release-3.18 
715324742f ExternalProject: Stop configure target from always appearing out-of-date
c0b7198ad9 ExternalProject: Stop patch target from always appearing out-of-date

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5136
 2020-08-19 11:40:02 -04:00
Brad King
296e2aa818 Merge branch 'release-3.18' 2020-08-19 11:37:55 -04:00
Brad King
833e84ca1c Merge topic 'llvm-rc-quote-cmake' into release-3.18 
3937536d16 llvm-rc: Fix quoting of path to cmake in CMAKE_RC_COMPILE_OBJECT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5139
 2020-08-19 11:37:54 -04:00
Brad King
b5198dacdd Merge topic 'llvm-rc-quote-cmake' 
447dfddb20 Merge branch 'backport-3.18-llvm-rc-quote-cmake' into llvm-rc-quote-cmake
3937536d16 llvm-rc: Fix quoting of path to cmake in CMAKE_RC_COMPILE_OBJECT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5139
 2020-08-19 11:37:54 -04:00
Brad King
e9d0059bb3 Merge topic 'FindPython-enhance-version-extraction-from-lib-name' into release-3.18 
72822e26c9 FindPython: enhance robustness of version extraction from library name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5135
 2020-08-19 11:36:51 -04:00
Brad King
b55965e137 Merge branch 'release-3.18' 2020-08-19 11:36:51 -04:00
Brad King
705a60902d Merge topic 'FindPython-enhance-version-extraction-from-lib-name' 
72822e26c9 FindPython: enhance robustness of version extraction from library name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5135
 2020-08-19 11:36:51 -04:00
Brad King
612a5437e0 Merge branch 'release-3.18' 2020-08-19 11:35:25 -04:00
Brad King
09e8de75d5 Merge topic 'CMakeFindBinUtils-fallback' into release-3.18 
6896e50967 CMakeFindBinUtils: Always consider plain binutils when not cross-compiling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5137
 2020-08-19 11:35:00 -04:00
Brad King
e3f9056aad Merge topic 'CMakeFindBinUtils-fallback' 
6896e50967 CMakeFindBinUtils: Always consider plain binutils when not cross-compiling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5137
 2020-08-19 11:32:51 -04:00
Brad King
7b083d59c2 clang-cl: Restore rules to create preprocessed and assembly output 
In commit d993ebd4ca (clang-cl: Add '--' before source file, 2020-07-28)
we accidentally replaced these rules with those to compile an object
file.
 2020-08-19 10:53:48 -04:00
Josef Angstenberger
462b6d83e8 file(GENERATE): Test source properties 
Output files get the source property `GENERATED` which is indirectly
checked by adding them to a library.
For a missing file that is not generated CMake will abort.

With the new behavior according CMP0070 relative files are generated
into the binary directory.
 2020-08-19 09:05:53 -04:00
Josef Angstenberger
1977f7833b file(GENERATE): Update existing tests 
Add the additional CMP0070 warning as expected stderr.

The warning occurs twice because the output file name is evaluated
multiple times.
 2020-08-19 09:05:53 -04:00
Josef Angstenberger
04fbd7566a file(GENERATE): Fix missing check for policy CMP0070 
In commit 82be694c7a (file(GENERATE): Add policy CMP0070 to define
relative path behavior, 2017-06-08, v3.10.0-rc1~534^2), one path
calculation was forgotten.  Because of this the path name according to
the old behavior was added to the list of CMake generated files.

Fixes: #21038
 2020-08-19 09:05:43 -04:00
Josef Angstenberger
2dc2732f67 file(GENERATE): Refactor outputFileName calculation 2020-08-19 09:03:36 -04:00
Josef Angstenberger
a9602bb41e file(GENERATE): Refactor inputFileName calculation 2020-08-19 09:03:36 -04:00
Kitware Robot
92d7249031 CMake Nightly Date Stamp 2020-08-19 00:01:29 -04:00
Thomas Bernard
10d7445dd8 clang: Fix the typo for CMAKE_CXX_COMPILER_ID_TEST_FLAGS 
Fix typo from commit 270e0d9c4d (Detect the correct target architecture
for clang compilers., 2020-07-28).

Issue: #21097
 2020-08-18 17:23:54 -04:00
Brad King
447dfddb20 Merge branch 'backport-3.18-llvm-rc-quote-cmake' into llvm-rc-quote-cmake 2020-08-18 17:18:38 -04:00
Thomas Bernard
3937536d16 llvm-rc: Fix quoting of path to cmake in CMAKE_RC_COMPILE_OBJECT 
When the installation path to cmake includes spaces, the
`<CMAKE_COMMAND>` is required to have proper quotation of the cmake
call.

Fixes: #21095
 2020-08-18 17:15:34 -04:00