summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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.
* | | CMake 3.19.1v3.19.1Brad King2020-11-241-1/+1
| | |
* | | Merge topic 'policy-cmp0111-iface' into release-3.19Brad King2020-11-247-40/+65
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 54ef732b0c cmVisualStudio10TargetGenerator: Avoid GetFullPath on INTERFACE library f06f4b517c cmTarget: Do not enforce CMP0111 on imported INTERFACE libraries 43c95df8fb Tests: Match RunCMake.CMP0111 stderr more strictly Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5530
| * | | cmVisualStudio10TargetGenerator: Avoid GetFullPath on INTERFACE libraryBrad King2020-11-231-1/+2
| | | | | | | | | | | | | | | | Issue: #21470
| * | | cmTarget: Do not enforce CMP0111 on imported INTERFACE librariesBrad King2020-11-234-32/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix logic added by commit 359c500a24 (cmTarget: Raise error if imported target location is not set, 2020-08-08, v3.19.0-rc1~273^2) to exclude INTERFACE libraries from the policy. They have no location. Fixes: #21470
| * | | Tests: Match RunCMake.CMP0111 stderr more strictlyBrad King2020-11-232-7/+27
| | | |
* | | | Merge topic 'fix-find-make-program' into release-3.19Brad King2020-11-244-1/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ef91fb02f3 cmGlobalGenerator: FindMakeProgram() at a generator-specific time Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Frank Dana <ferdnyc@gmail.com> Merge-request: !5529
| * | | | cmGlobalGenerator: FindMakeProgram() at a generator-specific timeKyle Edwards2020-11-234-1/+29
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d5b5c192 moved FindMakeProgram() to an earlier time, which resulted in CMAKE_MAKE_PROGRAM not being read from the toolchain file. Change it to only call FindMakeProgram() early in the specific cases of Visual Studio and Xcode, and restore the old behavior for all other generators. Fixes: #21486
* | | | Merge topic 'xcode-cc-work-dir' into release-3.19Brad King2020-11-246-3/+38
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 36921d2d23 Xcode: Fix custom command work-dir placeholders in "new build system" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5527
| * | | | Xcode: Fix custom command work-dir placeholders in "new build system"Brad King2020-11-236-3/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The placeholders for `CONFIGURATION` and `EFFECTIVE_PLATFORM_NAME` need to be handled in the `WORKING_DIRECTORY` of custom commands just as we already do for the `COMMAND`. Fixes: #21483
* | | | | Merge topic 'cmFileTime-fix-overflow' into release-3.19Brad King2020-11-242-27/+40
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| | | | | | | | | | b4c994f69c cmFileTime: Fix overflow on time computation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5526
| * | | cmFileTime: Fix overflow on time computationMarc Chevrier2020-11-232-27/+40
| |/ / | | | | | | | | | | | | | | | On Windows, time starting point is Januray, 1st of 1601. So computing number of nanoseconds from this date exceeds 64bit capabilities.
* | | Merge topic 'ctest_custom_versions' into release-3.19Brad King2020-11-2317-34/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 6e7625989c Help: Fix `.. versionadded` directives for CTEST_CUSTOM_* variables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5524
| * | | Help: Fix `.. versionadded` directives for CTEST_CUSTOM_* variablesNikita Nemkin2020-11-2117-34/+0
| |/ / | | | | | | | | | | | | | | | CTEST_CUSTOM_* variables predate 3.0, but the docs were only added in 3.4. Issue: #19715