summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'clang-msvc-cxx-std'Brad King2020-07-301-5/+5
|\ | | | | | | | | | | | | | | 21e497fe63 Clang: Fix fallback compile features when simulating old MSVC versions Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !5082
| * Clang: Fix fallback compile features when simulating old MSVC versionsBrad King2020-07-291-5/+5
| | | | | | | | | | | | | | | | Refactoring in commit 25439c7d62 (Clang: Refactor CXX standard flags into __compiler_clang_cxx_standards(), 2020-03-16, v3.18.0-rc1~362^2~4) accidentally broke the `cxx_std_*` fallback feature names. Issue: #21033
* | Merge topic 'GoogleTest-fix-generated-include'Brad King2020-07-301-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 832858195e GoogleTest: Fix include path in the generated file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5063
| * | GoogleTest: Fix include path in the generated fileAdam Badura2020-07-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The generated ..._include.cmake file contained an inclusion of GoogleTestAddTests without any path. In general, this is a good approach since it enables to correctly catch possibly user-customized files. However, in this case, it didn’t work this way since the ..._include.cmake file is evaluated by a separate CMake call under a custom command. Because of this, the CMAKE_MODULE_PATH is not set as expected by the user and the said inclusion catches CMake own version of the module rather than the possibly user-customized one. This change fixes this by making the inclusion with an absolute path determined upon the ..._include.cmake file generation.
* | | Merge topic 'fixup_bundle_item-fix'Brad King2020-07-291-5/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 45ed314bff BundleUtilities: do not run install_name_tool on scripts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5071
| * | | 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 'use_COMPILER_TARGET_to_set_architecture_for_clang_cl'Brad King2020-07-293-1/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 270e0d9c4d Detect the correct target architecture for clang compilers. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5058
| * | | | Detect the correct target architecture for clang compilers.Thomas Bernard2020-07-283-1/+12
| |/ / / | | | | | | | | | | | | | | | | | | | | During compiler identification, if CMAKE_{C,CXX}_COMPILER_TARGET is defined, the corresponding clang target flag is used to guaranty proper target architecture detection.
* | | | Merge topic 'FindCURL-list-index-if'Brad King2020-07-291-3/+3
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | 0faedae335 FindCURL: Fix list index check after search Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5070
| * | | FindCURL: Fix list index check after searchMike Gelfand2020-07-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix logic added by commit fc5afbe970 (FindCURL: support COMPONENTS to check features, 2018-11-28, v3.14.0-rc1~287^2~2). When searching for particular components and `curl-config` reports one of the components being searched for first in the list, `find_package` fails. This is due to the check that treats non-zero index in the list as success and zero index as failure, while documentation on `list(FIND)` states that failure to find an element results in return value of -1 (not 0). I'm hitting this when building cURL with support for HTTP and HTTPS protocols only, and then trying to `find_package(CURL COMPONENTS HTTP HTTPS)`. I'm using `if(NOT x EQUAL -1)` check form as it appears to be the most used throughout the modules. While fixing this issue I've looked through all the uses of `list(FIND)` in other modules but wasn't able to find improper use except here.
* | | | Merge topic 'sysroot-prefix'Brad King2020-07-281-1/+3
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | | | | | | e67d9c6e31 Compilers: Ignore -print-sysroot prefix when it is '/' Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5066
| * | Compilers: Ignore -print-sysroot prefix when it is '/'Brad King2020-07-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 8cc384f629 (Compilers: Add paths from -print-sysroot to system prefix path, 2020-03-25, v3.18.0-rc1~337^2) we prepend the compiler's sysroot to `CMAKE_SYSTEM_PREFIX_PATH`. This does not make sense when the prefix is just `/`, such as on Ubuntu 16.04's system compiler. Fixes: #21019
| * | Merge topic 'externalproject-download-git-2.20-fix' into release-3.18Brad 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
| * \ \ Merge topic 'FindXalanC-1.12' into release-3.18Brad King2020-07-271-3/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4bf102418b FindXalanC: Fix version parsing for XalanC 1.12 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5056
* | \ \ \ 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
generated by cgit v0.12 at 2025-01-24 00:41:54 (GMT)