summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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-2217-34/+0
| |/ / | | | | | | | | | | | | | | | CTEST_CUSTOM_* variables predate 3.0, but the docs were only added in 3.4. Issue: #19715
* | | Merge topic 'cuda_11' into release-3.19Brad King2020-11-232-4/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 046e454fdd CUDA: Error if can't determine toolkit library root 440dc98b07 CUDA: Clang CUDA 11.1 support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5525
| * | | CUDA: Error if can't determine toolkit library rootRaul Tambre2020-11-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Finding the toolkit is required for Clang and is assumed to have been correctly found by FindCUDAToolkit if the CUDA language is found. Error out early with an useful error instead of failing later on due to the path not being set.
| * | | CUDA: Clang CUDA 11.1 supportRaul Tambre2020-11-222-4/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | version.txt is gone from CUDA 11.1 installations, but the rest is the same. Instead of looking for version.txt look for <CUDA path>/nvvm/libdevice, which is the main thing that Clang requires (though it also checks for the existence of bin and include). Fixes #21353.
* | | Merge topic 'FindGTest-revert-no-release' into release-3.19Brad King2020-11-231-28/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 64dc4efc51 FindGTest: Revert "Allow either "Debug" or "Release" configurations." Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5520
| * | | FindGTest: Revert "Allow either "Debug" or "Release" configurations."Brad King2020-11-201-28/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit a064b18f85 (FindGTest: Allow either "Debug" or "Release" configurations., 2020-06-29, v3.19.0-rc1~584^2). If both configurations are found then `GTEST_LIBRARY` is populated in a way that breaks `__gtest_determine_library_type`, and the imported target is not created correctly. Fixes: #21473 Issue: #17799
* | | | Merge topic 'fix-compile-db-crash' into release-3.19Brad King2020-11-233-6/+16
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | 67e2130c96 Makefiles: Fix CMAKE_EXPORT_COMPILE_COMMANDS crash with custom compile rule Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5521
| * | | Makefiles: Fix CMAKE_EXPORT_COMPILE_COMMANDS crash with custom compile ruleBrad King2020-11-203-6/+16
| |/ / | | | | | | | | | Fixes: #21471
* | | Merge topic 'revert-explicit-LANGUAGE-flag' into release-3.19Brad King2020-11-2020-83/+21
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 30aa715fac Revert "specify language flag when source LANGUAGE property is set" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5519
| * | Revert "specify language flag when source LANGUAGE property is set"Brad King2020-11-1920-83/+21
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit 74b1c9fc8e (Explicitly specify language flag when source LANGUAGE property is set, 2020-06-01, v3.19.0-rc1~722^2) and the lookup tables from its two immediate ancestors. The purpose of that change was to convert an explicit `LANGUAGE` source file property into an explicit language specification compiler flag like `-x c`. This seems reasonable since the property is documented as meaning "indicate what programming language the source file is". It is also needed to help compilers deal with non-standard source file extensions they don't recognize. However, some projects have been setting `LANGUAGE C` on `.S` assembler source files to mean "use the C compiler". Passing `-x c` for them breaks the build because the `.S` sources are not written in C. These projects should be updated to use `enable_language(ASM)`, for which CMake often chooses the C compiler as the assembler when using toolchains that support it (which would have to be the case for projects using the approach). Revert the change for now to preserve the old behavior for such projects. We can re-introduce it with a policy in a future version of CMake. Fixes: #21469 Issue: #14516, #20716
* | Merge topic 'ci-updates' into release-3.19Brad King2020-11-183-9/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | ec5223666b gitlab-ci: update macOS jobs to use Xcode 12.0 fa0c02e9df ci: update to use CMake 3.19.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5516
| * | gitlab-ci: update macOS jobs to use Xcode 12.0Brad King2020-11-181-4/+4
| | |
| * | ci: update to use CMake 3.19.0Brad King2020-11-182-5/+5
|/ /
* | CMake 3.19.0v3.19.0Brad King2020-11-181-1/+1
| |
* | Merge branch 'release-3.18' into release-3.19Brad King2020-11-180-0/+0
|\ \ | |/
| * CMake 3.18.5v3.18.5Brad King2020-11-181-1/+1
| |
| * Merge branch 'xcode-compiler-id-path' into release-3.18Brad King2020-11-124-4/+4
| |\ | | | | | | | | | Merge-request: !5506
* | \ Merge topic 'rename_cuda_memcheck' into release-3.19Brad King2020-11-1811-27/+27
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fea49b2df0 CTest: Rename CudaMemcheck to CudaSanitizer Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5514
| * | | CTest: Rename CudaMemcheck to CudaSanitizerTobias Ribizel2020-11-1711-27/+27
| | | |
* | | | Merge topic 'gitlab-ci-msvc-14.28' into release-3.19Brad King2020-11-171-4/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | a282714be9 gitlab-ci: Update Windows builds to MSVC 19.28 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5513
View Lorry Controller Status