From 87fd930fca0fbba11c164ac106deb5244ddac97f Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 11 Sep 2020 11:55:22 +0200 Subject: [PATCH] CMake: Fix qt-configure-module for modules without qt_cmdline.cmake Some repos/modules don't have configure.json files and thus no qt_cmdline.cmake files. Make qt-configure-module check for the file's existence. As drive-by fix, surround the configure.cmake's path by double quotes. Change-Id: If1a91a0bba0c2fd282cfa08fa6ff2bb20f0a15ba Reviewed-by: Cristian Adam --- cmake/QtProcessConfigureArgs.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmake/QtProcessConfigureArgs.cmake b/cmake/QtProcessConfigureArgs.cmake index 8a620ba31c..eac9bff144 100644 --- a/cmake/QtProcessConfigureArgs.cmake +++ b/cmake/QtProcessConfigureArgs.cmake @@ -177,9 +177,11 @@ while(commandline_files) set(configure_file "${commandline_file_directory}/${configure_filename}") unset(commandline_subconfigs) if(EXISTS "${configure_file}") - include(${configure_file}) + include("${configure_file}") + endif() + if(EXISTS "${commandline_file}") + include("${commandline_file}") endif() - include(${commandline_file}) if(commandline_subconfigs) list(TRANSFORM commandline_subconfigs PREPEND "${commandline_file_directory}/")