From 9618434de56644fb61a76d4a3eb2176d629023fc Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 3 May 2019 14:08:17 +0200 Subject: CMake: configurejson2cmake: Do not generate useless OPTIONALs Do not set properties of packages to type OPTIONAL. That is the default anyway. Update generator script and generated files. Change-Id: I7a4d043b69c93ce8c2929a2e27ac6a07e4e6d8cc Reviewed-by: Simon Hausmann --- util/cmake/configurejson2cmake.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'util/cmake') diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py index 15cd9bab47..fc6f9845a6 100755 --- a/util/cmake/configurejson2cmake.py +++ b/util/cmake/configurejson2cmake.py @@ -270,9 +270,8 @@ def parseLib(ctx, lib, data, cm_fh, cmake_find_packages_set): else: cm_fh.write('qt_find_package({})\n'.format(newlib)) - cm_fh.write('set_package_properties({} PROPERTIES TYPE {})\n' - .format(newlib, 'REQUIRED' if isRequired else 'OPTIONAL') - ) + if isRequired: + cm_fh.write('set_package_properties({} PROPERTIES TYPE REQUIRED)\n'.format(newlib)) def lineify(label, value, quote=True): if value: -- cgit v1.2.3