summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* BundleUtilities: do not run install_name_tool on scriptsT.J. Corona2020-07-281-5/+10
| | | | | Use the same approach as commit 08be74bfd7 (GetPrerequisites: Fix handling of executable scripts, 2018-12-16, v3.14.0-rc1~206^2).
* Merge topic 'externalproject-download-git-2.20-fix'Brad King2020-07-271-1/+5
|\ | | | | | | | | | | | | 8dbefc3ca6 ExternalProject: omit --no-checkout from git clone when using git 2.20.x. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5054
| * ExternalProject: omit --no-checkout from git clone when using git 2.20.x.Nate Avers2020-07-241-1/+5
| | | | | | | | | | | | | | | | | | The optimization from commit 627fc5b44f (ExternalProject: Avoid unnecessary checkout on clone, 2019-07-29, v3.16.0-rc1~325^2) triggers a bug in the Git 2.20.x series that is not in older or newer versions. Drop the optimization for that specific range of Git versions. Fixes: #21009
* | Merge topic 'FindXalanC-1.12'Brad King2020-07-271-3/+3
|\ \ | | | | | | | | | | | | | | | | | | 4bf102418b FindXalanC: Fix version parsing for XalanC 1.12 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5056
| * | FindXalanC: Fix version parsing for XalanC 1.12Brad King2020-07-241-3/+3
| |/ | | | | | | | | | | The version header now puts parentheses around the components. Fixes: #21010
* | Merge topic 'pgi-no-A'Brad King2020-07-231-4/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | 52eee19389 PGI: Remove -A from the C++ flags we use when CXX_EXTENSIONS is OFF Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Chuck Atkins <chuck.atkins@kitware.com> Merge-request: !5025
| * | PGI: Remove -A from the C++ flags we use when CXX_EXTENSIONS is OFFTin Huynh2020-07-221-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 9b97cb5562 (PGI: Add language standards for PGI, 2017-05-01, v3.9.0-rc1~174^2), we have passed the `-A` flag to the PGI C++ compiler when specifying a C++ standard flag with compiler extensions turned off. The flag is not meant for that. The PGI C++ standard flags do not turn extensions on by default and have a separate `--gnu_extensions` flag for that which we already use when CXX_EXTENSIONS is ON. Simply drop the `-A` flag. Fixes: #20997
* | | Merge topic 'fix-typos-identified-using-codespell'Brad King2020-07-2326-40/+40
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 207373802e Fix typos identified using codespell Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5040
| * | | Fix typos identified using codespellJean-Christophe Fillion-Robin2020-07-2226-40/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/codespell-project/codespell#readme The following command was used: ``` codespell -q6 --skip="\ .git,\ *.json,\ ./Copyright.txt,\ ./Help/command/foreach.rst,\ ./Help/prop_test/REQUIRED_FILES.rst,\ ./Help/variable/CTEST_COVERAGE_COMMAND.rst,\ ./Modules/CMakeCheckCompilerFlagCommonPatterns.cmake,\ ./Modules/CMakeRCInformation.cmake,\ ./Modules/Internal/CPack/NSIS.template.in,\ ./Modules/FindMatlab.cmake,\ ./Modules/MatlabTestsRedirect.cmake,\ ./Modules/Platform/Windows-Clang.cmake,\ ./Modules/Platform/Windows-Intel-Fortran.cmake,\ ./Modules/Platform/Windows-MSVC.cmake,\ ./Source/CMakeVersion.cmake,\ ./Source/cmConvertMSBuildXMLToJSON.py,\ ./Source/cmCreateTestSourceList.cxx,\ ./Source/cmGlobalVisualStudio10Generator.cxx,\ ./Source/cmExportBuildFileGenerator.cxx,\ ./Source/cmExportInstallAndroidMKGenerator.cxx,\ ./Source/cmExportInstallFileGenerator.cxx,\ ./Source/cmExportSet.cxx,\ ./Source/cmExportTryCompileFileGenerator.cxx,\ ./Source/cmFindPackageCommand.cxx,\ ./Source/cmInstallCommand.cxx,\ ./Source/cmGeneratorExpressionLexer.cxx,\ ./Source/cmLocalVisualStudio7Generator.cxx,\ ./Source/cmOrderDirectories.cxx,\ ./Source/cmTarget.cxx,\ ./Source/kwsys/*,\ ./Source/QtDialog/CMakeSetupDialog.ui,\ ./Source/CPack/WiX/cmWIXRichTextFormatWriter.cxx,\ ./Source/CTest/cmParseCoberturaCoverage.h,\ ./Tests/CMakeTests/ImplicitLinkInfoTest.cmake.in,\ ./Tests/RunCMake/CPack/tests/DMG_SLA/English.license.rtf,\ ./Tests/RunCMake/CPack/tests/DMG_SLA/German.license.txt,\ ./Tests/RunCMake/CPack/tests/DMG_SLA/German.menu.txt,\ ./Tests/RunCMake/GoogleTest/xml_output.cpp,\ ./Tests/RunCMake/Make/TargetMessages*,\ ./Utilities/*,\ " \ -L "\ dependees,\ endwhile,\ fo,\ filetest,\ helpfull,\ nd,\ objext,\ stoll,\ supercedes,\ superceded,\ vas,\ varn,\ " ```
* | | | Merge topic 'CheckTypeSize-std-types'Brad King2020-07-231-18/+36
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 7f786c6a40 Tests: Cover CheckTypeSize with uint8_t and std::uint8_t 371072e9e1 CheckTypeSize: Use C++-style headers to check for std:: types Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5008
| * | | CheckTypeSize: Use C++-style headers to check for std:: typesAiden Woodruff2020-07-201-18/+36
| | | | | | | | | | | | | | | | | | | | In order to check for types like `std::uint8_t` in C++, we need to include `<cstdint>` instead of `<stdint.h>`.
* | | | Merge topic 'xcode-native-arch'Craig Scott2020-07-212-0/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 26673bf480 Xcode: Explicitly specify default native architecture on macOS ce624cfbd4 cmGlobalXCodeGenerator: Save CMAKE_SYSTEM_NAME in member Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5023
| * | | | Xcode: Explicitly specify default native architecture on macOSBrad King2020-07-202-0/+7
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `CMAKE_OSX_ARCHITECTURES` is not specified, we add the Xcode setting `ONLY_ACTIVE_ARCH = YES` with the intention of targeting the native architecture of the host. However, the default `ARCHS` value chosen by "Xcode 12 Universal Apps" includes multiple architectures. Add an explicit `ARCHS` setting with value `$(NATIVE_ARCH_ACTUAL)` to tell Xcode to use the host's native architecture only. Fixes: #20893
* | | | FindX11: Add Xaw librariesKurt Sansom2020-07-161-0/+19
| |_|/ |/| | | | | | | | Fixes: #20963
* | | Merge topic 'macOS-sdk-latest'Brad King2020-07-161-21/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 17e13fb6d0 macOS: Always pick latest SDK if user has not set one explicitly Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5012
| * | | macOS: Always pick latest SDK if user has not set one explicitlyTor Arne Vestbø2020-07-141-21/+12
| | |/ | |/| | | | | | | | | | | | | | | | Apple tech note QA1806 recommends always building against the latest SDK. Fixes: #20949
* | | Merge topic 'compi-ti-improvements'Brad King2020-07-155-38/+64
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 98fea8205e Compiler/TI: Avoid response file usage for linker 5dec322f33 Compiler/TI: Add compiler flags to linker 763b44e519 Compiler/TI: Avoid usage of ranlib ef528f10bf Compiler/TI: Sync ASM settings to C/CXX a548a52230 Compiler/TI: Refactor C/CXX to use a common file 195aa488e3 Compiler/TI: Detect architecture Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5010
| * | | Compiler/TI: Avoid response file usage for linkerJosef Angstenberger2020-07-141-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The object and library files have to be listed after the `--run-linker` flag. But after this flag the `--cmd_file` flag for response files cannot be used any more. Putting the whole command line into a response file would work, but this is not supported by CMake (yet).
| * | | Compiler/TI: Add compiler flags to linkerJosef Angstenberger2020-07-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By adding the compiler flags via `<FLAGS>` to the linker call, the linker can decide which default library to use. CMake replaces `<FLAGS>` by the content of `CMAKE_<LANG>_FLAGS`. So any relevant flag needs to be defined in this variable, preferably in a toolchain file. The compiler flags have to be specified before the `--run_linker` flag and the linker flags afterwards. Replaces Merge-request !4890
| * | | Compiler/TI: Avoid usage of ranlibJosef Angstenberger2020-07-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a ranlib executable has been found it is used for finishing an archive. In case of the TI compiler the archive file gets corrupted. Fixes: #14876
| * | | Compiler/TI: Sync ASM settings to C/CXXJosef Angstenberger2020-07-141-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | For assembler the same compiler executable is used as for C/CXX. So the setting shall be kept in sync.
| * | | Compiler/TI: Refactor C/CXX to use a common fileJosef Angstenberger2020-07-143-31/+39
| | | |
| * | | Compiler/TI: Detect architectureJosef Angstenberger2020-07-141-1/+18
| |/ /
* | | Merge topic 'nvcc_host'Brad King2020-07-151-2/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | ff086f066b NVCC: Handle host compiler with spaces in path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5019
| * | NVCC: Handle host compiler with spaces in pathRaul Tambre2020-07-141-2/+2
| | | | | | | | | | | | | | | | | | | | | Need to surround it with quotes otherwise the different bits are passed as separate arguments. Fixes #20954.
| * | Merge topic 'irsl-intel-ia32' into release-3.18Brad King2020-07-101-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | f332ce12d6 IRSL: Fix path to Intel 32-bit redist libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4995
| * \ \ Merge topic 'FindOpenMP-version' into release-3.18Brad King2020-07-101-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 656d6ea821 FindOpenMP: Set version variables every time CMake runs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4996
| * \ \ \ Merge topic 'FindJava-no-macos-stub' into release-3.18Brad King2020-07-091-3/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e8051b1f20 FindJava: Update check to avoid accepting macOS stub 'java' as Java Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4993
| * \ \ \ \ Merge topic 'cuda-11-ptx-arch' into release-3.18Brad King2020-07-091-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8707178c1c FindCUDA/select_compute_arch: generate PTX for the latest architecture Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4991
| * \ \ \ \ \ Merge topic 'doc-CPack-source-package' into release-3.18Brad King2020-07-091-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f8b7acaf90 Help: Fix CPack module docs on config file for source package Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4985
| * \ \ \ \ \ \ Merge topic 'FindMPI-nvcc-link-pthread' into release-3.18Brad King2020-07-081-0/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 33192e1b5f FindMPI: Pass -pthread to NVCC through -Xlinker for device linking Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4981
* | | | | | | | | Help: Document CMAKE_CUDA_HOST_COMPILER as specific to NVIDIA nvccBrad King2020-07-141-1/+1
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain the purpose of this variable and the conditions under which it can be set. Point out that it should not be set explicitly without also setting `CMAKE_CUDA_COMPILER` explicitly. Issue: #20826
* | | | | | | | Merge topic 'irsl-intel-ia32'Brad King2020-07-101-1/+1
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f332ce12d6 IRSL: Fix path to Intel 32-bit redist libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4995
| * | | | | | | IRSL: Fix path to Intel 32-bit redist librariesTorgeir Rusten2020-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The path to the 32 bit libraries in the Intel windows/redist folder use ia32. I don't remember if this has changed at some point, but ia32 has been used at least since Intel Fortran XE 2018.
* | | | | | | | Merge topic 'FindOpenMP-version'Brad King2020-07-101-1/+1
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 656d6ea821 FindOpenMP: Set version variables every time CMake runs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4996
| * | | | | | | FindOpenMP: Set version variables every time CMake runsBrad King2020-07-091-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The version is determined in two steps. First, the "spec date" is detected and cached. Second, the date is converted to a version. Move the second step out of the spec date cache guard condition so that it runs every time even if the spec date is already cached. Fixes: #19150
* | | | | | | Merge topic 'FindMatlab-unknown-version'Brad King2020-07-091-1/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a3c389cb17 FindMatlab: set MATLAB_DEFAULT_RELEASE for unknown version Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4986
| * | | | | | | FindMatlab: set MATLAB_DEFAULT_RELEASE for unknown versionAlexey Kreschuk2020-07-081-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An "unknown" version does not always mean an old version. Setting this macro by mistake does not result in a compilation error, but not setting it does. I had this error when compiling from a user that does not have a matlab license.
* | | | | | | | Merge topic 'cpack2'Brad King2020-07-091-3/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ca9bd43f2d Help: Duplicate essential information on install paths in CPack. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4987
| * | | | | | | | Help: Duplicate essential information on install paths in CPack.Joachim Wuttke (h)2020-07-081-3/+7
| | | | | | | | |
* | | | | | | | | Merge topic 'FindJava-no-macos-stub'Brad King2020-07-091-3/+2
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e8051b1f20 FindJava: Update check to avoid accepting macOS stub 'java' as Java Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4993
| * | | | | | | | FindJava: Update check to avoid accepting macOS stub 'java' as JavaBrad King2020-07-081-3/+2
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit dd378258f1 (FindJava: Do not accept OS X stub 'java' as Java, 2014-10-24, v3.1.0-rc3~29^2) we try to avoid using the macOS `/usr/bin/java` stub if no underlying implementation of Java is actually installed. However, the message that `/usr/bin/java` prints when there is no Java available has changed since then. Update our check to also look for the new message. While at it, revise the way we suppress `Java_JAVA_EXECUTABLE`. Previously we set its cache entry to `Java_JAVA_EXECUTABLE-NOTFOUND`, but that would cause the same find-and-reject sequence to be followed every time CMake runs in a build tree. Instead, use the approach from commit 2c0db404d1 (FindSubversion: Do not accept macOS stub without Xcode implementation, 2020-05-28, v3.18.0-rc1~67^2). Leave the cache entry alone and just set a normal variable of the same name to hide it.
* | | | | | | | Merge topic 'cuda-11-ptx-arch'Brad King2020-07-091-2/+2
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8707178c1c FindCUDA/select_compute_arch: generate PTX for the latest architecture Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4991
| * | | | | | | FindCUDA/select_compute_arch: generate PTX for the latest architecturezasdfg bnm2020-07-081-2/+2
| | |_|_|/ / / | |/| | | | |
| * | | | | | Merge topic 'cuda-11-compute-arch' into release-3.18Brad King2020-07-081-7/+27
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 295d1b9cb5 FindCUDA/select_compute_arch: Add CUDA 11 and Ampere support Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Axel Huebl <axel.huebl@plasma.ninja> Acked-by: Tobias Ribizel <ribizel@kit.edu> Acked-by: Henry Schreiner <henryschreineriii@gmail.com> Merge-request: !4979
| * \ \ \ \ \ \ Merge topic 'find-blas-lapack-mklroot-win' into release-3.18Brad King2020-07-082-2/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 196f042b58 FindLAPACK: Handle Windows Intel MKLROOT with backslash 96c19ecd55 FindBLAS: Handle Windows Intel MKLROOT with backslash Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4982
* | \ \ \ \ \ \ \ Merge topic 'doc-CPack-source-package'Brad King2020-07-091-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | f8b7acaf90 Help: Fix CPack module docs on config file for source package Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4985
| * | | | | | | Help: Fix CPack module docs on config file for source packageJoachim Wuttke (h)2020-07-081-1/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge topic 'FindMPI-nvcc-link-pthread'Brad King2020-07-081-0/+2
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 33192e1b5f FindMPI: Pass -pthread to NVCC through -Xlinker for device linking Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4981
| * | | | | | FindMPI: Pass -pthread to NVCC through -Xlinker for device linkingRobert Maynard2020-07-071-0/+2
| | |/ / / / | |/| | | | | | | | | | | | | | | | Fixes: #20924