summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* FindBoost: Add support for MSVC toolset version 14.2Brad King2019-04-121-5/+20
| | | | Generalize the logic to express compatibility among 14.x versions.
* Merge topic 'meta-feature_only_infer_granular_support'Brad King2019-04-106-5/+46
|\ | | | | | | | | | | | | | | | | | | 613ac56e50 Add a test to verify meta-feature parity with granular features b0f46c48f6 CompileFeatures: Now able to presume full language level support 646fb1a646 CompileFeatures: memoize C++ compilers with full language level support 0d641fcfad Tests: Remove outdated portion of CompileFeatures genex test Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3176
| * CompileFeatures: Now able to presume full language level supportRobert Maynard2019-04-094-0/+12
| | | | | | | | | | | | | | | | | | Previously compilers that only supported the meta-level flags would not have any of the granular features listed. Now we presume that they have full support and enable all the features. Update granular feature tests to skip the actual compilation checks for the presumed features.
| * CompileFeatures: memoize C++ compilers with full language level supportRobert Maynard2019-04-092-5/+34
| | | | | | | | | | | | | | Previously compilers that had full support for a language standard level were still verified every time a new build directory was created. Now we record this information and insert the correct granular compile features instead of doing a `try_compile`.
* | Merge topic 'fix-submit-url'Craig Scott2019-04-091-1/+1
|\ \ | | | | | | | | | | | | | | | | | | b8cb63457e Modules/CTest: Fix SubmitURL Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3206
| * | Modules/CTest: Fix SubmitURLRegina Pfeifer2019-04-091-1/+1
| | | | | | | | | | | | | | | Problem appeared in d6475daa79 (Modules/CTest: Set SubmitURL, 2018-12-08). Fixes: #19099
| * | Merge branch 'vs2019-redist' into release-3.14Brad King2019-04-042-10/+18
| |\ \ | | | | | | | | | | | | Merge-request: !3186
* | \ \ Merge topic 'improve-formatting-of-help'Brad King2019-04-0913-118/+123
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb33befe2d Modules: Update documentation formatting 0e4fbb4a1f Help: Improve formatting of Help documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !3199
| * | | | Modules: Update documentation formattingBartosz Kosiorek2019-04-0813-118/+123
| | | | |
* | | | | Merge branch 'backport-implicit-includes-relative'Brad King2019-04-081-0/+8
|\ \ \ \ \
| * | | | | Fix implicit include directory extraction for adaptive relative pathsBrad King2019-04-081-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases GCC reports *relative* implicit include directories. They are computed adaptively with respect to the current working directory such that the effective implicit include directory is an unchanging absolute path. Teach our implicit include directory extraction to recognize such paths and normalize them. Fixes: #19133
* | | | | | Merge topic 'ghs_os_dir'Brad King2019-04-081-11/+12
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a1e6b414b9 GHS: Update GHS_BSP_NAME processing 266dadf868 GHS: Print status message regarding GHS_OS_DIR Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3123
| * | | | | GHS: Print status message regarding GHS_OS_DIRFred Baksik2019-03-291-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -- Rename platform script so it runs before initial try_compile() in project() command. -- Fix incorrect variable name GHS_OS_DIR_OPTION -- Remove unnecessary ".*" from REGEX expression for GHS_CANDIDATE_OS_DIRS -- Forward GHS_OS_DIR_OPTION to try_compile() and preserve trailing whitespace of the variable.
* | | | | | Merge topic 'armcc-compiler-id'Brad King2019-04-041-1/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | f28e7fc1a5 ARMCC: Do not identify ARMClang as ARMCC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3187
| * | | | | ARMCC: Do not identify ARMClang as ARMCCBrad King2019-04-031-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 8f8d056051 (ARMCC: Fix identification of ARM compiler when it defines GNU macros, 2019-03-20, v3.14.1~10^2) we consider ARMCC before Clang or GNU compilers. Since armclang also defines `__ARMCC_VERSION` it is now mistaken for ARMCC. Extend the check for ARMCC to also verify that `__clang__` is not defined. Issue: #19065
* | | | | Merge topic 'vs2019-redist'Brad King2019-04-042-10/+18
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 33ee779330 IRSL: Fix discovery of VS 2019 v142 toolset redistributables d8cf8380fb MSVC: Fix MSVC_TOOLSET_VERSION for VS 2019 v142 toolset Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3186
| * | | | IRSL: Fix discovery of VS 2019 v142 toolset redistributablesBrad King2019-04-041-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since VS 2017's v141 toolset there is no longer a simple equation to calculate the redist name, dll version, and VS IDE version from just the MSVC toolset version. Refactor the logic to use hard-coded values and warn when a new version is not supported. Fixes: #19125
| * | | | MSVC: Fix MSVC_TOOLSET_VERSION for VS 2019 v142 toolsetBrad King2019-04-031-1/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was forgotten in commit 626c51f47b (VS: Update for Visual Studio 2019 Preview 2, 2019-01-24, v3.14.0-rc1~74^2) when the toolset was first renumbered to `v142`. Issue: #19125
| * | | Merge branch 'implicit-includes' into release-3.14Brad King2019-03-291-2/+14
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !3157
| * \ \ \ Merge branch 'ifw_group_option_parsing' into release-3.14Brad King2019-03-291-0/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !3160
| * \ \ \ \ Merge branch 'FindFontconfig-var-case' into release-3.14Brad King2019-03-272-29/+29
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !3153
| * \ \ \ \ \ Merge branch 'cuda-bracket-output' into release-3.14Brad King2019-03-261-0/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3151
| * \ \ \ \ \ \ Merge branch 'toolchain-include_directories' into release-3.14Brad King2019-03-251-0/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3140
| * \ \ \ \ \ \ \ Merge branch 'armcc-compiler-id' into release-3.14Brad King2019-03-201-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3127
* | \ \ \ \ \ \ \ \ Merge topic 'FindGLEW-lib-suffixes'Brad King2019-04-041-0/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 14c7396fb9 FindGLEW: fix CMAKE_FIND_LIBRARY_SUFFIXES Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3179
| * | | | | | | | | | FindGLEW: fix CMAKE_FIND_LIBRARY_SUFFIXESClaudio Fantacci2019-04-031-0/+5
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FindGLEW temporarily changes the content of CMAKE_FIND_LIBRARY_SUFFIXES to look for static and dynamic GLEW library. However, it wasn't storing and restoring the initial content of such variable, causing possible issues in user project.
* | | | | | | | | | Merge topic 'FindBoost-clang-cl'Brad King2019-04-041-1/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d48bf97fd3 FindBoost: Consider boost suffixes suitable for clang-cl Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3164
| * | | | | | | | | | FindBoost: Consider boost suffixes suitable for clang-clDouman2019-04-031-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When compiling with `clang-cl` we can use either the MSVC- or Clang-built boost libraries.
* | | | | | | | | | | Merge topic 'FindPython-handle-virtual-env'Brad King2019-04-044-20/+111
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8a2f62cc18 FindPython*: Add capability to control virtual env handling. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3173
| * | | | | | | | | | | FindPython*: Add capability to control virtual env handling.Marc Chevrier2019-04-034-20/+111
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #19097
* | | | | | | | | | | Merge topic 'find-dependency-fix-17583'Brad King2019-04-031-26/+24
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 37da6af17d find_dependency: Always search dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3161
| * | | | | | | | | | | find_dependency: Always search dependenciesDamien R2019-03-291-26/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a dependency was already found, find_dependency did not search it again. While this works in basic case, it does not when there are components as the check does not take components into account. Given the fact that there is no documentation about this optimization and that the correct implementation is not trivial as it would require changes in find_package to have the list of components already found we always search dependencies. Fix #17583.
* | | | | | | | | | | | Merge topic 'nasm-fix'Brad King2019-04-021-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9e4de543d0 Modules: Check nasm compile object variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3167
| * | | | | | | | | | | Modules: Check nasm compile object variableConnor Davis2019-03-301-1/+3
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check if the CMAKE_ASM_NASM_COMPILE_OBJECT variable is set before modifying it. Only modify if not previously set.
* | | | | | | | | | | Merge topic 'memorize_c_compilers_with_full_standard_support'Brad King2019-04-0111-3/+59
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 983533a4b8 Record when C compilers have gained full support for 90,99,11 f92ccbc306 CompileFeatures: memoize C compilers with full language level support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3146
| * | | | | | | | | | Record when C compilers have gained full support for 90,99,11Robert Maynard2019-03-279-0/+30
| | | | | | | | | | |
| * | | | | | | | | | CompileFeatures: memoize C compilers with full language level supportRobert Maynard2019-03-272-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously compilers that had full support for a language standard level was forced to verify this every time a new build directory was created. Now we record this information and insert the correct granular compile features instead of doing a try_compile.
* | | | | | | | | | | Merge topic 'implicit-includes'Brad King2019-03-291-2/+14
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dad86f1873 ParseImplicitIncludeInfo: Canonicalize implicit include dirs Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Michel Zou <xantares09@hotmail.com> Merge-request: !3157
| * | | | | | | | | | ParseImplicitIncludeInfo: Canonicalize implicit include dirsBrad King2019-03-291-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implicit include directory extraction added by commit 5990ecb741 (Compute implicit include directories from compiler output, 2018-12-07, v3.14.0-rc1~108^2) leaves paths like `/usr/lib/../include` unchanged. Fix the logic to canonicalize such paths (e.g. to `/usr/include`) as we do for implicit link directories already. This is important to ensure the set of implicit directories is represented in the same form as the include directories that will be compared to them. Issue: #19095
* | | | | | | | | | | Merge topic 'ifw_group_option_parsing'Brad King2019-03-291-0/+6
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | / / | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 6f6e0966a7 CPackIFW: Add missing cpack_ifw_configure_component_group option processing Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3160
| * | | | | | | | | CPackIFW: Add missing cpack_ifw_configure_component_group option processingClément Rezvoy2019-03-281-0/+6
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both commit 88ecfd8ba1 (CPackIFW: Add some options, 2016-11-11, v3.8.0-rc1~248^2) and commit e5089c562c (CPackIFW: Add some options, 2017-01-24, v3.8.0-rc1~53^2) added some options to this macro's documentation and implementation, but the actual processing of the parsed options was never added. Add it now. Reviewed-by: Konstantin Podsvirov <konstantin@podsvirov.pro>
* | | | | | | | | Merge topic 'FindFontconfig-var-case'Brad King2019-03-272-29/+29
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a3a1e69f8a FindFontconfig: Convert module variables to camel case Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3153
| * | | | | | | | FindFontconfig: Convert module variables to camel caseBrad King2019-03-262-29/+29
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our documented standard for find module variable names is to match the case of the find module package name. This was overlooked when the module was added by commit 84e7920b3a (FindFontconfig: Add module to find Fontconfig, 2018-09-27, v3.14.0-rc1~523^2). The module was released with the upper case names in CMake 3.14.0, so fix it to have camel case names in 3.14.1. This is incompatible but anyone using a given release series should be using the latest patch on it and we've made breaking fixups on newly released features like this before. Reported-by: Christophe Giboudeaux <christophe@krop.fr> Fixes: #19094
* | | | | | | | Merge topic 'cuda-bracket-output'Brad King2019-03-271-0/+5
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b127e0c561 CUDA: Tolerate square brackets in PROMPT environment variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3151
| * | | | | | | CUDA: Tolerate square brackets in PROMPT environment variableBrad King2019-03-261-0/+5
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `PROMPT` environment variable affects nvcc's output. Fix our parsing of that output to tolerate square brackets. Fixes: #19089
* | | | | | | Merge topic 'find_dependency-cleanup'Brad King2019-03-271-1/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 82dec5191c find_dependency: Remove clearing of unused cmake_fd_exact_arg variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3149
| * | | | | | | find_dependency: Remove clearing of unused cmake_fd_exact_arg variableDamien R2019-03-261-1/+0
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The variable is unused since commit ab358d6a85 (Improve find_dependency argument handling, 2017-05-22, v3.9.0-rc1~57^2) where handling of EXACT keyword in find_dependency was reworked.
* | | | | | | Merge topic 'toolchain-include_directories'Brad King2019-03-261-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | | | | | | | | | | | | | | 588fa1bb9e Restore support for include_directories() in toolchain files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3140
| * | | | | Restore support for include_directories() in toolchain filesBrad King2019-03-251-0/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Any `include_directories()` calls in toolchain files are used during our ABI detection step even though it does not include any system headers. Since commit 5990ecb741 (Compute implicit include directories from compiler output, 2018-12-07, v3.14.0-rc1~108^2), that check is also used to detect implicit include directories. Any `include_directories()` in a toolchain file are detected as implicit and later excluded from explicit specification on compiler command lines, thus breaking the purpose of the calls in the first place. Fix the implicit include directory detection step to avoid using paths from `include_directories()` calls in the toolchain file. Fixes: #19079
* | | | | Merge topic 'pkg-get-variable-prefix-path'Brad King2019-03-251-109/+128
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f401a57160 pkg_get_variable now sets PKG_CONFIG_PATH like pkg_check_modules 4d76941924 FindPkgConfig: hoist PKG_CONFIG_PATH ops out into _pkg_set_path_internal 78f23de70c More tests for pkg_get_variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3131
generated by cgit v0.12 at 2025-01-16 14:01:41 (GMT)