summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Ninja: Escape SONAME on linker command lineAlexander Stein2021-03-041-2/+4
| | | | | | | | | | | If the shared object name contains spaces, they need to be properly escaped, or link command will fail. This was already done for soname symlink creation in commit 13c92b4a30 (Ninja: Fix creation of library symlinks in folders with spaces, 2019-05-20, v3.15.0-rc1~87^2). Fixes: #20331
* Makefiles: Escape SONAME on linker command lineAlexander Stein2021-03-041-1/+4
| | | | | If the shared object name contains spaces, they need to be properly escaped, or link command will fail.
* Merge topic 'macos-arm64-rosetta'Brad King2021-03-042-9/+13
|\ | | | | | | | | | | | | | | fd714dd2b8 Tests: Fix FindPackageModeMakefileTest with CMAKE_OSX_ARCHITECTURES 42edf53ce2 Tests: Generalize FindPackageModeMakefileTest extra flags var Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5876
| * Tests: Fix FindPackageModeMakefileTest with CMAKE_OSX_ARCHITECTURESBrad King2021-03-031-0/+3
| |
| * Tests: Generalize FindPackageModeMakefileTest extra flags varBrad King2021-03-032-9/+10
| |
* | CMake Nightly Date StampKitware Robot2021-03-041-1/+1
| |
* | Merge branch 'release-3.20'Brad King2021-03-030-0/+0
|\ \ | |/ |/|
| * CMake 3.20.0-rc3v3.20.0-rc3Brad King2021-03-031-1/+1
| |
* | Merge branch 'release-3.20'Brad King2021-03-030-0/+0
|\ \ | |/
| * 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
* | \ Merge topic 'android-r22'Brad 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 'cpack-dmg-filesystem'Brad King2021-03-033-1/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e3ac388738 cpack: add CPACK_DMG_FILESYSTEM Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5873
| * | | cpack: add CPACK_DMG_FILESYSTEMKevin Ushey2021-03-023-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow users to configure the filesystem format of the generated `.dmg` via the `CPACK_DMG_FILESYSTEM` option. Fixes: #21874
* | | | Merge topic 'nasm_add_deps'Brad King2021-03-031-0/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 48e74ec1e6 ASM_NASM: generate depfiles for other makefiles fcf16e9459 ASM_NASM: Add depfile generation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5868
| * | | | ASM_NASM: generate depfiles for other makefilesFrancesco Bertolaccini2021-03-021-0/+7
| | | | |
| * | | | ASM_NASM: Add depfile generationFrancesco Bertolaccini2021-03-011-0/+2
| | | | |
* | | | | Merge branch 'release-3.20'Brad King2021-03-030-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | 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
* | \ \ \ \ Merge topic 'ci-nightly-ide-jobs'Brad 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 branch 'release-3.20'Brad King2021-03-030-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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
* | \ \ \ \ \ Merge topic 'compilerid_require_success'Brad 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.
* | | | | | CMake Nightly Date StampKitware Robot2021-03-031-1/+1
| | | | | |
* | | | | | Merge topic 'sphinx-latexpdf'Brad King2021-03-023-17/+59
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5302073010 Help: Add option to generate docs with latexpdf Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5833
| * | | | | | Help: Add option to generate docs with latexpdfHenryk Paluch2021-03-013-17/+59
| | |_|_|/ / | |/| | | |
* | | | | | Merge topic 'Tocic-master-patch-04743'Brad King2021-03-021-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 507710438d FindBoost: Fix typo in documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !5869
| * | | | | | FindBoost: Fix typo in documentationTocic2021-03-011-1/+1
| | | | | | |
* | | | | | | Merge branch 'release-3.20'Brad King2021-03-020-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | 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
* | \ \ \ \ \ \ Merge topic 'FindOpenGL-GLX-no-GLVND'Brad 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 branch 'release-3.20'Brad King2021-03-020-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | 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
* | | | | | | | Merge topic 'more-import-export-guide-updates'Brad 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.
* | | | | | | CMake Nightly Date StampKitware Robot2021-03-021-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge topic 'FindDoxygen-policy-warnings'Brad King2021-03-011-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 79fa7529e0 FindDoxygen: Prevent CMP0054 policy warnings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5864
| * | | | | | FindDoxygen: Prevent CMP0054 policy warningsCraig Scott2021-02-281-0/+1
| | | | | | | | | | | | | | | | | | | | | Fixes: #21871
* | | | | | | Merge branch 'release-3.20'Brad King2021-03-010-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | 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
* | | | | | | Merge topic 'compilerid_require_success'Brad 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.