summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ep-fc-revert-refactoring' into release-3.20Brad King2021-03-1035-1911/+1112
|\ | | | | | | | | | | | | 57d442e182 Revert ExternalProject and FetchContent refactoring Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5898
| * Revert ExternalProject and FetchContent refactoringCraig Scott2021-03-0935-1911/+1112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring of the ExternalProject and FetchContent modules moved the commands into CMake scripts. This broke custom commands that used shell redirection or special build tool variables of the form $(MakeVar). Undo the sequence of commits that performed this refactoring and follow-up fixes associated with it. The following commits are reverted by this change: 4f3d1abbb4 (ExternalProject: Refactor pre-configure steps to support no-target uses, 2021-02-05) 17e5516e60 (FetchContent: Invoke steps directly and avoid a separate sub-build, 2021-01-29) bd876f3849 (FetchContent: Restore patch command support, 2021-02-18) 404cddb7bb (ExternalProject: Fix misuse of IS_NEWER_THAN in timestamp checks, 2021-02-21) b0da671243 (FetchContent: Don't update timestamps if files don't change, 2021-02-18) Fixes: #21892
* | Merge topic 'FindMatlab-MCR-vars' into release-3.20Brad King2021-03-101-2/+9
|\ \ | |/ |/| | | | | | | | | 5ba1f4b6ee FindMatlab: Fix Matlab_LIBRARIES for MCR Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5896
| * FindMatlab: Fix Matlab_LIBRARIES for MCRSilvio Traversaro2021-03-091-2/+9
|/ | | | | | | In commit bda5e2ac8f (FindMatlab: Only include engine and dataarray libraries if they are found, 2020-12-11, v3.20.0-rc1~297^2~1) we fixed the imported target to contain optional libraries only if they are found. Do the same for `Matlab_LIBRARIES`.
* Merge branch 'release-3.19' into release-3.20Brad King2021-03-090-0/+0
|\
| * Merge branch 'CrayPrgEnv-detection' into release-3.19Brad King2021-03-083-5/+5
| |\ | | | | | | | | | Merge-request: !5889
* | \ Merge topic 'CrayPrgEnv-detection' into release-3.20Brad King2021-03-093-5/+5
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 23b101de60 Revert "Cray: Fix Cray compiler detection on new platforms" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5889
| * | Revert "Cray: Fix Cray compiler detection on new platforms"Brad King2021-03-083-5/+5
| |/ | | | | | | | | | | | | | | | | | | The justification in commit 9ee4a42813 (Cray: Fix Cray compiler detection on new platforms, 2020-12-01, v3.19.2~26^2) confuses detection of the CrayPrgEnv with identification of the Cray compiler. The change regressed detection of the CrayPrgEnv on non-Cray compilers. Revert it pending further investigation into the original problem. Fixes: #21894
* | Merge topic 'cray-fortran' into release-3.20Brad King2021-03-081-0/+4
|\ \ | | | | | | | | | | | | | | | | | | ef513fe3d1 Cray: Enable explicit Fortran preprocessing for Ninja generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5882
| * | Cray: Enable explicit Fortran preprocessing for Ninja generatorBrad King2021-03-051-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Cray 11.0 adds support for preprocessing with output written to a specified file (instead of always next to the source). Use it to enable Cray Fortran with the Ninja generator. Patch-by: James Elliott Fixes: #20731
* | | Merge topic 'cmake-gui-search-case' into release-3.20Brad King2021-03-052-4/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 9ec50ff157 cmake-gui: Restore search bar case insensitivity Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5878
| * | cmake-gui: Restore search bar case insensitivityBrad King2021-03-042-4/+4
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since these changes: * commit f1de6f6682 (cmake-gui: Support building against Qt6, 2020-12-17, v3.20.0-rc1~205^2~7) * commit 134d69121e (cmake-gui: Restore search bar for cache view and environment dialog, 2021-02-22, v3.20.0-rc2~12^2) the search bar is no longer case insensitive when using Qt 5.12.[0-1], and possibly some later versions. It works as of Qt 5.15 though, so update our version check accordingly. Fixes: #21884
* | 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
| | | | |
generated by cgit v0.12 at 2025-02-15 04:22:52 (GMT)