1 files changed, 15 insertions, 23 deletions
diff --git a/generate_findpackage_file b/generate_findpackage_file
index db3da7d9..69ee36ac 100755
--- a/generate_findpackage_file
+++ b/generate_findpackage_file
@@ -16,12 +16,15 @@ 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
 
 cmakeIncDirName=package.upcase+"_INCLUDE_DIR"
-cmakeLibName=package.upcase+"_LIBRARY"
+cmakeLibName=package.upcase+"_LIBRARIES"
 cmakeDefsName=package.upcase+"_DEFINITIONS"
 cmakeFoundName=package.upcase+"_FOUND"
 cmakeQuietName=package+"_FIND_QUIETLY"
@@ -48,29 +51,13 @@ if not pkgconfig.empty?
    file.printf("SET(#{cmakeDefsName} ${_#{package}Cflags})\n\n")
 end
 
-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")
+file.printf("FIND_PATH(#{cmakeIncDirName} #{header}\n")
+if not pkgconfig.empty?
+   file.printf("  ${_#{package}IncDir}#{incSubDir}\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")
@@ -95,4 +82,9 @@ file.printf("    MESSAGE(FATAL_ERROR \"Could not find #{package}\")\n")
 file.printf("  ENDIF(#{cmakeRequiredName})\n")
 file.printf("ENDIF(#{cmakeFoundName})\n\n")
 
+
+file.printf("# show the #{cmakeIncDirName} and #{cmakeLibName} variables only in the advanced view\n")
+file.printf("MARK_AS_ADVANCED(#{cmakeIncDirName} #{cmakeLibName} )\n\n")
+
+
 printf("Done, generated Find#{package}.cmake\n")
 \ No newline at end of file