AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: Fix qt-configure-module for modules without qt_cmdline.cmake

Browse Source 
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 <cristian.adam@qt.io>
This commit is contained in:
Joerg Bornemann 2020-09-11 11:55:22 +02:00
parent dad9550305
commit 87fd930fca
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/QtProcessConfigureArgs.cmake
View File

@ -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}/")