summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* FindLAPACK: Use find_package_handle_standard_argsSeth R Johnson2020-08-071-296/+276
| | | | LAPACK previously used custom and verbose output messages.
* Merge topic 'cygwin-patches'Brad King2020-08-073-20/+4
|\ | | | | | | | | | | | | | | | | | | ecc1961768 FindTclsh: Drop Cygwin-specific behavior and use POSIX code path af666acdf4 FindOpenGL: Drop Cygwin-specific behavior and use POSIX code path 8edbc59e46 install: Use case-sensitive pattern matching on Cygwin 24482499ea FindPerlLibs: Add versioned perl library name for Cygwin Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5092
| * FindTclsh: Drop Cygwin-specific behavior and use POSIX code pathLemures Lemniscati2020-08-061-7/+0
| | | | | | | | | | | | Based on downstream patch from Cygwin package for CMake by Marco Atzeri: * https://github.com/matzeri/cygwin-pkg/blob/64864eb8f0d635ea44226e4b9a41a7ca59a1c7dd/cmake/3.17.3-findtclsh.patch
| * FindOpenGL: Drop Cygwin-specific behavior and use POSIX code pathLemures Lemniscati2020-08-061-13/+1
| | | | | | | | | | | | Based on downstream patch from Cygwin package for CMake by Marco Atzeri: * https://github.com/matzeri/cygwin-pkg/blob/64864eb8f0d635ea44226e4b9a41a7ca59a1c7dd/cmake/3.17.3-opengl.patch
| * FindPerlLibs: Add versioned perl library name for CygwinLemures Lemniscati2020-08-061-0/+3
| | | | | | | | | | | | Based on downstream patch from Cygwin package for CMake by Marco Atzeri: * https://github.com/matzeri/cygwin-pkg/blob/64864eb8f0d635ea44226e4b9a41a7ca59a1c7dd/cmake/perl-libs.patch
* | Merge topic 'CUDAToolkit-no-nvcc'Brad King2020-08-071-54/+99
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 7cc815a2a6 CUDAToolkit: Detect CUDA SDK that don't have nvcc Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: Raul Tambre <raul@tambre.ee> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !5061
| * | CUDAToolkit: Detect CUDA SDK that don't have nvccRobert Maynard2020-07-301-54/+99
| | | | | | | | | | | | | | | | | | | | | | | | When a CUDA sdk doesn't have nvcc, defer to the existence of a version.txt file. When we do this fall back we also reconstruct the CUDA version via version.txt Fixes #20643
* | | Merge topic 'compiler_flags'Brad King2020-08-0612-35/+35
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f76c20da63 Toolchain: Test compiler initial settings db486da265 Toolchain: Update documentation for initial compiler flags deec2f587c Toolchain: Take CMAKE_<lang>_FLAGS_INIT into account during compiler detection ca899af3e2 Toolchain: Handle repeated invocations of CMake with -DCMAKE_C_COMPILER 12ba89e142 Toolchain: Make `/path/comp;-argn' behave the same as 'comp;-argn' 6f1af899db Toolchain: Capture all arguments from CMAKE_<LANG>_COMPILER ec1d3bc0b6 cmake: avoid exception when printing "changed variables" message Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4136
| * | Toolchain: Take CMAKE_<lang>_FLAGS_INIT into account during compiler detectionFred Baksik2020-07-291-1/+3
| | | | | | | | | | | | Fixes: #20040
| * | Toolchain: Make `/path/comp;-argn' behave the same as 'comp;-argn'Fred Baksik2020-07-291-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using `cmake ... -DCMAKE_C_COMPILER=gcc;-pipe` first invocation of CMake worked correctly. When using `cmake ... -DCMAKE_C_COMPILER=/path/to/gcc;-pipe` first invocation of CMake detected a change to CMAKE_C_COMPILER, printed "You have changed variables" message, and re-ran the initial compiler tests after configuration was complete and before generation of the project files. The difference was due to the cache being forced updated with the new value of CMAKE_C_COMPILER so that the comparison check passes.
| * | Toolchain: Capture all arguments from CMAKE_<LANG>_COMPILERFred Baksik2020-07-2311-34/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Capture CMAKE_<LANG>_COMPILER_ARG1 from CMAKE_<LANG>_COMPILER in the same fashion that it is from $ENV{<LANG>}. Since get_filename_component() returns a single string of all the arguments from $ENV{<LANG>}, a single string of arguments will be constructed from the items contained in CMAKE_<LANG>_COMPILER. Fixes #20089
* | | Merge topic 'UseSWIG-support-files-in-subdirectories'Brad King2020-08-061-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 50e53eaed9 UseSWIG: Take care of support files in sub-directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5097
| * | | UseSWIG: Take care of support files in sub-directoriesMarc Chevrier2020-08-041-2/+2
| | | | | | | | | | | | | | | | Fixes: #20833
* | | | Merge topic 'support_list_google_test_executor'Brad King2020-08-061-2/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 8829d2caba GoogleTest: Restore support for list arguments in TEST_EXECUTOR Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5084
| * | | GoogleTest: Restore support for list arguments in TEST_EXECUTORLaurits Riple2020-08-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 889a7146ff (GoogleTestAddTests: Refactor into callable method, 2020-03-16, v3.18.0-rc1~450^2~3) accidentally parsed `TEST_EXECUTOR` as a single-value argument instead of a list.
| * | | Merge topic 'clang-msvc-cxx-std' into release-3.18Brad 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
* | | | | ASM: Remove unneeded empty variablesRobert Maynard2020-07-301-10/+0
| | | | |
* | | | | 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