diff options
| author | Brad King <brad.king@kitware.com> | 2018-10-19 14:14:56 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-10-19 14:15:04 (GMT) |
| commit | 7056f91e40641d63bdeb33d1b57b35a3fc2a08dd (patch) | |
| tree | 06119a9a8a0e02e9bca0f91c45b2027a05078fdb /Modules/BundleUtilities.cmake | |
| parent | aab8feeec22d7be284029d32f9e033e4791c48b2 (diff) | |
| parent | 31b6825bd2bfea564315ccf6f275023e15e9af06 (diff) | |
| download | CMake-7056f91e40641d63bdeb33d1b57b35a3fc2a08dd.zip CMake-7056f91e40641d63bdeb33d1b57b35a3fc2a08dd.tar.gz CMake-7056f91e40641d63bdeb33d1b57b35a3fc2a08dd.tar.bz2 | |
Merge topic 'deployqt4-cmp0080-fix'
31b6825bd2 Merge branch 'master' into deployqt4-cmp0080-fix
15bbff0581 DeployQt4: Do not include BundleUtilities at configure time
65bea5b90b DeployQt4: Convert to 2-space indentation
9bfb63bd42 Help: Convert DeployQt4 to block-style comment
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2494
Diffstat (limited to 'Modules/BundleUtilities.cmake')
| -rw-r--r-- | Modules/BundleUtilities.cmake | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Modules/BundleUtilities.cmake b/Modules/BundleUtilities.cmake index c963e09..4a3f476 100644 --- a/Modules/BundleUtilities.cmake +++ b/Modules/BundleUtilities.cmake @@ -224,14 +224,18 @@ that are already also in the bundle... Anything that points to an external file causes this function to fail the verification. #]=======================================================================] +function(_warn_cmp0080) + cmake_policy(GET_WARNING CMP0080 _cmp0080_warning) + message(AUTHOR_WARNING "${_cmp0080_warning}\n") +endfunction() + # Do not include this module at configure time! if(DEFINED CMAKE_GENERATOR) cmake_policy(GET CMP0080 _BundleUtilities_CMP0080) if(_BundleUtilities_CMP0080 STREQUAL "NEW") message(FATAL_ERROR "BundleUtilities cannot be included at configure time!") - elseif(NOT _BundleUtilities_CMP0080 STREQUAL "OLD") - cmake_policy(GET_WARNING CMP0080 _cmp0080_warning) - message(AUTHOR_WARNING "${_cmp0080_warning}\n") + elseif(NOT _BundleUtilities_CMP0080 STREQUAL "OLD" AND NOT _CMP0080_SUPPRESS_WARNING) + _warn_cmp0080() endif() endif() |