summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2020-12-031-1/+1
|
* Merge topic 'cpackifw-package-wizard-show-page-list'Brad King2020-12-024-0/+42
|\ | | | | | | | | | | | | 8b5a0e0fef CPackIFW: Add CPACK_IFW_PACKAGE_WIZARD_SHOW_PAGE_LIST variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5545
| * CPackIFW: Add CPACK_IFW_PACKAGE_WIZARD_SHOW_PAGE_LIST variableKonstantin Podsvirov2020-11-274-0/+42
| | | | | | | | | | | | Add CPACK_IFW_PACKAGE_WIZARD_SHOW_PAGE_LIST variable to control visibility of the widget listing installer pages on the left side of the wizard. This feature available only since QtIFW 4.0.
* | Merge topic 'ninja-deps-updates'Brad King2020-12-026-47/+78
|\ \ | | | | | | | | | | | | | | | | | | f8d8faff8d Ninja Generators: Homogenize configuration with Makefiles Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5557
| * | Ninja Generators: Homogenize configuration with MakefilesMarc Chevrier2020-12-016-47/+78
| | | | | | | | | | | | | | | * Use same configuration variables to configure dependencies * Abstract Ninja deps format from compiler one
* | | Merge topic 'issue-20955'Brad King2020-12-023-2/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 5a6c199069 ctest: Provide hints about inspecting test failures Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5552
| * | | ctest: Provide hints about inspecting test failuresAsit Dhal2020-12-013-2/+17
| | | | | | | | | | | | | | | | Fixes: #20955
* | | | Merge topic 'error_out_on_unknown_argument'Brad King2020-12-026-1/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1b6c5333a0 cmake: Error out on unknown arguments starting with `-`. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5553
| * | | | cmake: Error out on unknown arguments starting with `-`.Robert Maynard2020-12-016-1/+29
| | | | | | | | | | | | | | | | | | | | Fixes: #21521
* | | | | Merge branch 'release-3.19'Brad King2020-12-020-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge topic 'FindHDF5-hdf5hl_fortran-variable' into release-3.19Brad King2020-12-021-2/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 175beadd4c FindHDF5: support the hdf5hl_fortran-based variable names adf108441e FindHDF5: improve error messages when a location variable isn't known Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5563
* | \ \ \ \ \ Merge topic 'FindHDF5-hdf5hl_fortran-variable'Brad King2020-12-021-2/+6
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 175beadd4c FindHDF5: support the hdf5hl_fortran-based variable names adf108441e FindHDF5: improve error messages when a location variable isn't known Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5563
| * | | | | | FindHDF5: support the hdf5hl_fortran-based variable namesBen Boeckel2020-12-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21537
| * | | | | | FindHDF5: improve error messages when a location variable isn't knownBen Boeckel2020-12-011-2/+2
| | | | | | |
* | | | | | | Merge branch 'release-3.19'Brad King2020-12-020-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'ti-c-only-standard' into release-3.19Brad King2020-12-021-3/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8eeddb1f0a Compiler/TI: Fix C standard flags in C-only project Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5558
* | \ \ \ \ \ \ Merge topic 'ti-c-only-standard'Brad King2020-12-021-3/+3
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8eeddb1f0a Compiler/TI: Fix C standard flags in C-only project Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5558
| * | | | | | | Compiler/TI: Fix C standard flags in C-only projectAdam Weisi2020-12-011-3/+3
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Use our compiler architecture variable for C rather than CXX.
* | | | | | | Merge branch 'release-3.19'Brad King2020-12-020-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'cray-compiler-detection' into release-3.19Brad King2020-12-023-5/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ee4a42813 Cray: Fix Cray compiler detection on new platforms Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5561
* | \ \ \ \ \ \ Merge topic 'cray-compiler-detection'Brad King2020-12-023-5/+5
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ee4a42813 Cray: Fix Cray compiler detection on new platforms Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5561
| * | | | | | | Cray: Fix Cray compiler detection on new platformsJustin LaPolla2020-12-013-5/+5
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Customer reported problems detecting the Cray compiler on their Apollo80 system. We were checking for the __CRAYXC and __CRAYXE predefined macros. These macros reflect the platform that the compiler is running on, i.e. Cray XC and Cray XE machines. Naturally, this didn't work on Apollo80. This commit uses the official Cray compiler identification macros which are defined on every platform: CCE Version C Macro C++ Macro Fortran Macro ============ ======== ========= ============= version < 9 _CRAYC _CRAYC _CRAYFTN version >= 9 __cray__ __cray__ _CRAYFTN
* | | | | | | Merge branch 'release-3.19'Brad King2020-12-020-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'export-namelink' into release-3.19Brad King2020-12-028-8/+56
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 38bcb5c0a3 export: Do not fail generation for separate namelink only case Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5556
* | | | | | | Merge topic 'export-namelink'Brad King2020-12-028-8/+56
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 38bcb5c0a3 export: Do not fail generation for separate namelink only case Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5556
| * | | | | | export: Do not fail generation for separate namelink only caseDeniz Bahadir2020-12-018-8/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the change from commit 64690f6df0 (export: Do not fail generation for namelink-only case, 2020-10-09, v3.19.0-rc1~7^2) to also handle separate namelink-only and namelink-skip calls. Fixes: #21529
* | | | | | | CMake Nightly Date StampKitware Robot2020-12-021-1/+1
| | | | | | |
* | | | | | | Merge topic 'cuda_env_archs'Brad King2020-12-018-2/+34
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c57541d874 CUDA: Fix tests with CUDAARCHS set c4ae9384ff CUDA: Initialize CMAKE_CUDA_ARCHITECTURES using $ENV{CUDAARCHS} Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5533
| * | | | | | | CUDA: Fix tests with CUDAARCHS setRaul Tambre2020-11-303-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With CUDAARCHS there's the possibility of tests being run with multiple architectures or having CMAKE_CUDA_ARCHITECTURES set with NVCC despite CMP0104 being OLD. Fix a few tests to work properly in such cases.
| * | | | | | | CUDA: Initialize CMAKE_CUDA_ARCHITECTURES using $ENV{CUDAARCHS}Raul Tambre2020-11-305-1/+26
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NVCC's default architecture may be newer than the one supported by the machine's GPU. In such cases it's useful to have an environment variable for initializing CMAKE_CUDA_ARCHITECTURES to avoid specifying it for every invocation.
* | | | | | | Merge topic 'cmprop-improve'Brad King2020-12-011-25/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4d9b1b42bc cmCTestBuildCommand: code improvement Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5548
| * | | | | | | cmCTestBuildCommand: code improvementVitaly Stakhovsky2020-11-291-25/+18
| | | | | | | |
* | | | | | | | Merge topic 'Help-FindPython-add-version-information'Brad King2020-12-013-40/+242
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ee6f37d606 Help: FindPython: add version information Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5554
| * | | | | | | | Help: FindPython: add version informationMarc Chevrier2020-12-013-40/+242
| | | | | | | | |
* | | | | | | | | Merge topic 'xcode-check-object-lib-subprojects-fixed'Brad King2020-12-014-0/+70
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31d3e64080 Tests: Add Xcode cases fixed by switch to the "new build system" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5549
| * | | | | | | | | Tests: Add Xcode cases fixed by switch to the "new build system"Yauheni Khnykin2020-11-304-0/+70
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support of 'new build system' in Xcode fixes indirectly few issues which were caused by workaround with `XCODE_DEPEND_HELPER.cmake` autogenerated script. This patch adds test which is originated from issue #20260 and reproduces this issue when 'new build system' is disabled. Fixes: #20260
* | | | | | | | | Merge branch 'release-3.19'Brad King2020-12-010-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'windows-clang-LINKER-prefix' into release-3.19Brad King2020-12-011-0/+3
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ac9876757 Clang on Windows: 'LINKER:' prefix must be honored Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5551
* | \ \ \ \ \ \ \ \ Merge topic 'windows-clang-LINKER-prefix'Brad King2020-12-011-0/+3
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ac9876757 Clang on Windows: 'LINKER:' prefix must be honored Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5551
| * | | | | | | | | Clang on Windows: 'LINKER:' prefix must be honoredMarc Chevrier2020-11-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21094
* | | | | | | | | | Merge topic 'compile_def_doc'Brad King2020-12-011-0/+9
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4b9fcadc9a Help: Describe definition values in target_compile_definitions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5547
| * | | | | | | | | | Help: Describe definition values in target_compile_definitionsJuan Ramos2020-11-301-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20573
* | | | | | | | | | | Merge branch 'release-3.19'Brad King2020-12-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge topic 'ninja-regen-metadata' into release-3.19Brad King2020-12-014-7/+16
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 73d1c78bf4 ci: update to use ninja 1.10.2 11f4259362 Ninja: Clean metadata after regen during build on Windows with 1.10.2+ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5555
* | \ \ \ \ \ \ \ \ \ \ Merge topic 'ninja-regen-metadata'Brad King2020-12-014-7/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 73d1c78bf4 ci: update to use ninja 1.10.2 11f4259362 Ninja: Clean metadata after regen during build on Windows with 1.10.2+ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5555
| * | | | | | | | | | | ci: update to use ninja 1.10.2Brad King2020-11-302-5/+5
| | | | | | | | | | | |
| * | | | | | | | | | | Ninja: Clean metadata after regen during build on Windows with 1.10.2+Brad King2020-11-302-2/+11
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ninja 1.10.2 fixes support for `generator = 1` rules that run metadata update commands during regeneration while a build is running. Update the condition added by commit ccaa0bccc4 (Ninja: Do not clean metadata when re-generating inside a running build, 2020-01-27, v3.17.0-rc1~73^2) to remove our workaround when Ninja is new enough. Fixes: #20274
* | | | | | | | | | | Merge branch 'release-3.19'Brad King2020-12-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge topic 'pch-ios-multi-arch-nmc' into release-3.19Brad King2020-12-011-2/+4
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 35432aabda PCH: Fix compiler errors on iOS multi-arch using Ninja Multi-Config Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5544
* | | | | | | | | | | Merge topic 'pch-ios-multi-arch-nmc'Brad King2020-12-011-2/+4
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | / / | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 35432aabda PCH: Fix compiler errors on iOS multi-arch using Ninja Multi-Config Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5544