summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'fortran-preprocess-property'Brad King2020-05-229-127/+308
|\ | | | | | | | | | | | | | | | | | | 3888de23da Ninja: Skip Fortran preprocessing if Fortran_PREPROCESS is OFF 66c4e87282 Ninja: Add helper functions to generate Fortran build 5cca1ec893 Ninja: Add helper functions to generate Fortran preprocess rule b0a6161190 Fortran: Add Fortran_PREPROCESS property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4659
| * Ninja: Skip Fortran preprocessing if Fortran_PREPROCESS is OFFPeter Hill2020-05-212-10/+56
| | | | | | | | | | | | | | | | | | If `Fortran_PREPROCESS` is explicitly turned off for a source file then we know it does not need to be preprocessed. Teach the Ninja generator to skip preprocessing in this case. Otherwise we still must preprocess just in case. Fixes: #18870
| * Ninja: Add helper functions to generate Fortran buildPeter Hill2020-05-211-61/+87
| |
| * Ninja: Add helper functions to generate Fortran preprocess rulePeter Hill2020-05-211-69/+98
| |
| * Fortran: Add Fortran_PREPROCESS propertyPeter Hill2020-05-218-0/+80
| | | | | | | | Issue: #18870
* | Merge topic 'cmake_language-rename-from-cmake_command'Craig Scott2020-05-224-16/+16
|\ \ | | | | | | | | | | | | | | | | | | 94c1e4fdb3 cmake_language: Rename command from cmake_command Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4774
| * | cmake_language: Rename command from cmake_commandBrad King2020-05-214-16/+16
| | | | | | | | | | | | | | | | | | Also rename the `INVOKE` signature to `CALL`. Fixes: #20732
* | | Merge topic 'autogen-fix-workerpool-locking'Brad King2020-05-221-28/+41
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 01ad902588 Autogen: Redo locking and state machine for fence handling and the worker pool Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4775
| * | | Autogen: Redo locking and state machine for fence handling and the worker poolJoerg Sonnenberger2020-05-211-28/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (1) All CV use must hold the corresponding mutex, otherwise race conditions happen. This is mandated by the C++ standard. (2) Introduce a separate CV for the thread waiting for other jobs to finish before running a fence. This avoids waking up all other workers blindly. Correctly wake that thread up when the processing of outstanding jobs is done. (3) Split the waiting for a fence to become runnable from a fence is pending. This avoids problems if more than one fence can end up on the queue. The thread that took a fence off the queue is responsible for clearing the fence processing flag.
* | | | Merge topic 'cuda-default-runtime'Brad King2020-05-221-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d8eee80e30 Merge branch 'backport-cuda-default-runtime' into cuda-default-runtime e55b21e24e CUDA: Compute CMAKE_CUDA_RUNTIME_LIBRARY default from toolchain 1086e930dc CUDA: Propagate CMAKE_CUDA_RUNTIME_LIBRARY state to try_compile a4ea293153 Help: Correct CMAKE_CUDA_RUNTIME_LIBRARY applicability Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4762
| * \ \ \ Merge branch 'backport-cuda-default-runtime' into cuda-default-runtimeBrad King2020-05-221-0/+3
| |\ \ \ \
| | * | | | CUDA: Propagate CMAKE_CUDA_RUNTIME_LIBRARY state to try_compileRobert Maynard2020-05-201-0/+3
| | | | | |
| | * | | | Merge topic 'vs-sln-version' into release-3.17Brad King2020-05-201-0/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 88ad02f1ec VS: Restore .sln support for VS Version Selector Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4765
| | * \ \ \ \ Merge topic 'fix-ClearSourcesCache' into release-3.17Brad King2020-05-181-0/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a9f4f58f0c cmGeneratorTarget: Clear AllConfigSources in ClearSourcesCache Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4751
| | * \ \ \ \ \ Merge topic 'vs-pch-compile-opts' into release-3.17Brad King2020-05-121-1/+1
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b2fb4ffd2 VS: Fix using PCH from source with COMPILE_OPTIONS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4734
| | * \ \ \ \ \ \ Merge topic 'pch-reuse-multi' into release-3.17Brad King2020-05-081-1/+3
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7a1c7736cb PCH: Fix REUSE_FROM in multi-config generators Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4717
| | | * | | | | | | PCH: Fix REUSE_FROM in multi-config generatorsAndreas Schönle2020-05-071-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit a55df20499 (Multi-Ninja: Add precompile headers support, 2020-01-10, v3.17.0-rc1~136^2) the re-used PCH file object is added once for each configuration to flags used for all configurations. Put it in the flags for only the corresponding configuration instead. Fixes: #20680
* | | | | | | | | | CMake Nightly Date StampKitware Robot2020-05-221-1/+1
| |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | Merge topic 'multi-ninja-pch-msvc'Brad King2020-05-214-12/+28
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f6cb1e646c Multi-Ninja: Fix PCHs for Visual C++ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4771
| * | | | | | | | Multi-Ninja: Fix PCHs for Visual C++Cristian Adam2020-05-204-12/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20711
* | | | | | | | | Merge topic 'cmake_command_invoke_expand_function_name'Brad King2020-05-211-21/+51
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aa55587094 cmake_command: Expand INVOKE function name argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4750
| * | | | | | | | | cmake_command: Expand INVOKE function name argumentCristian Adam2020-05-191-21/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20707
* | | | | | | | | | CMake Nightly Date StampKitware Robot2020-05-211-1/+1
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge topic 'ccmake-check-width'Brad King2020-05-201-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3aede31cfc ccmake: Check that getmaxyx result width is non-negative Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4770
| * | | | | | | | | ccmake: Check that getmaxyx result width is non-negativeBrad King2020-05-191-1/+1
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise GCC 10.1 issues a `-Wstringop-overflow=` diagnostic when we use the width for indexing.
* | | | | | | | | Merge topic 'ctest-log-environment'Brad King2020-05-204-3/+40
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a1612af749 CTest: Log environment variables as a test measurement Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4760
| * | | | | | | | | CTest: Log environment variables as a test measurementKyle Edwards2020-05-194-3/+40
| | | | | | | | | |
* | | | | | | | | | Merge topic 'update-kwsys'Brad King2020-05-206-14/+91
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ef215b0851 cmFileCommand: Log cmsys::Glob warnings ef4d992b54 Merge branch 'upstream-KWSys' into update-kwsys 8fd4c19e1b KWSys 2020-05-18 (146f6b36) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4758
| * | | | | | | | | | cmFileCommand: Log cmsys::Glob warningsDmitry Kalinkin2020-05-191-4/+9
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2020-05-185-10/+82
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2020-05-18 (146f6b36)
* | | | | | | | | | Merge topic 'export-cmake-policy-version-range'Brad King2020-05-201-4/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ca24b70d31 Export: Specify a policy range in exported files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4755
| * | | | | | | | | | Export: Specify a policy range in exported filesCraig Scott2020-05-181-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should reduce policy-related warnings coming from the generated files, but in a way that doesn't increase the minimum CMake version for consumers. Relates: #20561
* | | | | | | | | | | Merge topic 'vs-sln-version'Brad King2020-05-201-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 88ad02f1ec VS: Restore .sln support for VS Version Selector Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4765
| * | | | | | | | | | VS: Restore .sln support for VS Version SelectorBrad King2020-05-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 3b51343ea1 (VS: Emit UTF-8 BOM for generated solution files, 2019-08-19, v3.16.0-rc1~237^2) the `.sln` file does not work with the VS Version Selector. Add a newline after the BOM to restore support. Fixes: #20725
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2020-05-201-1/+1
| |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge topic 'src-named-for-config'Brad King2020-05-1913-203/+177
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 70c85c1d6f Tests: Add case for source files named with CONFIG genex 3b547e2e4b VS: Simplify logic adding source file C/C++ language flag to MSVC 27ead9d4b7 VS: Compute managed type from an existing configuration 1222327c89 VS: Write custom commands for sources from all configurations 65fe58a4b4 cmVisualStudio10TargetGenerator: Adopt Windows Store and Phone infrastructure 3fa3b7a402 cmGeneratorTarget: Remove default config from Get* methods d6a88d2158 cmTarget: Replace "perConfig" constructor boolean with enum Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4761
| * | | | | | | | | | VS: Simplify logic adding source file C/C++ language flag to MSVCBrad King2020-05-181-21/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not add a target-wide language flag. We need a flag on an individual source file to explicitly specify the C or C++ language if and only if the source file extension does not imply it.
| * | | | | | | | | | VS: Compute managed type from an existing configurationBrad King2020-05-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not clear how multiple configurations should be handled here, but using an existing configuration is at least better than the empty configuration.
| * | | | | | | | | | VS: Write custom commands for sources from all configurationsBrad King2020-05-181-8/+14
| | | | | | | | | | |
| * | | | | | | | | | cmVisualStudio10TargetGenerator: Adopt Windows Store and Phone infrastructureBrad King2020-05-184-147/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move support for Resx, Xaml, Certificate, and AppManifest file handling out of cmGeneratorTarget.
| * | | | | | | | | | cmGeneratorTarget: Remove default config from Get* methodsBrad King2020-05-185-13/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure all call sites pass an explicit configuration.
| * | | | | | | | | | cmTarget: Replace "perConfig" constructor boolean with enumBrad King2020-05-186-13/+19
| | | | | | | | | | |
* | | | | | | | | | | Merge topic 'simplify_cmPropertyDefinitionMap'Brad King2020-05-197-116/+64
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6728f0fa85 cmPropertyDefinitionMap: simplify and shorten Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4753
| * | | | | | | | | | | cmPropertyDefinitionMap: simplify and shortenTushar Maheshwari2020-05-157-116/+64
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge topic 'add_test-special-chars-in-name'Brad King2020-05-191-7/+7
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f84af8e270 add_test: Allow special characters in test name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4754
| * | | | | | | | | | | add_test: Allow special characters in test nameDeniz Bahadir2020-05-171-7/+7
| | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #19391
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2020-05-191-1/+1
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge topic 'cuda-clang'Brad King2020-05-181-0/+14
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a653ca9504 Tests: Update CUDA tests to work with Clang 5df21adf46 CUDA: Add support for Clang compiler dc2eae1f91 FindCUDAToolkit: Factor out discovery code into a separate file 70be10cbf4 CUDA: Remove toolkit include dirs from implicit include dirs only with NVIDIA Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Artem Belevich <tra@google.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Acked-by: Axel Huebl <axel.huebl@plasma.ninja> Acked-by: friendnick <ikoval67@gmail.com> Acked-by: Patrik Huber <patrikhuber@gmail.com> Merge-request: !4442
| * | | | | | | | | | CUDA: Add support for Clang compilerRaul Tambre2020-05-151-0/+14
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When crosscompiling we pass the sysroot. We need to try various architecture flags. Clang doesn't automatically select one that works. First try the ones that are more likely to work for modern installations: * <=sm_50 is deprecated since CUDA 10.2, try sm_52 first for future compatibility. * <=sm_20 is removed since CUDA 9.0, try sm_30. Otherwise fallback to Clang's current default. Currently that's `sm_20`, the lowest it supports. Separable compilation isn't supported yet. Fixes: #16586
* | | | | | | | | | Merge topic 'fix-ClearSourcesCache'Brad King2020-05-181-0/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a9f4f58f0c cmGeneratorTarget: Clear AllConfigSources in ClearSourcesCache Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4751