forked from pool/wireshark
aa1945969e
cmake 3.20 compatibility (boo#1184110) fix build with glib2-2.68 (:G) OBS-URL: https://build.opensuse.org/request/show/882441 OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=341
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
commit 22cf2cb345b16f9783165e9cfc80ed9a97a11ca0
|
|
Author: João Valverde <joao.valverde@tecnico.ulisboa.pt>
|
|
Date: Mon Mar 29 01:32:20 2021 +0100
|
|
|
|
CMake: Set CMake Policy CMP0071 to NEW
|
|
|
|
This policy says: "Since version 3.10, CMake processes regular and GENERATED
|
|
source files in AUTOMOC and AUTOUIC. In earlier CMake versions, only regular
|
|
source files were processed. GENERATED source files were ignored silently."
|
|
|
|
We are currently running AUTOMOC/RCC/UIC on too many files unnecessarily and
|
|
that should be improved. CMake 3.20 introduced some changes related with this
|
|
that broke the build (issue #17314) and need further investigation.
|
|
|
|
Meanwhile setting this policy to NEW shouldn't break anything and silences
|
|
some noisy CMake warnings.
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 99ce96ba3c..fc2d491783 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -24,6 +24,9 @@ endif()
|
|
if(POLICY CMP0069)
|
|
cmake_policy(SET CMP0069 NEW)
|
|
endif()
|
|
+if(POLICY CMP0071)
|
|
+ cmake_policy(SET CMP0071 NEW)
|
|
+endif()
|
|
if(POLICY CMP0074)
|
|
cmake_policy(SET CMP0074 NEW)
|
|
endif()
|