summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'FindBISON-CMP0088-SourcePath' into release-3.14Brad King2019-07-121-3/+9
|\ | | | | | | Merge-request: !3549
| * FindBISON: Fix CMP0088 NEW behavior for non-absolute input pathsBrian Carlson2019-07-121-3/+9
| | | | | | | | | | | | | | | | Now that the working directory is in the build tree, relative input paths must be converted to an absolute path to remain relative to the source directory. Fixes: #19472
* | Merge branch 'backport-implicit-includes-cray-hlist' into release-3.14Brad King2019-07-091-2/+2
|\ \ | | | | | | | | | Merge-request: !3532
| * | Cray: Fix include parsing when the -hlist= flag is presentChuck Atkins2019-07-091-2/+2
| |/ | | | | | | | | | | Update parsing logic from commit 5990ecb741 (Compute implicit include directories from compiler output, 2018-12-07, v3.14.0-rc1~108^2) to handle the quoting behavior caused by the `-hlist=` flag.
* | Android: ensure PIE behavior is consistent regardless CMP0083 policyMarc Chevrier2019-06-191-0/+20
|/ | | | | | | | | In commit c4b4d8b3a6 (POSITION_INDEPENDENT_CODE: Manage link flags for executables, 2018-10-02, v3.14.0-rc1~395^2) we accidentally removed our Android-specific logic for PIE under the CMP0083 OLD behavior. Restore it and also implement Android-specific logic for CMP0083 NEW behavior. Fixes: #19393
* Merge branch 'FindThreads-doc-c++' into release-3.14Brad King2019-05-281-3/+0
|\ | | | | | | Merge-request: !3391
| * FindThreads: Drop incorrect docs about usage with C++Brad King2019-05-281-3/+0
| | | | | | | | | | | | | | | | Drop the sentence added by commit 5a5a1d90f0 (Help: FindThreads not needed with modern C++., 2019-01-09, v3.14.0-rc1~186^2) about not needing the module with modern C++. The module is often still needed. Fixes: #19297
* | FindBoost: Add compiler features for Boost Contract libraryAlex Turbov2019-05-241-0/+10
|/
* Merge branch 'swig4' into release-3.14Brad King2019-05-131-1/+1
|\ | | | | | | Merge-request: !3314
| * FindSWIG: Support swig4.0Daniele E. Domenichelli2019-05-131-1/+1
| |
* | Apple: Properly lookup XCTest for iOS and tvOSGregor Jasny2019-05-111-0/+19
| | | | | | | | Closes: #19172
* | FindPython: ensure variable Python_RUNTIME_LIBRARY_DIRS is set correctlyMarc Chevrier2019-05-051-3/+6
| |
* | Merge branch 'FindPython-NumPy-fix-dependencies-management' into release-3.14Brad King2019-04-301-9/+13
|\ \ | | | | | | | | | Merge-request: !3274
| * | FindPython: NumPy: fix erroneous dependencies managementMarc Chevrier2019-04-301-9/+13
| |/
* | FindBoost: Fix compiler features for `fiber` and `context`Alex Turbov2019-04-301-0/+2
| |
* | FindBoost: Record compiler features for Boost 1.67 and aboveAlex Turbov2019-04-301-3/+9
|/ | | | | | Remove the 1.67 upper-bound on compiler feature computation so that with newer versions we at least get it mostly right. Leave a comment with notes about updating features for future versions.
* Merge branch 'findqt3-hints-fix' into release-3.14Brad King2019-04-221-5/+7
|\ | | | | | | Merge-request: !3254
| * FindQt3: Restore missing lib and bin path suffixesChristian Pfeiffer2019-04-221-5/+7
| | | | | | | | | | | | | | | | | | Restore path suffixes incorrectly removed by commit a62d50ec56 (Modules: Replace coded PATHS with PATH_SUFFIXES, 2017-11-20, v3.11.0-rc1~293^2). Hints do not participate in the usual bin/lib subdirectory search that `<PackangeName>_ROOT` or `CMAKE_PREFIX_PATH` exhibit. Fixes: #19185
* | Merge branch 'FindOpenGL-libglvnd-subdir' into release-3.14Brad King2019-04-171-0/+3
|\ \ | | | | | | | | | Merge-request: !3236
| * | FindOpenGL: look for GLVND libraries with a libglvnd suffixBen Boeckel2019-04-171-0/+3
| |/ | | | | | | | | On CentOS 6.10, the libglvnd package from EPEL installs its libraries under a libglvnd subdirectory.
* | Merge branch 'Boost-Gentoo' into release-3.14Brad King2019-04-161-1/+1
|\ \ | | | | | | | | | Merge-request: !3237
| * | FindBoost: Fix detection with version suffixes on GentooRolf Eike Beer2019-04-161-1/+1
| |/ | | | | | | | | | | | | | | | | The Gentoo case added by commit 1673923c30 (FindBoost: Add support for Boost 1.67 with Python version suffixes, 2018-03-18, v3.11.0~3^2) left out the `.` version component separator and instead duplicated the RPM case. Add the missing `.` now. Fixes: #18743
* | Merge branch 'vs2019-redist' into release-3.14Brad King2019-04-151-2/+5
|\ \ | | | | | | | | | Merge-request: !3233
| * | IRSL: Update redist directory for VS 2019 update 1Brad King2019-04-151-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | VS 2019 Update 1 will fix its redist directories to be named `VC142` instead of `VC141`. It will also use cl `19.21` instead of `19.20` so we can use that to distinguish the versions. Fixes: #19131
* | | 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 branch 'fix-submit-url' into release-3.14Craig Scott2019-04-091-1/+1
|\ \ | | | | | | 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 'backport-implicit-includes-relative' into release-3.14Brad King2019-04-081-0/+8
|\ \ \ | |/ / |/| | | | | Merge-request: !3204
| * | 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 branch 'vs2019-redist' into release-3.14Brad King2019-04-042-10/+18
|\ \ \ | | |/ | |/| | | | 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
* | 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 branch 'implicit-includes' into release-3.14Brad King2019-03-291-2/+14
|\ | | | | | | 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 branch 'ifw_group_option_parsing' into release-3.14Brad King2019-03-291-0/+6
|\ \ | | | | | | | | | 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 branch 'FindFontconfig-var-case' into release-3.14Brad King2019-03-272-29/+29
|\ \ | | | | | | | | | 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 branch 'cuda-bracket-output' into release-3.14Brad King2019-03-261-0/+5
|\ \ | | | | | | | | | 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 branch 'toolchain-include_directories' into release-3.14Brad King2019-03-251-0/+1
|\ \ | | | | | | | | | 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 branch 'armcc-compiler-id' into release-3.14Brad King2019-03-201-1/+1
|\ \ | | | | | | | | | Merge-request: !3127
| * | ARMCC: Fix identification of ARM compiler when it defines GNU macrosBrad King2019-03-201-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | According to ARMCC 5.06 documentation: http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0472m/chr1359125007083.html the compiler may define `__GNUC__` in addition to `__ARMCC_VERSION`. Re-order our preprocessor checks to consider the ARM-specific macro first so that the ARM compiler is not mistaken for a GNU compiler. Fixes: #19065
* | FindPython*: ensure correct architecture is selected.Marc Chevrier2019-03-144-8/+29
|/ | | | | | | | Ensure interpreter and libraries architecture matches CMake build configuration. Update documentation about interpreter constraints. Fixes: #19024
* Merge branch 'ios-variable' into release-3.14Brad King2019-03-051-0/+2
|\ | | | | | | Merge-request: !3051
| * iOS: Add IOS variableRuslan Baratov2019-03-051-0/+2
| | | | | | | | | | | | | | Since commit 11da882a12 (Apple: Introduce separate system name for iOS, tvOS, and watchOS, 2018-01-15, v3.14.0-rc1~14^2~1) we support setting `CMAKE_SYSTEM_NAME` to `iOS`. Existing iOS toolchain files already set `IOS` as a short-hand variable, so do the same here.
* | FindPython: Fix NumPy component include directoryMarc Chevrier2019-03-041-2/+1
|/ | | | | | | Update the component added by commit 513e77550d (FindPython: Introduce NumPy component, 2018-12-12, v3.14.0-rc1~95^2). The `numpy/` sub-directory should not be part of the include directory. It should be part of the `#include` line.
* Merge branch 'findjni-paths' into release-3.14Brad King2019-03-011-52/+47
|\ | | | | | | Merge-request: !3042
generated by cgit v0.12 at 2025-02-09 01:31:18 (GMT)