diff options
| author | Brad King <brad.king@kitware.com> | 2018-10-11 11:37:47 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-10-11 11:37:59 (GMT) |
| commit | 7d2ee4cb98b85946cc6b9befd33f20fab10e55bf (patch) | |
| tree | 5e125e394eb8d2ee7141f5c7b348ff25af4100c6 /Source/cmPolicies.h | |
| parent | 7a0f516ecdbc2ecc50123b54c223f917fc2864d3 (diff) | |
| parent | b56f2db87aebd34bfaf24439d56632aa3f3019f8 (diff) | |
| download | CMake-7d2ee4cb98b85946cc6b9befd33f20fab10e55bf.zip CMake-7d2ee4cb98b85946cc6b9befd33f20fab10e55bf.tar.gz CMake-7d2ee4cb98b85946cc6b9befd33f20fab10e55bf.tar.bz2 | |
Merge topic 'install-subdirectory-order'
b56f2db87a Testing: Add test for CMP0082
fc8955e889 add_subdirectory: Run subdirectory install rules in correct order
514f0b572e Testing: Update hard-coded line numbers to [0-9]+ in some tests
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2434
Diffstat (limited to 'Source/cmPolicies.h')
| -rw-r--r-- | Source/cmPolicies.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h index a367e47..a469f1e 100644 --- a/Source/cmPolicies.h +++ b/Source/cmPolicies.h @@ -240,7 +240,11 @@ class cmMakefile; cmPolicies::WARN) \ SELECT(POLICY, CMP0081, \ "Relative paths not allowed in LINK_DIRECTORIES target property.", \ - 3, 13, 0, cmPolicies::WARN) + 3, 13, 0, cmPolicies::WARN) \ + SELECT(POLICY, CMP0082, \ + "Install rules from add_subdirectory() are interleaved with those " \ + "in caller.", \ + 3, 14, 0, cmPolicies::WARN) #define CM_SELECT_ID(F, A1, A2, A3, A4, A5, A6) F(A1) #define CM_FOR_EACH_POLICY_ID(POLICY) \ |