summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Refactor: Add IsAndroidGuiExecutable() method to cmTargetKyle Edwards2020-06-183-5/+13
|
* cmGlobalVisualStudio10Generator: Move variable initialization to headerKyle Edwards2020-06-182-6/+3
|
* cmGlobalGenerator: FindMakeProgram() before CMakeDetermineSystemKyle Edwards2020-06-181-5/+10
| | | | | | | | | | | | | | | Prior to 147d36c, the build tool was found before the toolset was selected, but was changed to be found after in order to support a 64-bit MSBuild (introduced in da402a0.) However, a bug was found in 64-bit MSBuild, which resulted in da402a0 being reverted in f3cedf3 (but 147d36c was not reverted.) Move FindMakeProgram() even earlier than it was before 147d36c, before CMakeDetermineSystem is called, so that the Visual Studio Android support can report its sysroot, giving Android-Determine the information it needs to inspect the NDK. When the bug in 64-bit MSBuild is fixed, we will have a chicken-and- egg problem, but we don't need to worry about it for now.
* Merge topic 'xcode-link-libs'Brad King2020-06-182-31/+187
|\ | | | | | | | | | | | | | | 58c05e1c73 Xcode: Use "Link Binary With Libraries" build phase when possible 927373b678 Xcode: Refactor generator variable names and types Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4882
| * Xcode: Use "Link Binary With Libraries" build phase when possibleGusts Kaksis2020-06-172-17/+173
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Try linking all target linked libraries through frameworks build phase instead of linker flags, thus letting Xcode manage build product paths correctly. Prevent adding duplicate entries to "Link Binary With Libraries" build phase. Add check for configuration-dependent linking - in case the library is not present in all configurations revert back to linker flags which are per-configuration. This does change the order of libraries linked, but that does not seem to matter for Apple linkers invoked by Xcode, even for static libraries. The linker will go back and re-consider a static library from earlier on the link line when more symbols from its objects are needed. Fixes: #14185
| * Xcode: Refactor generator variable names and typesGusts Kaksis2020-06-152-14/+14
| | | | | | | | | | * Instead of `classes` use name `commonSourceFiles`. * No need for reference when you have pointer.
* | Merge topic 'languageStandardRefactor'Brad King2020-06-188-107/+336
|\ \ | | | | | | | | | | | | | | | | | | | | | 742ff97f80 Refactor language standard computation 0892c798f7 cmMakefile: Change CompileFeatureKnown to take target name instead of target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4803
| * | Refactor language standard computationJustin Goshi2020-06-168-102/+330
| | | | | | | | | | | | | | | Instead of mutating the configure-time cmTarget's properties at generate time, compute and store it in a cmGeneratorTarget field.
| * | cmMakefile: Change CompileFeatureKnown to take target name instead of targetJustin Goshi2020-06-153-6/+7
| |/ | | | | | | The implementation needs only the target name.
* | Merge topic 'configure_file-error-handling'Brad King2020-06-181-1/+9
|\ \ | | | | | | | | | | | | | | | | | | 032506acc6 cmake: implement error handling in configure_file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4889
| * | cmake: implement error handling in configure_fileAsit Dhal2020-06-171-1/+9
| | | | | | | | | | | | | | | | | | Implement error handling in case it fails Fixes: #20696
* | | Merge topic 'refactor_try_compile_parsing'Brad King2020-06-182-292/+194
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 574f71efba try_compile: Refactor language standard level parsing Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4900
| * | | try_compile: Refactor language standard level parsingRobert Maynard2020-06-172-292/+194
| | |/ | |/| | | | | | | | | | | | | | | | cmCoreTryCompile had significant code duplication around handling languages that offer standard levels. This refactoring reduces the complexity and makes it easier to add new languages in the future.
* | | CMake Nightly Date StampKitware Robot2020-06-181-1/+1
| | |
* | | Merge topic 'cuda_clang_limitations'Brad King2020-06-171-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bdb105ee94 Help: Mention CUDA Clang limitations in 3.18 release notes fec7dd33d3 CUDA: Add issue number to Clang separable compilation error 14163d7d6b CUDA: Throw error for Clang on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4903
| * | | CUDA: Add issue number to Clang separable compilation errorRaul Tambre2020-06-161-1/+2
| | | |
| * | | Merge topic 'cuda_clang_toolkit_path' into release-3.18Brad King2020-06-153-0/+25
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ec59fb6c31 CUDA: Determine CUDA toolkit location for NVCC 0a056246a1 CUDA: Pass toolkit path to Clang 9c43972127 FindCUDAToolkit: Avoid unnecessary temporary variable computing binary dir 9eebb5b8b2 FindCUDAToolkit: Remove unnecessary checks around searches 8f01fe7bf1 FindCUDAToolkit: Use list(SORT) to sort in natural order 8c144fe9ad FindCUDAToolkit: Compute CUDAToolkit_INCLUDE_DIR instead of searching 403f8d31e3 FindCUDAToolkit: Add CUDAToolkit_LIBRARY_ROOT 6636693134 FindCUDAToolkit: Re-unify with Internal/CUDAToolkit Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4828
| * \ \ \ Merge topic 'cuda_architectures_disable' into release-3.18Brad King2020-06-151-22/+29
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 877a92e968 CUDA: Add support for disabling CUDA_ARCHITECTURES Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4886
| * \ \ \ \ Merge topic 'revert-find_program-exe-no-read' into release-3.18Brad King2020-06-151-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cc02ced530 find_program: Revert "Find programs that are executable but not readable" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4871
* | | | | | | CMake Nightly Date StampKitware Robot2020-06-171-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge topic 'cmake-E-compare_files-exit-code'Brad King2020-06-161-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b5b6075522 cmake: add dedicated error for -E compare_files invalid arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4881
| * | | | | | cmake: add dedicated error for -E compare_files invalid argumentsAsit Dhal2020-06-151-1/+1
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Return 2 when user provides invalid arguments Fixes: #20815
* | | | | | Merge topic 'cpack-pre-and-post-scripts'Brad King2020-06-161-6/+44
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 915409af49 CPack: Introduce pre- and post- build actions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4846
| * | | | | | CPack: Introduce pre- and post- build actionsAlex Turbov2020-06-151-6/+44
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CPack learned the `CPACK_PRE_BUILD_SCRIPTS`, `CPACK_POST_BUILD_SCRIPTS`, and `CPACK_PACKAGE_FILES` variables. The first two are lists of scripts to perform - after pre-install files into a staging directory and before producing the resulting packages - after produsing the packages The post-build script(s) also get the list of actually produced packages in the `CPACK_PACKAGE_FILES`. Issue: #19077
* | | | | | Merge topic 'find_program-exe-no-read'Brad King2020-06-162-2/+51
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9d45a8be08 find_program: Find programs that are executable but not readable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4896
| * | | | | | find_program: Find programs that are executable but not readableBrad King2020-06-152-2/+51
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix was first made by commit 86e6349ef7 (find_program: Find programs that are executable but not readable, 2020-04-04, v3.18.0-rc1~372^2) but was reverted for compatibility. Re-introduce it with a policy for compatibility. Fixes: #10468
* | | | | | CMake Nightly Date StampKitware Robot2020-06-161-1/+1
|/ / / / /
* | | | | Merge topic 'avoid-qt5-deprecation-warnings'Brad King2020-06-152-9/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0fc1818831 QCMakeWidgets: replace QDirModel 736fb34294 QCMake: use loadRelaxed if available Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4894
| * | | | | QCMakeWidgets: replace QDirModelBen Boeckel2020-06-151-9/+9
| | | | | |
| * | | | | QCMake: use loadRelaxed if availableBen Boeckel2020-06-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Added in 5.14 and load() was deprecated at the same time.
* | | | | | Merge topic 'bundle-exe-space-in-name'Brad King2020-06-151-7/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d3fd518c03 find_program: Properly decode URL for bundle exe name with spaces Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4891
| * | | | | | find_program: Properly decode URL for bundle exe name with spacesCraig Scott2020-06-141-7/+6
| |/ / / / / | | | | | | | | | | | | Fixes: #20817
* | | | | | Merge topic 'cmake-build-retval'Brad King2020-06-151-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b9dd072e05 Tests: Add case for cmake --build with a failing target 87c860ebad cmake --build: Fix exit code when building multiple targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4878
| * | | | | | cmake --build: Fix exit code when building multiple targetslumberyard-employee-dm2020-06-121-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated the cmGlobalGenerator::Build method to check the return `retVal` parameter supplied to the `cmSystemTools::RunSingleCommand` to validate that each invocation of the build command returned an exit code of zero. Fixes: #20790
* | | | | | | Merge topic 'cuda_clang_toolkit_path'Brad King2020-06-153-0/+25
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ec59fb6c31 CUDA: Determine CUDA toolkit location for NVCC 0a056246a1 CUDA: Pass toolkit path to Clang 9c43972127 FindCUDAToolkit: Avoid unnecessary temporary variable computing binary dir 9eebb5b8b2 FindCUDAToolkit: Remove unnecessary checks around searches 8f01fe7bf1 FindCUDAToolkit: Use list(SORT) to sort in natural order 8c144fe9ad FindCUDAToolkit: Compute CUDAToolkit_INCLUDE_DIR instead of searching 403f8d31e3 FindCUDAToolkit: Add CUDAToolkit_LIBRARY_ROOT 6636693134 FindCUDAToolkit: Re-unify with Internal/CUDAToolkit Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4828
| * | | | | | CUDA: Pass toolkit path to ClangRaul Tambre2020-06-123-0/+25
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang isn't very good at finding the installed CUDA toolkit. The upstream recommendation is that we should pass the toolkit explicitly. Additionally: * Avoids Clang having to search for the toolkit on every invocation. * Allows the user to use a toolkit from a non-standard location by simply setting CUDAToolkit_ROOT. The same way as with FindCUDAToolkit. Clang wants the directory containing the device library and version.txt as the toolkit path. We thus pass the newly introduced CUDAToolkit_LIBRARY_ROOT as the toolkit path. We save CUDAToolkit_ROOT_DIR and CUDAToolkit_LIBRARY_ROOT on Clang to have them available in try_compile() and avoid unnecessary re-searching or a possibly different installation being found in FindCUDAToolkit. This however means that the selected toolkit can't be changed after the initial language enablement. We now determine CUDA compiler ID before doing actual detection, as we don't want to spend time finding the CUDA toolkit for NVIDIA. Implements #20754.
* | | | | | Merge topic 'cuda_architectures_disable'Brad King2020-06-151-22/+29
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 877a92e968 CUDA: Add support for disabling CUDA_ARCHITECTURES Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4886
| * | | | | CUDA: Add support for disabling CUDA_ARCHITECTURESRaul Tambre2020-06-151-22/+29
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ability to disable adding architectures completely for packaging purposes and cases requiring passing the architectures flags explicitly has been requested. Support a false value for CUDA_ARCHITECTURES and CMAKE_CUDA_ARCHITECTURES for this purpose. Implements #20821.
| * | | | Merge topic 'vs-lang-C' into release-3.18Brad King2020-06-121-3/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c04e77e07 VS: Restore compilation of '.C' sources as C++ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4880
* | \ \ \ \ Merge topic 'deprecate-policy-old'Brad King2020-06-151-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9710790a39 Help/dev: Add maintainer guide step for initial post-release development 6f6651f728 Add deprecation warnings for policies CMP0072 and below Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4884
| * | | | | | Add deprecation warnings for policies CMP0072 and belowBrad King2020-06-121-1/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The OLD behaviors of all policies are deprecated, but only by documentation. Add an explicit deprecation diagnostic for policies introduced in CMake 3.11 and below to encourage projects to port away from setting policies to OLD.
* | | | | | Merge topic 'revert-find_program-exe-no-read'Brad King2020-06-151-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | | | | | | | | | | | | cc02ced530 find_program: Revert "Find programs that are executable but not readable" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4871
| * | | | find_program: Revert "Find programs that are executable but not readable"Brad King2020-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix in commit 86e6349ef7 (find_program: Find programs that are executable but not readable, 2020-04-04, v3.18.0-rc1~372^2) can break existing projects that were (likely accidentally) relying on the old behavior to find files that are readable but not executable. Revert the fix for now. We can re-introduce it with a policy later. Instead of reverting the test case, update it to cover the old behavior. That can serve as a reference for testing the policy when introduced. Fixes: #20814 Issue: #10468
* | | | | Merge topic 'cmake-gui-qt5-only'Brad King2020-06-125-145/+80
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4037beb747 QtDialog: remove Qt4 definition ce9dbceb42 QtDialog: remove Qt4-only code 8ea50749da QtDialog: use Qt5's imported targets 4ccc9921be QtDialog: use qt5 functions for special Qt sources e4d6015460 QtDialog: remove Qt4 support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4836
| * | | | | QtDialog: remove Qt4 definitionBen Boeckel2020-06-091-3/+0
| | | | | |
| * | | | | QtDialog: remove Qt4-only codeBen Boeckel2020-06-094-45/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `reset()` method was actually deprecated for 5.0 which means it can now be removed here.
| * | | | | QtDialog: use Qt5's imported targetsBen Boeckel2020-06-051-15/+9
| | | | | |
| * | | | | QtDialog: use qt5 functions for special Qt sourcesBen Boeckel2020-06-051-15/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automoc is not supported in bootstrap builds, so it cannot be used unconditionally.
| * | | | | QtDialog: remove Qt4 supportBen Boeckel2020-06-051-91/+77
| | | | | |
* | | | | | Merge topic 'ccmake-ncurses-init'Brad King2020-06-121-2/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 19689d34e6 ccmake: Display an error and interrupt execution if ncurses failed Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4835