summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'unk_imported_location'Brad King2020-08-2526-12/+143
|\ | | | | | | | | | | | | 359c500a24 cmTarget: Raise error if imported target location is not set Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5113
| * cmTarget: Raise error if imported target location is not setRaul Tambre2020-08-2126-12/+143
| | | | | | | | | | | | | | | | Previously we would synthesize <TARGET_NAME>-NOTFOUND as the location. This would then end up on the link line and cause build failures. Policy CMP0110 is added to control this behaviour. Fixes #19080, #19943.
* | Merge topic 'update-curl'Brad King2020-08-2556-419/+945
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 387ea71853 curl: Set build options the way we need for CMake 7d0fa4a943 Merge branch 'upstream-curl' into update-curl 7ceb56989f curl 2020-08-19 (9d954e49) c156948327 curl: Update script to get curl 7.72.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5143
| * | curl: Set build options the way we need for CMakeBrad King2020-08-191-1/+4
| | |
| * | Merge branch 'upstream-curl' into update-curlBrad King2020-08-1955-417/+940
| |\ \ | | | | | | | | | | | | | | | | * upstream-curl: curl 2020-08-19 (9d954e49)
| | * | curl 2020-08-19 (9d954e49)Curl Upstream2020-08-1955-416/+940
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit 9d954e49bce3706a9a2efb119ecd05767f0f2a9e (curl-7_72_0).
| * | | curl: Update script to get curl 7.72.0Brad King2020-08-191-1/+1
| | | |
* | | | Merge branch 'release-3.18'Brad King2020-08-250-0/+0
|\ \ \ \
| * \ \ \ Merge topic 'msvc_static_assert' into release-3.18Brad King2020-08-253-6/+15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95bc11dbb4 MSVC: Record support for c_static_assert Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5148
* | \ \ \ \ Merge topic 'msvc_static_assert'Brad King2020-08-253-6/+15
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 95bc11dbb4 MSVC: Record support for c_static_assert Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5148
| * | | | | MSVC: Record support for c_static_assertRaul Tambre2020-08-203-6/+15
| |/ / / / | | | | | | | | | | | | | | | Supported since MSVC 19.28.29115 (VS 16.8.0 Preview 1.0).
* | | | | CMake Nightly Date StampKitware Robot2020-08-251-1/+1
| | | | |
* | | | | Merge topic 'fetchcontent-source-dir'Craig Scott2020-08-244-13/+86
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b972e25276 FetchContent: Fix SOURCE_DIR, BUILD_DIR when disconnected or overridden Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5156
| * | | | | FetchContent: Fix SOURCE_DIR, BUILD_DIR when disconnected or overriddenCraig Scott2020-08-234-13/+86
| | | | | | | | | | | | | | | | | | Fixes: #21123
* | | | | | Merge topic 'known_features_docs'Craig Scott2020-08-241-55/+87
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 268fcc2782 Help: Separate C++ compile feature by standard Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5151
| * | | | | | Help: Separate C++ compile feature by standardFrancisco Pombal2020-08-231-55/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additionally, mention that no fine-grained features are available for C++ 17 and beyond. Co-Authored-By: Craig Scott <craig.scott@crascit.com>
* | | | | | | CMake Nightly Date StampKitware Robot2020-08-241-1/+1
| |/ / / / / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2020-08-231-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2020-08-221-1/+1
| | | | | |
* | | | | | Merge topic 'clang-cl-restore-preprocess'Brad King2020-08-211-2/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b083d59c2 clang-cl: Restore rules to create preprocessed and assembly output Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5142
| * | | | | clang-cl: Restore rules to create preprocessed and assembly outputBrad King2020-08-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit d993ebd4ca (clang-cl: Add '--' before source file, 2020-07-28) we accidentally replaced these rules with those to compile an object file.
* | | | | | CMake Nightly Date StampKitware Robot2020-08-211-1/+1
| | | | | |
* | | | | | Merge branch 'release-3.18'Brad King2020-08-200-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | CMake 3.18.2v3.18.2Brad King2020-08-201-1/+1
| | | | | |
* | | | | | Merge topic 'fix-file-generate-cmp0070'Brad King2020-08-2012-17/+131
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | file(GENERATE): Test source propertiesJosef Angstenberger2020-08-199-0/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | file(GENERATE): Update existing testsJosef Angstenberger2020-08-191-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the additional CMP0070 warning as expected stderr. The warning occurs twice because the output file name is evaluated multiple times.
| * | | | | file(GENERATE): Fix missing check for policy CMP0070Josef Angstenberger2020-08-191-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | file(GENERATE): Refactor outputFileName calculationJosef Angstenberger2020-08-192-8/+19
| | | | | |
| * | | | | file(GENERATE): Refactor inputFileName calculationJosef Angstenberger2020-08-192-6/+16
| | | | | |
* | | | | | Merge topic 'doc-git-describe'Brad King2020-08-201-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e05b200be2 Help/dev: Update CMake Review Process document to suggest 'git describe' Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5149
| * | | | | | Help/dev: Update CMake Review Process document to suggest 'git describe'Brad King2020-08-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using `git describe --contains` is the preferred way to reference a commit relative to a tag.
* | | | | | | Merge branch 'release-3.18'Brad King2020-08-200-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge topic 'FindMPI-cuda-pthread' into release-3.18Brad King2020-08-201-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 47abe5f225 FindMPI: Fix regression in pthread guard Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Raul Tambre <raul@tambre.ee> Merge-request: !5147
* | \ \ \ \ \ \ Merge topic 'FindMPI-cuda-pthread'Brad King2020-08-201-1/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 47abe5f225 FindMPI: Fix regression in pthread guard Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Raul Tambre <raul@tambre.ee> Merge-request: !5147
| * | | | | | | FindMPI: Fix regression in pthread guardAxel Huebl2020-08-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Merge branch 'release-3.18'Brad King2020-08-200-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'gitlab-ci-msvc-14.27' into release-3.18Brad King2020-08-201-4/+4
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 983cb0c891 gitlab-ci: Update Windows builds to MSVC 19.27 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5144
* | \ \ \ \ \ \ \ Merge topic 'gitlab-ci-msvc-14.27'Brad King2020-08-201-4/+4
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 983cb0c891 gitlab-ci: Update Windows builds to MSVC 19.27 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5144
| * | | | | | | | gitlab-ci: Update Windows builds to MSVC 19.27Brad King2020-08-191-4/+4
| | | | | | | | |
* | | | | | | | | Merge branch 'release-3.18'Brad King2020-08-200-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'msvc_c11' into release-3.18Brad King2020-08-201-0/+9
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f4373feda8 Tests: Fix RunCMake.try_compile test for C standards with MSVC 19.27 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5145
* | | | | | | | | Merge topic 'msvc_c11'Brad King2020-08-201-0/+9
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | / / / / / | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | f4373feda8 Tests: Fix RunCMake.try_compile test for C standards with MSVC 19.27 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5145
| * | | | | | | Tests: Fix RunCMake.try_compile test for C standards with MSVC 19.27Brad King2020-08-191-0/+9
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | CMake Nightly Date StampKitware Robot2020-08-201-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | Merge topic 'CMakeDetermineCXXCompiler-clang-typo'Brad King2020-08-191-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 10d7445dd8 clang: Fix the typo for CMAKE_CXX_COMPILER_ID_TEST_FLAGS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5140
| * | | | | | clang: Fix the typo for CMAKE_CXX_COMPILER_ID_TEST_FLAGSThomas Bernard2020-08-181-1/+1
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo from commit 270e0d9c4d (Detect the correct target architecture for clang compilers., 2020-07-28). Issue: #21097
* | | | | | Merge topic 'ccmake-no-form-warnings'Brad King2020-08-191-0/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 16accdc76e ccmake: suppress warnings in third-party form code Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5141
| * | | | | | ccmake: suppress warnings in third-party form codeBrad King2020-08-181-0/+8
| |/ / / / /
* | | | | | Merge topic 'cpack-wix-custom-xmlns'Brad King2020-08-196-3/+66
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 267de3ba30 CPack/WiX: Add support for custom XML namespaces Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5132