summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake 3.20.0-rc3v3.20.0-rc3Brad King2021-03-031-1/+1
|
* Merge topic 'android-r22' into release-3.20Brad King2021-03-037-3/+69
|\ | | | | | | | | | | | | | | | | | | 005e2cdfb0 Android: Do not use gold for ndk >= r22 ed7a87f270 Tests: Update RunCMake.Android for NDK r22 4950d35733 Help: Document CMAKE_ANDROID_NDK_VERSION variable 746906242d Android: Detect NDK version number Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5862
| * Android: Do not use gold for ndk >= r22Haibo Huang2021-03-031-1/+1
| | | | | | | | Fixes: #21772
| * Tests: Update RunCMake.Android for NDK r22Brad King2021-03-031-2/+13
| | | | | | | | | | Use `CMAKE_ANDROID_NDK_VERSION` to check for files expected based on the version of the NDK.
| * Help: Document CMAKE_ANDROID_NDK_VERSION variableBrad King2021-03-034-0/+16
| |
| * Android: Detect NDK version numberHaibo Huang2021-03-031-0/+39
| | | | | | | | Report it in `CMAKE_ANDROID_NDK_VERSION`.
* | Merge topic 'ci-nightly-ide-jobs' into release-3.20Brad King2021-03-034-0/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | e5698605d7 gitlab-ci: ignore failing tests for external IDE testing beb130c65d gitlab-ci: allow some jobs to ignore failing tests on nightly runs 18d6737e96 gitlab-ci: always upload test and release artifacts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5871
| * | gitlab-ci: ignore failing tests for external IDE testingBen Boeckel2021-03-012-0/+3
| | |
| * | gitlab-ci: allow some jobs to ignore failing tests on nightly runsBen Boeckel2021-03-011-0/+2
| | |
| * | gitlab-ci: always upload test and release artifactsBen Boeckel2021-03-011-0/+4
| | |
* | | Merge topic 'compilerid_require_success' into release-3.20Brad King2021-03-031-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1bd8f19453 CMakeDetermineCompilerId: Fix REQUIRE_SUCCESS with multiple user flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5874
| * | | CMakeDetermineCompilerId: Fix REQUIRE_SUCCESS with multiple user flagsRaul Tambre2021-03-021-1/+1
|/ / / | | | | | | | | | Need to quote the list expansion otherwise we'll try each argument separately.
* | | Merge topic 'FindOpenGL-GLX-no-GLVND' into release-3.20Brad King2021-03-021-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fb4b2ed0d3 FindOpenGL: handle GLX without GLVND Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5861
| * | | FindOpenGL: handle GLX without GLVNDBen Boeckel2021-02-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | On Ubuntu, installing `libgl-dev` provides `libGL` and `libGLX`, but no `libOpenGL`. Avoid defining GLVND targets without the `OpenGL::OpenGL` target.
* | | | Merge topic 'more-import-export-guide-updates' into release-3.20Brad King2021-03-023-4/+4
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | 74c2ade187 Help/guide: fix the remaining CMake install destinations Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5870
| * | | Help/guide: fix the remaining CMake install destinationsBen Boeckel2021-03-013-4/+4
| |/ / | | | | | | | | | Followup from !5674.
* | | Merge topic 'compilerid_require_success' into release-3.20Brad King2021-03-011-16/+34
|\ \ \ | |/ / |/| | | | | | | | | | | | | | bdc40742bd CMakeDetermineCompilerId: Test without COMPILER_ID_FLAGS if REQUIRE_SUCCESS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5863
| * | CMakeDetermineCompilerId: Test without COMPILER_ID_FLAGS if REQUIRE_SUCCESSRaul Tambre2021-02-271-16/+34
|/ / | | | | | | | | | | | | If we REQUIRE_SUCCESS, i.e. TEST_FLAGS_FIRST must work, we need to also try without user flags. Fixes #21869.
* | Merge topic 'ci-xcode-12.4' into release-3.20Brad King2021-02-251-6/+6
|\ \ | |/ |/| | | | | | | | | 85ef0a84a0 gitlab-ci: update macOS jobs to use Xcode 12.4 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5858
| * gitlab-ci: update macOS jobs to use Xcode 12.4Brad King2021-02-251-6/+6
|/
* Merge topic 'nvhpc-minor-fixes' into release-3.20Brad King2021-02-252-0/+4
|\ | | | | | | | | | | | | | | 72efd95add PGI: Explicitly specify CMAKE_CXX98_STANDARD_COMPILE_OPTION 6bfb2c6175 HELP: Update compile-features documentation with missing compilers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5857
| * PGI: Explicitly specify CMAKE_CXX98_STANDARD_COMPILE_OPTIONRobert Maynard2021-02-241-0/+2
| | | | | | | | | | | | | | | | | | The PGI ( and NVIDIA HPC ) compilers default C++ standard level are based on the GCC system headers it is compiling against. Therefore on newer platforms the default C++ level will be >= 11 and requesting C++98 compilation mode will fail as no explicit flag will be set.
| * HELP: Update compile-features documentation with missing compilersRobert Maynard2021-02-241-0/+2
|/
* CMake 3.20.0-rc2v3.20.0-rc2Brad King2021-02-241-1/+1
|
* Merge branch 'release-3.19' into release-3.20Brad King2021-02-240-0/+0
|\
| * CMake 3.19.6v3.19.6Brad King2021-02-241-1/+1
| |
* | Merge topic 'better_cuda_compiler_detection_error_messages' into release-3.20Brad King2021-02-241-5/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | a0fc64ac24 CUDA: Improve error messages when CUDA compiler detection fails Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !5844
| * | CUDA: Improve error messages when CUDA compiler detection failsRobert Maynard2021-02-231-5/+5
| | |
* | | Merge topic 'preset-flag-consistency' into release-3.20Brad King2021-02-2414-15/+56
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6fa3647023 ctest: Add support for '--prefix=<prefix>' form of the argument 3357d37761 cmake: Add support for '--build --prefix=<prefix>' form of the argument 2f13fdef0a cmake: Document '--preset <preset>' form of the argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5849
| * | | ctest: Add support for '--prefix=<prefix>' form of the argumentBrad King2021-02-234-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The main `cmake --preset` argument for configure presets supports both forms, so support it for `ctest --preset` too. Fixes: #21855
| * | | cmake: Add support for '--build --prefix=<prefix>' form of the argumentBrad King2021-02-233-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The main `cmake --preset` argument for configure presets supports both forms, so support it for `cmake --build --preset` too. Issue: #21855
| * | | cmake: Document '--preset <preset>' form of the argumentBrad King2021-02-239-5/+22
| | | | | | | | | | | | | | | | | | | | | | | | This form already works. Document it and add tests. Issue: #21855
* | | | Merge topic 'LINK_LANGUAGE-genex-respects-LINKER_LANGUAGE-property' into ↵Brad King2021-02-245-6/+39
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | release-3.20 b722eea925 Genex: LINK_LANGUAGE respects LINKER_LANGUAGE property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5841
| * | | | Genex: LINK_LANGUAGE respects LINKER_LANGUAGE propertyMarc Chevrier2021-02-235-6/+39
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | If target property LINKER_LANGUAGE is set, LINK_LANGUAGE generator expression evaluation must be always successful. This fix can be helpful to elaborate a solution for issue #21818.
* | | | Merge topic 'autogen-cmp0116-fix' into release-3.20Brad King2021-02-2425-148/+237
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 339dbc901f Help: Note that CMP0116 is recorded at the time of CC creation e3740e020e Tests: Test Qt autogen target with CMP0116 set to WARN cf34011ce7 Tests: Test per-CC behavior of CMP0116 3a95503512 Ninja: Use CMP0116 status recorded at time of custom command's creation f01f10e8fb cmCustomCommand: Record value of CMP0116 at time of creation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5848
| * | | | Help: Note that CMP0116 is recorded at the time of CC creationKyle Edwards2021-02-231-1/+4
| | | | |
| * | | | Tests: Test Qt autogen target with CMP0116 set to WARNKyle Edwards2021-02-232-0/+3
| | | | |
| * | | | Tests: Test per-CC behavior of CMP0116Kyle Edwards2021-02-233-0/+38
| | | | |
| * | | | Ninja: Use CMP0116 status recorded at time of custom command's creationKyle Edwards2021-02-231-2/+2
| | | | |
| * | | | cmCustomCommand: Record value of CMP0116 at time of creationKyle Edwards2021-02-2318-145/+190
| | | | |
* | | | | Merge branch 'release-3.19' into release-3.20Brad King2021-02-240-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'backport-3.19-preset-no-comments' into release-3.19Brad King2021-02-248-7/+25
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !5853
| * \ \ \ \ Merge branch 'ninja-status-stderr' into release-3.19Brad King2021-02-233-0/+12
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !5850
* | \ \ \ \ \ Merge topic 'preset-no-comments' into release-3.20Brad King2021-02-2410-20/+26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 06e16ea008 Merge branch 'backport-3.19-preset-no-comments' into preset-no-comments afaa69f5b3 Tests: Remove comments from CMakePresetsTest/Good.json.in 4a92277f45 Revert "Help: Document JSON comment support in cmake-presets(7)" 431dd59b5e CMakePresets.json: Remove undocumented support for comments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5853
| * \ \ \ \ \ \ Merge branch 'backport-3.19-preset-no-comments' into preset-no-commentsBrad King2021-02-248-7/+25
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | CMakePresets.json: Remove undocumented support for commentsKyle Edwards2021-02-248-7/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21858
| * | | | | | | Tests: Remove comments from CMakePresetsTest/Good.json.inKyle Edwards2021-02-241-9/+0
| | | | | | | |
| * | | | | | | Revert "Help: Document JSON comment support in cmake-presets(7)"Kyle Edwards2021-02-241-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit 8f1e607ed9 (Help: Document JSON comment support in cmake-presets(7), 2021-02-18). The support for comments was a mistake when the feature was implemented in 3.19, and is being removed.
* | | | | | | | Merge topic 'ninja-status-stderr' into release-3.20Brad King2021-02-243-0/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | d33c2c93d8 Tests: Update for upstream ninja change to write status on stderr Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5850
| * | | | | | Tests: Update for upstream ninja change to write status on stderrBrad King2021-02-233-0/+12
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upstream ninja commit `ad3d29fb53` (Put builder output through status interface) from ninja PR 1899 changed the status output from stdout to stderr. In particular, `ninja: no work to do` is now printed on stderr. Update our RunCMake tests to accept this difference. A few RunCMake test cases check for `ninja: no work to do`. For those, move the message to stdout using `RunCMake_TEST_OUTPUT_MERGE`. The rest of the test cases do not care about the message, so remove it from the actual stderr content before comparing against that expected.
generated by cgit v0.12 at 2025-01-12 11:37:10 (GMT)