summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* ExternalProject: Improve robustness of update stepCraig Scott2021-01-281-172/+233
| | | | | | | | | | | | | | | | | | Refactor the update logic to make it easier to follow. The following fixes/improvements are some consequences of this change: * Absorb a confusing git checkout failure message when the failure is allowed and we act on that failure appropriately. * Fix an unnecessary fetch in some scenarios when checking out a git hash we already have locally. * Stash and restore any local changes even when not rebasing. * Avoid unsafe rebasing where we are not on a branch that is already tracking the requested branch. * When fetching, use --tags --force to ensure we get all the tags and commits leading up to them regardless of whether the tags are on branches or not. Also update our local tags if they move on the remote. Fixes: #20677
* ExternalProject: Prevent the noisy detached head messages on checkoutCraig Scott2021-01-281-0/+4
| | | | | | When checking out a specific commit by its git hash, git will output a very noisy message about checking out a detached HEAD. This is not particularly helpful for us here and makes the output overall quite verbose. Add a git config setting to prevent it.
* FindOpenMP: Add support for NVHPC compilerTin Huynh2021-01-271-0/+1
|
* FindOpenACC: Add support for NVHPC compilerTin Huynh2021-01-271-1/+4
|
* GenerateExportHeader: Add support for NVHPC compilerBrad King2021-01-271-2/+2
| | | | Treat it just like PGI.
* NVHPC: Add support for NVIDIA HPC SDK compilers based on PGITin Huynh2021-01-2711-0/+72
| | | | | | | Identify the compilers as `NVHPC` to distinguish it from the older PGI compilers from which they evolved, and from other `NVIDIA` compilers. Fixes: #20887
* CPack: add CPACK_THREADS variable to control compression threadsRodolfo Lima2021-01-261-0/+23
| | | | | | | This allows setting how many threads the compressor will use. Currently only implemented for XZ when using system's lzma library. Fixes: #21715
* Merge topic 'irsl-msvc-arm64'Brad King2021-01-261-7/+9
|\ | | | | | | | | | | | | 9c5cf0c1af IRSL: Add support for non-x86/x64 architectures such as arm64 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5733
| * IRSL: Add support for non-x86/x64 architectures such as arm64pastdue2021-01-251-7/+9
| | | | | | | | | | | | Implement `CMAKE_MSVC_ARCH` determination for more architectures. Fixes: #16734
* | Merge topic 'intel-fortran-nofor-main'Brad King2021-01-251-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 2a5955ac09 Intel: Replace deprecated Fortran flag -nofor_main with -nofor-main Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5729
| * | Intel: Replace deprecated Fortran flag -nofor_main with -nofor-mainBrad King2021-01-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `-nofor_main` flag was originally added by commit ccdd3e943d (Fix Intel Fortran SHARED libraries on Linux, 2009-10-27, v2.8.2~915). Since then, Intel Fortran renamed the option to `-nofor-main` and deprecated the old name. The new name has been available for a long time, so we can just switch to it. Fixes: #21735
| * | Merge topic 'FindHDF5-silence-output' into release-3.19Brad King2021-01-211-3/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | b924669385 FindHDF5: silence STATUS messages when found with QUIET 2439a048b0 FindHDF5: avoid writing to the output when testing h5cc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5722
* | \ \ Merge topic 'cpack-deb-shlibdeps-private-search-dirs'Brad King2021-01-251-2/+15
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | d586a4ad60 CPackDeb: dpkg-shlibdeps now supports searching for private shared libs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5718
| * | | CPackDeb: dpkg-shlibdeps now supports searching for private shared libsDeniz Bahadir2021-01-221-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new CPack variable `CPACK_DEBIAN_PACKAGE_SHLIBDEPS_PRIVATE_DIRS` can be set to a list of directories. If `CPACK_DEBIAN_PACKAGE_SHLIBDEPS` or `CPACK_DEBIAN_<component>_PACKAGE_SHLIBDEPS` are set to `ON` these directories will be searched by `dpkg-shlibdeps` in order to find private shared library dependencies of the libraries/executables that shall be packed.
* | | | Merge topic 'SWIG-dependencies'Brad King2021-01-221-16/+61
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 89b01b04fa UseSWIG: use swig tool to generate dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5724
| * | | | UseSWIG: use swig tool to generate dependenciesMarc Chevrier2021-01-211-16/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add_custom_command() supports option DEPFILE when generator is Makefiles or Ninja. And swig tool is able to generate a dependencies file which is compatible with DEPFILE option.
* | | | | Merge topic 'msvc-arm64ec-platform-support'Brad King2021-01-222-3/+18
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | 4ea3a88625 MSVC: Add support for targeting ARM64EC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5708
| * | | | MSVC: Add support for targeting ARM64ECMoyo Okeremi 😊2021-01-212-3/+18
| | | | |
* | | | | Merge topic 'FindGit-cache-version'Brad King2021-01-214-15/+69
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 76fdeb6d13 Tests: FindGit already provides the git version, re-use it 315a200f0c FindGit: Cache the GIT_EXECUTABLE version for the current run Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5712
| * | | | | FindGit: Cache the GIT_EXECUTABLE version for the current runCraig Scott2021-01-194-15/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The git version should not change while CMake is running. When using FetchContent with many dependencies, the repeated calls to get the git version every time ExternalProject is used can be measurable on some platforms. This commit queries that version only once and then caches it in a global property for the rest of that run. The git version can still safely change between runs because it is not cached, only the GIT_EXECUTABLE location is cached. Relates: #21703
* | | | | | Merge topic 'cuda-archs'Brad King2021-01-211-46/+43
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 92854bf29e CUDA: Update arch selection, restructure for maintainability a58a572459 CUDA: Add arch selection debug mode to print out CUDA versions Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Raul Tambre <raul@tambre.ee> Merge-request: !5719
| * | | | | | CUDA: Update arch selection, restructure for maintainabilityHenry Schreiner2021-01-201-46/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21712
| * | | | | | CUDA: Add arch selection debug mode to print out CUDA versionsHenry Schreiner2021-01-201-0/+11
| | |_|/ / / | |/| | | |
* | | | | | Merge topic 'FindHDF5-silence-output'Brad King2021-01-211-3/+5
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b924669385 FindHDF5: silence STATUS messages when found with QUIET 2439a048b0 FindHDF5: avoid writing to the output when testing h5cc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5722
| * | | | | FindHDF5: silence STATUS messages when found with QUIETBen Boeckel2021-01-201-3/+3
| | | | | |
| * | | | | FindHDF5: avoid writing to the output when testing h5ccBen Boeckel2021-01-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The execution of this tool can output error logs to the output during configure. This can then be caught by CTest and flagged as an error during the build.
* | | | | | Merge topic 'macos-include-weak-dependencies'Brad King2021-01-211-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | / | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | 7e615a540e file(GET_RUNTIME_DEPENDENCIES): Fix weak macOS libraries not detected f2d92b983b GetPrerequisites: Include weak macOS dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5703
| * | | | GetPrerequisites: Include weak macOS dependenciesBianca van Schaik2021-01-201-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Starting with Clang 12, `otool -L` adds `, weak` to weakly linked libraries. Update GetPrerequisites to recognize these. Issue: #21684
* | | | Merge topic 'ep-stash-options'Brad King2021-01-181-4/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ac4a8002a5 ExternalProject: Don't git stash ignored files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5390
| * | | | ExternalProject: Don't git stash ignored filesCraig Scott2021-01-161-4/+7
| | |/ / | |/| | | | | | | | | | | | | | | | | | The change to the binary gitrepo.tgz file adds a commit which adds a .gitignore file. Fixes: #21278
* | | | Merge topic 'FindPostgreSQL-server-component'Brad King2021-01-181-1/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8b066f1a65 FindPostgreSQL: Add server component Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !5680
| * | | | FindPostgreSQL: Add server componentAlexey Edelev2021-01-151-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Require the server-specific artifacts only if the Server component is requested. Issue: #17223
* | | | | Merge topic 'irsl-msvcp_atomic_wait_dll'Brad King2021-01-181-0/+2
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | | | | | | | | 6718caaa2f IRSL: Install msvcp${v}${d}_atomic_wait.dll if available with CRT Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5702
| * | | IRSL: Install msvcp${v}${d}_atomic_wait.dll if available with CRTKelly Walker2021-01-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | VS now distributes these additional runtime libraries. Install them if available. Fixes: #21675
| * | | Merge topic 'FindHDF5-dbg-and-rel' into release-3.19Brad King2021-01-061-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5267ba9d63 FindHDF5: Fix finding both debug and release libs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5653
* | \ \ \ Merge topic 'FindLAPACK-pkgconfig'Brad King2021-01-151-16/+42
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d21ad02d44 FindLAPACK: Add pkgconfig support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5696
| * | | | | FindLAPACK: Add pkgconfig supportFlorent Pruvost2021-01-141-16/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - mimic FindBLAS Fixes: #21700
* | | | | | Merge topic 'FindHDF5-no-dedup-keywords'Brad King2021-01-151-28/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a5fe1712b2 FindHDF5: Remove unnecessary de-duplication of HDF5_LIBRARIES and friends dadb13f546 FindHDF5: Simplify preprocessor setting de-duplication Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5692
| * | | | | FindHDF5: Remove unnecessary de-duplication of HDF5_LIBRARIES and friendsKris Thielemans2021-01-121-22/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * When both debug and optimized libraries are found, the corresponding keywords were getting de-duplicated and breaking. * CMake's link line generation de-duplicates in many cases anyway. * Other find modules do not explicitly de-duplicate in general. Fixes: #21670
| * | | | | FindHDF5: Simplify preprocessor setting de-duplicationBrad King2021-01-121-6/+6
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Use `list(REMOVE_DUPLICATES)` directly. For definitions the order doesn't matter. For include directories it is better to remove late duplicates than early duplicates.
* | | | | Merge topic 'ExternalProject-configure-handled-by-build'Brad King2021-01-131-12/+44
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7155e358c9 ExternalProject: Add CONFIGURE_HANDLED_BY_BUILD option Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5626
| * | | | | ExternalProject: Add CONFIGURE_HANDLED_BY_BUILD optionDaan De Meyer2021-01-121-12/+44
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #21592.
* | | | | | Merge topic 'detect_corresponding_binutils_version'Brad King2021-01-134-51/+61
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b12aec6c8d BinUtils: prefer bin utils matching the compiler version extension Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5606
| * | | | | | BinUtils: prefer bin utils matching the compiler version extensionThomas Bernard2021-01-114-51/+61
| | |/ / / / | |/| | | |
* | | | | | Merge topic 'FindHDF5docfix'Brad King2021-01-121-9/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eec3b775a7 FindHDF5: List imported targets in debug output 186b0f8131 FindHDF5: correct and describe list of imported target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5684
| * | | | | | FindHDF5: List imported targets in debug outputKris Thielemans2021-01-111-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If HDF5_FIND_DEBUG, list all targets that are defined (from either FindHDF5.cmake or the hdf5-config.cmake).
| * | | | | | FindHDF5: correct and describe list of imported targetKris Thielemans2021-01-111-9/+16
| | | | | | |
* | | | | | | Merge topic 'FindJPEG-turbo'Brad King2021-01-121-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 74cc2e3326 FindJPEG: Search for 'turbojpeg' and 'turbojpeg-static' too Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5683
| * | | | | | | FindJPEG: Search for 'turbojpeg' and 'turbojpeg-static' tooMiguel Medalha2021-01-111-1/+1
| |/ / / / / /
* | | | | | | Merge topic 'cuda-nvcc-ccache-symlink'Brad King2021-01-123-3/+41
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fb2afef620 CUDA: Support nvcc symlinking to ccache Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Tested-by: Raul Tambre <raul@tambre.ee> Merge-request: !5620