summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | CPackIFW: Fix parsing of name and version in component DEPENDSCraig Scott2021-03-261-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DEPENDS or DEPENDENCIES arguments in a call to cpack_ifw_configure_component() or cpack_ifw_configure_component_group() specify a name and optionally a version constraint as a single string. QtIFW also allows a colon (requires QtIFW 3.1 or later) or a hyphen to separate the name and version. The version may optionally contain a leading operator, with = being assumed when no operator is present. The previous code was not handling : as a separator at all and was erroneously dropping the version part when no operator was given. Fix both of those non-conforming behaviors and also warn if trying to use a hyphen in a name with a QtIFW version that isn't recent enough to support it. Fixes: #21697
* | | | | | Merge topic 'GNUInstallDirs-doc'Brad King2021-03-301-1/+4
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 06171fd7aa GNUInstallDirs: Clarify that CMAKE_INSTALL_<dir> may be absolute Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5947
| * | | | | GNUInstallDirs: Clarify that CMAKE_INSTALL_<dir> may be absoluteBrad King2021-03-291-1/+4
| | |_|_|/ | |/| | | | | | | | | | | | | Fixes: #21991
* | | | | Merge topic 'SWIG'Brad King2021-03-291-1/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1d8e3a1e77 UseSWIG: Use standard library name conventions for csharp language Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5949
| * | | | | UseSWIG: Use standard library name conventions for csharp languageMarc Chevrier2021-03-261-1/+18
| | |_|_|/ | |/| | | | | | | | | | | | | Fixes: #21542
* | | | | Merge topic 'FindDoxygen-clarify-cmake-variable-naming'Brad King2021-03-291-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 739446a9a1 FindDoxygen: clarify the CMake variable naming scheme Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Mateusz Mania <kajtkowo@gmail.com> Merge-request: !5943
| * | | | | FindDoxygen: clarify the CMake variable naming schemeBen Boeckel2021-03-251-1/+2
| | |_|/ / | |/| | |
* | | | | FindIntl: Fix detection of intl built in to C libraryBrad King2021-03-261-44/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit c30d06b7e6 (FindIntl: Add imported target, 2020-10-06, v3.20.0-rc1~687^2) we use `check_symbol_exists` to check whether the `intl` library is built in to the C library. On some platforms the tested symbols are provided as macros so the check passes without linking any symbol. Instead, check whether a sample source file both compiles and links. Fixes: #21979
* | | | | Merge branch 'backport-FindIntl-builtin' into FindIntl-builtinBrad King2021-03-261-3/+0
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| |
| * | | FindIntl: Improve documentation formattingSibi Siddharthan2021-03-261-17/+38
| | |/ | |/| | | | | | | Backport from commit a9b11a06f5 (FindIntl: Add version support, 2021-02-23).
| * | Merge topic 'FindPkgConfig-NAMES_PER_DIR' into release-3.20Brad King2021-03-171-1/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | c7bd2d0d97 FindPkgConfig: Restore preference for first pkg-config in PATH Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5914
| * \ \ Merge topic 'FindOpenMP-IntelLLVM-Windows' into release-3.20Brad King2021-03-171-1/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6fd014a4b6 FindOpenMP: Use -Qiopenmp instead of -fiopenmp for IntelLLVM on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5904
* | | | | FindRuby: Consider ruby names with full nodot version suffixesPedro Luis Castedo Cepeda2021-03-251-1/+1
| |_|_|/ |/| | |
* | | | Treat '.ixx' and '.cppm' files as C++ sourcesAndrew Gilewsky2021-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | These extensions are used by convention for C++ modules and interface units with MSVC.
* | | | Merge topic 'update_cuda_custom_toolkit_location_folder_structure'Brad King2021-03-191-3/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c73b847b03 VS: switch to new folder structure while keeping the old one working Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Raul Tambre <raul@tambre.ee> Merge-request: !5911
| * | | | VS: switch to new folder structure while keeping the old one workingMarcel Ritzschke2021-03-181-3/+13
| | | | | | | | | | | | | | | | | | | | Fixes: #21170
* | | | | FindDevIL: add imported targets and testsAlex2021-03-181-0/+57
| | | | | | | | | | | | | | | | | | | | Fixes: #21900
* | | | | FindDevIL: Format documentation of provided variablesBrad King2021-03-181-18/+25
|/ / / /
* | | | Merge topic 'lang_win32_console'Brad King2021-03-189-17/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 56c759b000 Per-language Win32/Console flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5906
| * | | | Per-language Win32/Console flagsRaul Tambre2021-03-179-17/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows using different compilers with different flags for different languages. For example Clang with GNU-like commandline for CXX and MSVC as host compiler for CUDA. Should help with #21914.
* | | | | Merge topic 'FindPkgConfig-NAMES_PER_DIR'Brad King2021-03-171-1/+4
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | c7bd2d0d97 FindPkgConfig: Restore preference for first pkg-config in PATH Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5914
| * | | | FindPkgConfig: Restore preference for first pkg-config in PATHBrad King2021-03-161-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit ab8bd48352 (FindPkgConfig: Search for pkg-config.bat file on a Windows host, 2020-09-25, v3.19.0-rc1~98^2) we prefer `pkg-config.bat` over `pkg-config` regardless of the order they appear in the `PATH`. Tell `find_program` to consider all names in each directory so that the first one in `PATH` of any name wins. Issue: #21239
* | | | | Merge topic 'fix_ninja_windows_cuda'Brad King2021-03-172-0/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 55233eee42 CUDA: Add support for finding nvcc in CUDA_PATH Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Tested-by: Raul Tambre <raul@tambre.ee> Merge-request: !5908
| * | | | | CUDA: Add support for finding nvcc in CUDA_PATHTobias Ribizel2021-03-152-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, nvcc needed to be present in PATH or specified by CUDACXX. On Windows with vcpkg, the PATH is heavily modified, which lead to nvcc not being found with the Ninja generator.
* | | | | | Merge topic 'FindOpenMP-IntelLLVM-Windows'Brad King2021-03-171-1/+6
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 6fd014a4b6 FindOpenMP: Use -Qiopenmp instead of -fiopenmp for IntelLLVM on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5904
| * | | | | FindOpenMP: Use -Qiopenmp instead of -fiopenmp for IntelLLVM on WindowsWilliam R. Dieter2021-03-151-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Windows driver does not like the `-f` form of this option. Note that we prefer `-Qiopenmp/-fiopenmp` over `-Qopenmp/-fopenmp` in order to generate LLVM IR with parallelization information, which the backend uses to generate parallelized code. Signed-off-by: William R. Dieter <william.r.dieter@intel.com>
* | | | | | Merge topic 'cmake-presets-host-system-name'Brad King2021-03-161-31/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0d497e159b CMakePresets.json: Add ${hostSystemName} macro 79d03ab505 Help: Fix version numbers in CMakePresets.json documentation 69527a1979 Refactor: Pass CMakePresets.json version to ExpandMacros() functions ad19da011d Refactor: Add cmSystemTools::GetSystemName() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5902
| * | | | | | Refactor: Add cmSystemTools::GetSystemName()Kyle Edwards2021-03-151-31/+8
| | |/ / / / | |/| | | | | | | | | | | | | | | | And use it for CMAKE_HOST_SYSTEM_NAME and CMAKE_SYSTEM_NAME.
* | | | | | Merge topic 'ExternalData-stop-forking-to-cmake'Brad King2021-03-161-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b6c022eaa2 ExternalData: use `file(CREATE_LINK)` 01cc8bf930 ExternalData: use `file(COPY_FILE)` instead of forking CMake Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5875
| * | | | | | ExternalData: use `file(CREATE_LINK)`Ben Boeckel2021-03-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids spawning a new CMake command which isn't necessary.
| * | | | | | ExternalData: use `file(COPY_FILE)` instead of forking CMakeBen Boeckel2021-03-111-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge topic 'FindMatlab-r2021a'Brad King2021-03-161-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | / | | |_|_|/ | |/| | | | | | | | | | | | | 427f5f2fa9 FindMatlab: R2021a version map Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5907
| * | | | FindMatlab: R2021a version mapMichael Hirsch2021-03-151-0/+1
| | |/ / | |/| |
| * | | Merge topic 'cray-compiler-wrapper-detection' into release-3.20Brad King2021-03-113-5/+5
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | 13144e82cd Cray: Enable Cray compiler wrapper detection on all platforms Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5897
| * | | Merge topic 'ep-fc-revert-refactoring' into release-3.20Brad King2021-03-1020-1782/+1087
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 57d442e182 Revert ExternalProject and FetchContent refactoring Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5898
* | | | | CMakePrintHelpers: Work around CACHE argument of set()Kyle Edwards2021-03-111-1/+4
| |_|_|/ |/| | | | | | | | | | | Fixes: #21919
* | | | Merge topic 'cray-compiler-wrapper-detection'Brad King2021-03-113-5/+5
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 13144e82cd Cray: Enable Cray compiler wrapper detection on all platforms Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5897
| * | | Cray: Enable Cray compiler wrapper detection on all platformsJustin LaPolla2021-03-103-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously were checking for the `__CRAYXC` and `__CRAYXE` predefined macros. These macros reflect the platform that the compiler wrapper is running on, i.e. Cray XC and Cray XE machines. They are not defined on other platforms such as Apollo80. Switch to the `__CRAYXT_COMPUTE_LINUX_TARGET` macro. The Cray cc/CC/ftn wrappers always define this macro on the command line. This macro has been in use for many years, and is believed to be a reliable way to detect current and older Cray compiler wrappers. Fixes: #21904
* | | | Merge topic 'ep-fc-revert-refactoring'Brad King2021-03-1020-1782/+1087
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 57d442e182 Revert ExternalProject and FetchContent refactoring Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5898
| * | | Revert ExternalProject and FetchContent refactoringCraig Scott2021-03-0920-1782/+1087
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring of the ExternalProject and FetchContent modules moved the commands into CMake scripts. This broke custom commands that used shell redirection or special build tool variables of the form $(MakeVar). Undo the sequence of commits that performed this refactoring and follow-up fixes associated with it. The following commits are reverted by this change: 4f3d1abbb4 (ExternalProject: Refactor pre-configure steps to support no-target uses, 2021-02-05) 17e5516e60 (FetchContent: Invoke steps directly and avoid a separate sub-build, 2021-01-29) bd876f3849 (FetchContent: Restore patch command support, 2021-02-18) 404cddb7bb (ExternalProject: Fix misuse of IS_NEWER_THAN in timestamp checks, 2021-02-21) b0da671243 (FetchContent: Don't update timestamps if files don't change, 2021-02-18) Fixes: #21892
* | | | Merge topic 'FindMatlab-MCR-vars'Brad King2021-03-101-2/+9
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | 5ba1f4b6ee FindMatlab: Fix Matlab_LIBRARIES for MCR Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5896
| * | | FindMatlab: Fix Matlab_LIBRARIES for MCRSilvio Traversaro2021-03-091-2/+9
| |/ / | | | | | | | | | | | | | | | | | | In commit bda5e2ac8f (FindMatlab: Only include engine and dataarray libraries if they are found, 2020-12-11, v3.20.0-rc1~297^2~1) we fixed the imported target to contain optional libraries only if they are found. Do the same for `Matlab_LIBRARIES`.
| * | Merge topic 'CrayPrgEnv-detection' into release-3.20Brad King2021-03-093-5/+5
| |\ \ | | |/ | | | | | | | | | | | | | | | 23b101de60 Revert "Cray: Fix Cray compiler detection on new platforms" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5889
* | | Merge topic 'CrayPrgEnv-detection'Brad King2021-03-093-5/+5
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 23b101de60 Revert "Cray: Fix Cray compiler detection on new platforms" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5889
| * | Revert "Cray: Fix Cray compiler detection on new platforms"Brad King2021-03-083-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The justification in commit 9ee4a42813 (Cray: Fix Cray compiler detection on new platforms, 2020-12-01, v3.19.2~26^2) confuses detection of the CrayPrgEnv with identification of the Cray compiler. The change regressed detection of the CrayPrgEnv on non-Cray compilers. Revert it pending further investigation into the original problem. Fixes: #21894
* | | Merge topic 'ExternalData-windows'Brad King2021-03-081-1/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31be23dd1d ci: Restore the Module.ExternalData test on Windows fdfbf89f0c ExternalData: Avoid replacing a concurrently-created object Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !5883
| * | | ExternalData: Avoid replacing a concurrently-created objectBrad King2021-03-051-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If more than one content link references the same object, the build system may launch multiple download processes for the same object concurrently. Use whichever one finishes first, and discard the others. Without this, we replace the objects and use the last finisher instead of the first. This is okay on non-Windows platforms where `rename(2)` gives reliable atomic replacement. However, on Windows platforms and NTFS this is less reliable. I've observed `MoveFileEx` somehow cause another process to get `ERROR_SHARING_VIOLATION` when attempting to read the destination file. We may be able to improve the `file(RENAME)` implementation on modern Windows 10 versions, but for ExternalData's use case it is simpler to just not replace existing objects.
* | | | Merge topic 'cray-fortran'Brad King2021-03-081-0/+4
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | ef513fe3d1 Cray: Enable explicit Fortran preprocessing for Ninja generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5882
| * | Cray: Enable explicit Fortran preprocessing for Ninja generatorBrad King2021-03-051-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Cray 11.0 adds support for preprocessing with output written to a specified file (instead of always next to the source). Use it to enable Cray Fortran with the Ninja generator. Patch-by: James Elliott Fixes: #20731
| * | Merge topic 'android-r22' into release-3.20Brad King2021-03-032-1/+40
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 005e2cdfb0 Android: Do not use gold for ndk >= r22 ed7a87f270 Tests: Update RunCMake.Android for NDK r22 4950d35733 Help: Document CMAKE_ANDROID_NDK_VERSION variable 746906242d Android: Detect NDK version number Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5862
generated by cgit v0.12 at 2025-02-09 17:37:16 (GMT)