diff --git a/cmake/Scripts/generate_findpackage_file b/cmake/Scripts/generate_findpackage_file
index 6fc5fbd29c..b6e4ad44d9 100644
--- a/cmake/Scripts/generate_findpackage_file
+++ b/cmake/Scripts/generate_findpackage_file
@@ -130,17 +130,17 @@ libs.split(" ").each do |lib|
 	file.printf("      /sw/lib\n")
 	file.printf("  )\n")
 	file.printf("  mark_as_advanced(#{lib.upcase}_LIBRARY)\n")
+	file.printf("\n")
 end
 
-file.printf("\n")
-
 libs.split(" ").each do |lib|
 	file.printf("  if (#{lib.upcase}_LIBRARY)\n")
 	file.printf("    set(#{lib.upcase}_FOUND TRUE)\n")
+	file.printf("    mark_as_advanced(#{lib.upcase}_FOUND)\n")
 	file.printf("  endif (#{lib.upcase}_LIBRARY)\n")
+	file.printf("\n")
 end
 
-file.printf("\n")
 
 file.printf("  set(#{cmakeIncDirNames}\n")
 file.printf("    ${#{cmakeIncDirName}}\n")
@@ -156,9 +156,9 @@ libs.split(" ").each do |lib|
 	file.printf("      ${#{lib.upcase}_LIBRARY}\n")
 	file.printf("    )\n")
 	file.printf("  endif (#{lib.upcase}_FOUND)\n")
+	file.printf("\n")
 end
 
-file.printf("\n")
 
 file.printf("  if (#{cmakeIncDirNames} AND #{cmakeLibNames})\n")
 file.printf("     set(#{cmakeFoundName} TRUE)\n")