diff options
| author | Brad King <brad.king@kitware.com> | 2017-11-20 14:42:07 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-11-20 14:43:27 (GMT) |
| commit | 9100ea1d82538b300145d589ca4961ff2050ac4d (patch) | |
| tree | 14b1f1a11d4b8a89777b2d63b2a56d96a2a250c6 /Source | |
| parent | b0c2cd47f0b62f3586e3f45ed554357ac27dd576 (diff) | |
| parent | 2ea17412a9a40bd66342a1761ac8f067f5d2ab09 (diff) | |
| download | CMake-9100ea1d82538b300145d589ca4961ff2050ac4d.zip CMake-9100ea1d82538b300145d589ca4961ff2050ac4d.tar.gz CMake-9100ea1d82538b300145d589ca4961ff2050ac4d.tar.bz2 | |
Merge topic 'FindOpenGL-glvnd-policy'
2ea17412 FindOpenGL: Add policy CMP0072 to prefer GLVND for legacy GL
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Clinton Stimpson <clinton@elemtech.com>
Merge-request: !1491
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmPolicies.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h index f614dca..c39f927 100644 --- a/Source/cmPolicies.h +++ b/Source/cmPolicies.h @@ -211,7 +211,10 @@ class cmMakefile; "Define file(GENERATE) behavior for relative paths.", 3, 10, 0, \ cmPolicies::WARN) \ SELECT(POLICY, CMP0071, "Let AUTOMOC and AUTOUIC process GENERATED files.", \ - 3, 10, 0, cmPolicies::WARN) + 3, 10, 0, cmPolicies::WARN) \ + SELECT(POLICY, CMP0072, \ + "FindOpenGL prefers GLVND by default when available.", 3, 11, 0, \ + cmPolicies::WARN) #define CM_SELECT_ID(F, A1, A2, A3, A4, A5, A6) F(A1) #define CM_FOR_EACH_POLICY_ID(POLICY) \ |