summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'correct_ispc_path_computation' into release-3.19Brad King2020-12-085-15/+32
|\ | | | | | | | | | | | | | | 9af93fef11 ISPC: Handle OBJECT sources in different directories 72ae15ebcb ISPC: Ninja properly compute ISPC_HEADER_DIRECTORY location Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5581
| * ISPC: Handle OBJECT sources in different directoriesRobert Maynard2020-12-074-9/+23
| |
| * ISPC: Ninja properly compute ISPC_HEADER_DIRECTORY locationRobert Maynard2020-12-071-6/+9
| |
* | Merge topic 'remove-partial-intel-compiler-support' into release-3.19Brad King2020-12-084-18/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 41b69348a5 Revert "Intel: Add Intel DPC++ compiler identification" f0babb53b3 Revert "Intel: Add Intel Clang compiler identification" Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Axel Huebl <axel.huebl@plasma.ninja> Merge-request: !5583
| * | Revert "Intel: Add Intel DPC++ compiler identification"Brad King2020-12-073-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit 887f3a88a6 (Intel: Add Intel DPC++ compiler identification, 2020-09-21, v3.19.0-rc1~124^2). The compiler has already been released, and is more usable with CMake by pretending to be upstream Clang than by identifying it as a compiler for which we have not implemented support. Fixes: #21551
| * | Revert "Intel: Add Intel Clang compiler identification"Brad King2020-12-073-9/+0
|/ / | | | | | | | | | | | | | | | | | | Revert commit 5c3a93ab88 (Intel: Add Intel Clang compiler identification, 2020-09-29, v3.19.0-rc1~68^2). The compiler has already been released, and is more usable with CMake by pretending to be upstream Clang than by identifying it as a compiler for which we have not implemented support. Issue: #21551
* | Merge topic 'asm_arch' into release-3.19Brad King2020-12-071-1/+1
|\ \ | | | | | | | | | | | | | | | | | | fcabf4a47e macOS: Add architecture flags only for native ASM dialect Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5572
| * | macOS: Add architecture flags only for native ASM dialectRaul Tambre2020-12-041-1/+1
|/ / | | | | | | | | | | | | | | ASM dialects like NASM have languages names such as ASM_NASM. However such ASM dialects don't support the architecture flags, so match only the full name. Fixes #21553.
* | Merge topic 'compiler-id-extra-text' into release-3.19Brad King2020-12-041-7/+16
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | f25ac39dee CMakeDetermineCompilerId: Tolerate stray text around INFO strings 5cb66f17ca CMakeDetermineCompilerId: Add whitespace to clarify logic 1ee99104f7 CMakeDetermineCompilerId: Filter IAR-AVR format INFO strings earlier Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5570
| * | CMakeDetermineCompilerId: Tolerate stray text around INFO stringsBrad King2020-12-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When cross-compiling with Xcode our compiler id test binary may be compiled with multiple architectures. The INFO strings should be identical and therefore de-duplicated. However, this can be broken by stray text that happens to sit immediately before or after an INFO string. Filter out such text so we can match clean INFO strings. Fixes: #21526
| * | CMakeDetermineCompilerId: Add whitespace to clarify logicBrad King2020-12-031-1/+5
| | | | | | | | | | | | Also initialize a variable closer to its use.
| * | CMakeDetermineCompilerId: Filter IAR-AVR format INFO strings earlierBrad King2020-12-031-6/+7
| | | | | | | | | | | | Remove the bytes between characters from the entire list at once.
* | | Merge topic 'test-vs-windows-hosts' into release-3.19Brad King2020-12-041-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | dca8800cb5 Tests: Look for Visual Studio only on Windows hosts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5569
| * | Tests: Look for Visual Studio only on Windows hostsBrad King2020-12-031-1/+1
|/ / | | | | | | | | | | | | | | | | Update logic added by commit 6051a49c78 (Visual Studio: Add Android support, 2020-06-12, v3.19.0-rc1~619^2) to only look for VS installations using `cmake_host_system_information` on Windows hosts. Otherwise the `VS_*_DIR` keys are not available. Fixes: #21547
* | Merge topic 'llvm-rc-preprocess-as-c' into release-3.19Brad King2020-12-031-5/+5
|\ \ | | | | | | | | | | | | | | | | | | f7ff0d34f0 llvm-rc: Force C language for the clang gnu frontend Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5564
| * | llvm-rc: Force C language for the clang gnu frontendThomas Bernard2020-12-021-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | When preprocessing the rc file using the clang gnu front end we need to force the source file type to a c file for the preprocessing to take place. Fixes: #21472
* | | 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
| * | | 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 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
| * | | 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 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
| * | | 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 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
| * | 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
* | | 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
| * | | Clang on Windows: 'LINKER:' prefix must be honoredMarc Chevrier2020-11-301-0/+3
| | | | | | | | | | | | | | | | Fixes: #21094
* | | | 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
| * | | | 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 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
| * | | PCH: Fix compiler errors on iOS multi-arch using Ninja Multi-ConfigCristian Adam2020-11-301-2/+4
|/ / / | | | | | | | | | Fixes: #21401
* | | Merge topic 'correct_check_compiler_flag_regression' into release-3.19Brad King2020-11-303-7/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 72f6b4bfbe Modules: Rename Internal/CMake{CheckCompiler => TryCompilerOrLinker}Flag Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kumar Gala <kumar.gala@gmail.com> Merge-request: !5540
| * | | Modules: Rename Internal/CMake{CheckCompiler => TryCompilerOrLinker}FlagRobert Maynard2020-11-253-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the `CheckPIESupported` helper functions so that they don't clobber other internal functions. Also rename them to document they can't be unified with `CheckCompilerFlag`. Fixes: #21497
* | | | Merge topic 'enable-extensions-on-qnx' into release-3.19Brad King2020-11-301-3/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 34f6d76755 QNX: Do not disable compiler extensions for CMake itself Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5537
| * | | | QNX: Do not disable compiler extensions for CMake itselfStephen Kelly2020-11-251-3/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `set(CMAKE_CXX_EXTENSIONS FALSE)` option has the effect of passing compile option `-std=c++NN` instead of `-std=gnu++NN`. On some platforms, the latter form (or the secondary effects that it has, such as setting _XOPEN_SOURCE) is required. This typically affects platforms such as mingw, cygwin and QNX. The GNU-like compiers default to `-std=gnu++NN`, which means that users can typically build source code on those platforms by default. While the `set(CMAKE_CXX_EXTENSIONS FALSE)` option was set here in commit f034b0f6 (CMake compilation: do not use compiler extensions, 2020-03-14), the other changes in that commit added `#defines` which become required in the absense of use of `-std=gnu++NN`. However, only platforms regularly tested in the cmake dashboard were ported, as is reasonable. That made CMake fail to compile on QNX and perhaps other platforms which for which no one is submitting regular testing to the cmake dashboard. Make the `set(CMAKE_CXX_EXTENSIONS FALSE)` option conditional on non-QNX to restore the QNX build. Issue: #21503
* | | | Merge topic 'check-lang-conditions' into release-3.19Brad King2020-11-3022-23/+62
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | f3d4254b3d Check*: Tolerate variables set with names of languages 01d91ae5f2 Tests: Fix RunCMake.Check* conditions for enabling Fortran Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !5536
| * | | Check*: Tolerate variables set with names of languagesBrad King2020-11-2521-20/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the language checks added by commit 90dead024c (CheckCompilerFlag: unified way to check compiler flags per language, 2020-09-25, v3.19.0-rc1~88^2), commit 10ae907de0 (CheckSoureCompiles: Add a unified way to check if a source compiles, 2020-09-14, v3.19.0-rc1~118^2~1), and commit 357e2ef429 (CheckSoureRuns: Add a unified way to check if a source runs, 2020-09-14, v3.19.0-rc1~118^2) to work when variables of the language names are set. Fixes: #21500
| * | | Tests: Fix RunCMake.Check* conditions for enabling FortranBrad King2020-11-251-3/+6
| |/ /
* | | Merge topic 'presets-docs-bug' into release-3.19Craig Scott2020-11-291-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ca289abea5 Help: Fix presets typo (longDescription to displayName) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5541
| * | | Help: Fix presets typo (longDescription to displayName)Sam Freed2020-11-281-1/+1
| |/ /
* | | Merge topic 'FPHSA-usable-outside-find_package' into release-3.19Marc Chevrier2020-11-281-2/+7
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 14ecf9c2f6 FPHSA: ensure it can be used outside 'find_package' Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5539
| * | FPHSA: ensure it can be used outside 'find_package'Marc Chevrier2020-11-251-2/+7
| | | | | | | | | | | | Fixes: #21505
* | | Merge topic 'ci-xcode-12.2' into release-3.19Brad King2020-11-252-4/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5213328008 gitlab-ci: update macOS jobs to use Xcode 12.2 928ca50b6f Tests: Teach RunCMake to ignore Xcode install_name_tool signature warnings Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5534
| * | | gitlab-ci: update macOS jobs to use Xcode 12.2Brad King2020-11-241-4/+4
| | | |
| * | | Tests: Teach RunCMake to ignore Xcode install_name_tool signature warningsBrad King2020-11-241-0/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | The `install_name_tool` may warn: install_name_tool: warning: changes being made to the file will invalidate the code signature in: ... Teach RunCMake to drop such incidental lines before matching against expected output.
* | | Merge topic 'test-java-default' into release-3.19Brad King2020-11-252-6/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1af2d1d0ea Tests: Add CMake_TEST_Java option to control Java tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5532
| * | | Tests: Add CMake_TEST_Java option to control Java testsBrad King2020-11-242-6/+12
| |/ /
* | | Merge topic 'cuda_detect_vs_codegen' into release-3.19Brad King2020-11-251-4/+8
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 20807a1882 CUDA: Fix user-set architectures during detection with Visual Studio Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5531
| * | CUDA: Fix user-set architectures during detection with Visual StudioRaul Tambre2020-11-251-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the user specifies CMAKE_CUDA_ARCHITECTURES we use those during detection and error out if they don't work. For Visual Studio a dummy project file is used instead of invoking the compiler directly. NVCC would thus use its default and we'd fail if CMAKE_CUDA_ARCHITECTURES was anything other than NVCC's default. Use the necessary project file variable in CMakeDetermineCompilerId.cmake to match other generators. Fixes #21492.