1 files changed, 22 insertions, 9 deletions
diff --git a/generate_findpackage_file b/generate_findpackage_file
index 818b4f08..db3da7d9 100755
--- a/generate_findpackage_file
+++ b/generate_findpackage_file
@@ -16,9 +16,6 @@ header=gets.chomp
 
 print("Include subdir (e.g. \"libxml2\", empty to skip ): ")
 incSubDir=gets.chomp
-if not incSubDir.empty?
-   incSubDir="/"+incSubDir
-end
 
 print("Look for library (e.g. \"jpeg\" or \"xml2\"): ")
 lib=gets.chomp
@@ -51,13 +48,29 @@ if not pkgconfig.empty?
    file.printf("SET(#{cmakeDefsName} ${_#{package}Cflags})\n\n")
 end
 
-file.printf("FIND_PATH(#{cmakeIncDirName} #{header}\n")
-if not pkgconfig.empty?
-   file.printf("  ${_#{package}IncDir}#{incSubDir}\n")
+if not incSubDir.empty?
+   cmakeRootIncDirName=package.upcase+"_ROOT_INCLUDE_DIR"
+
+   file.printf("FIND_PATH(#{cmakeRootIncDirName} #{incSubDir}/#{header}\n")
+   if not pkgconfig.empty?
+      file.printf("  ${_#{package}IncDir}\n")
+   end
+   file.printf("  /usr/include\n")
+   file.printf("  /usr/local/include\n")
+   file.printf(")\n\n")
+
+   file.printf("SET(#{cmakeIncDirName} ${#{cmakeRootIncDirName}}/#{incSubDir} CACHE PATH \"The #{package} include directory\" )\n")
+   file.printf("MARK_AS_ADVANCED(#{cmakeRootIncDirName})\n\n")
+else
+   file.printf("FIND_PATH(#{cmakeIncDirName} #{header}\n")
+   if not pkgconfig.empty?
+      file.printf("  ${_#{package}IncDir}\n")
+   end
+   file.printf("  /usr/include\n")
+   file.printf("  /usr/local/include\n")
+   file.printf(")\n\n")
 end
-file.printf("  /usr/include#{incSubDir}\n")
-file.printf("  /usr/local/include#{incSubDir}\n")
-file.printf(")\n\n")
+
 
 file.printf("FIND_LIBRARY(#{cmakeLibName} NAMES #{lib}\n")
 file.printf("  PATHS\n")