cmake.eclass: cmake_punt_find_package: Support <filename> being a dir…

…ectory

Signed-off-by: Andreas Sturmlechner <[email protected]>

eclass/cmake.eclass

@@ -185,7 +185,8 @@ cmake_comment_add_subdirectory() {
 # @FUNCTION: cmake_punt_find_package
 # @USAGE: [-f <filename>] <pkg> [<components>...]
 # @DESCRIPTION:
-# Default value for <filename> is CMakeLists.txt if not set.
+# Default value for <filename> is CMakeLists.txt if not set.  If given a
+# directory instead, will try to modify a CMakeLists.txt below, if exists.
 # In <filename> below current directory, remove a find_package(<pkg>) call.
 # If given one or more <components>, remove those from COMPONENTS instead.
 cmake_punt_find_package() {
@@ -206,7 +207,11 @@ cmake_punt_find_package() {
 			shift ;;
 	esac
 
-	if [[ ! -e "${filename}" ]]; then
+	if [[ -d ${filename} ]]; then
+		filename+="/CMakeLists.txt"
+		einfo "modifying ${filename}!"
+	fi
+	if [[ ! -e ${filename} ]]; then
 		die "${FUNCNAME[0]}: called on non-existing ${filename}"
 		return
 	fi
@@ -221,7 +226,7 @@ cmake_punt_find_package() {
 
 			# pcre2grep returns non-zero on no matches/error
 			if [[ $? -ne 0 ]]; then
-				eqawarn "QA Notice: ${FUNCNAME[0]}(${pkg}, ${cmpnt}) called, but no matches found!"
+				eqawarn "QA Notice: ${FUNCNAME}(${pkg}, ${cmpnt}) called, but no matches found!"
 				continue
 			fi