summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'backport-cuda-default-runtime' into cuda-default-runtimeBrad King2020-05-2212-7/+66
|\
| * CUDA: Compute CMAKE_CUDA_RUNTIME_LIBRARY default from toolchainRobert Maynard2020-05-2110-6/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 0d0145138f (CUDA: Add abstraction for cuda runtime selection, 2019-11-29, v3.17.0-rc1~83^2) we add CUDA runtime library selection flags by default. To maintain backwards compatibility the default CUDA runtime library needs to be computed based on what libraries are found on the initial compiler invocation. For example a toolchain could establish initial flags that have all CUDA compilations using the runtime version, and if we don't detect this we will try to link to both the static and shared runtime. Co-Author: Brad King <brad.king@kitware.com> Fixes: #20708
| * CUDA: Propagate CMAKE_CUDA_RUNTIME_LIBRARY state to try_compileRobert Maynard2020-05-202-0/+4
| |
| * Help: Correct CMAKE_CUDA_RUNTIME_LIBRARY applicabilityRobert Maynard2020-05-201-1/+1
| |
* | Merge topic 'cuda-test-nvcc-restore'Brad King2020-05-205-5/+5
|\ \ | | | | | | | | | | | | | | | | | | 4c7cc264af Tests: Restore NVCC-specific CUDA tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4768
| * | Tests: Restore NVCC-specific CUDA testsBrad King2020-05-205-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit a653ca9504 (Tests: Update CUDA tests to work with Clang, 2020-03-27) some tests were conditioned using `CMAKE_CUDA_COMPILER_ID`. That is not defined when configuring CMake itself, so it accidentally turned off NVCC-specific CUDA tests altogether. Convert the conditions to check `CMake_TEST_CUDA` for `Clang` instead. That option is added explicitly to builds where we want the tests to run, so we can set it to a value indicating the CUDA compiler vendor. In commit a653ca9504 (Tests: Update CUDA tests to work with Clang, 2020-03-27) the NVCC-specific `CudaOnly.GPUDebugFlag` test was accidentally broken by removing a space when appending `-G` to the CUDA flags. This was covered by the test not running. Restore the space. Fixes: #20727
* | | Merge topic 'doc-find_package-xref'Brad King2020-05-201-6/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | bc735062df Help: Improve formatting and cross-references for find_package() Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Merge-request: !4772
| * | | Help: Improve formatting and cross-references for find_package()Craig Scott2020-05-201-6/+6
| | | |
* | | | 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-2010-3/+88
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1910-3/+88
| | | | | |
* | | | | | 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)
| | * | | | | | KWSys 2020-05-18 (146f6b36)KWSys Upstream2020-05-185-10/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 146f6b36442dec7a3315f5bfc4e3d71ffa943e53 (master). Upstream Shortlog ----------------- Brad King (2): e093a985 Glob: Append warning message only if destination is non-null 25775078 Glob: Do not warn if top-level directory does not exist Dmitry Kalinkin (3): 9a3f9799 Directory: implement error reporting f33ef4e3 Glob: issue warnings on Directory errors 97f880e6 Directory: add extra tests involving errorMessage
* | | | | | | | 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 branch 'release-3.16'Brad King2020-05-200-0/+0
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'vs-sln-version' into release-3.16Brad King2020-05-191-0/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4765
* | \ \ \ \ \ \ \ \ \ Merge branch 'release-3.17'Brad King2020-05-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | 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 '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
* | | | | | | | | | Merge topic 'doc-CMAKE_SYSTEM_PREFIX_PATH'Craig Scott2020-05-205-1/+49
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b3d8f281e Document which environment variables effect CMAKE_SYSTEM_PREFIX_PATH Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4748
| * | | | | | | | | | Document which environment variables effect CMAKE_SYSTEM_PREFIX_PATHRobert Maynard2020-05-195-1/+49
| | | | | | | | | | |
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2020-05-201-1/+1
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
* | | | | | | | | | Merge topic 'src-named-for-config'Brad King2020-05-1914-203/+184
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | Tests: Add case for source files named with CONFIG genexBrad King2020-05-181-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is now expected to work on all generators where the test runs. Recent ancestors of this commit fix the Visual Studio generator. Fixes: #20648
| * | | | | | | | | | 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-198-117/+64
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6728f0fa85 cmPropertyDefinitionMap: simplify and shorten Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4753
| * | | | | | | | | | | cmPropertyDefinitionMap: simplify and shortenTushar Maheshwari2020-05-158-117/+64
| | | | | | | | | | | |
* | | | | | | | | | | | Merge topic 'FindHDF5-cleanup'Brad King2020-05-191-232/+244
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8fa58aea77 FindHDF5: Clean variables and output Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4759
| * | | | | | | | | | | | FindHDF5: Clean variables and outputSeth R Johnson2020-05-181-232/+244
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The module's functionality is preserved. Perform cleanups: - Format some functions - Change macros to functions - Fix return value check from execute_process - Hide status messages unless HDF5_FIND_DEBUG is enabled - Normalize TRUE/FALSE capitalization Fixes: #20718
* | | | | | | | | | | | | Merge topic 'add_test-special-chars-in-name'Brad King2020-05-1958-15/+383
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1758-15/+383
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #19391
* | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2020-05-191-1/+1
| |_|_|/ / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge topic 'fetchcontent-SOURCE_SUBDIR'Brad King2020-05-185-14/+81
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 592085b94b FetchContent: Add support for SOURCE_SUBDIR Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4757
| * | | | | | | | | | | FetchContent: Add support for SOURCE_SUBDIRCraig Scott2020-05-165-14/+81
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | Fixes: #19875
* | | | | | | | | | | Merge topic 'cuda-clang'Brad King2020-05-1824-299/+444
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | Tests: Update CUDA tests to work with ClangRaul Tambre2020-05-1512-48/+70
| | | | | | | | | | | |
| * | | | | | | | | | | CUDA: Add support for Clang compilerRaul Tambre2020-05-1510-23/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | FindCUDAToolkit: Factor out discovery code into a separate fileRaul Tambre2020-05-152-218/+233
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows for re-use in other parts of the code, that require the CUDA toolkit location, but can't or may not want to use the full `FindCUDAToolkit`.
| * | | | | | | | | | | CUDA: Remove toolkit include dirs from implicit include dirs only with NVIDIABrad King2020-05-151-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The special case added by commit 87df637078 (CUDA: Do not treat CUDA toolkit include directories as implicit, 2020-02-02, v3.17.0-rc1~31^2) breaks CMake's protections against changing the compiler's implicit include directory order. Do this only for the NVIDIA compiler where it is needed as a workaround to another problem. That compiler does not put the host compiler's implicit include directories in `-I` paths so we do not detect them as `CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES` anyway.
* | | | | | | | | | | | Merge topic 'compile_opts'Brad King2020-05-183-5/+21
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 448e2d7a9d Help: Provide cross-references between compiler settings 1f697b3991 Help: COMPILE_OPTIONS: bundle cross refs, add example Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4749
generated by cgit v0.12 at 2025-03-05 18:19:58 (GMT)