-fix Foo_FIND_REQUIRED and Foo_FIND_QUIETYL handling:

Alex



svn path=/trunk/KDE/kdesdk/cmake/; revision=501687

8 files changed, 32 insertions, 32 deletions

diff --git a/generate_findpackage_file b/generate_findpackage_file
index c76e2604..6b804664 100755
--- a/generate_findpackage_file
+++ b/generate_findpackage_file
@@ -27,8 +27,8 @@ cmakeIncDirName=package.upcase+"_INCLUDE_DIR"
 cmakeLibName=package.upcase+"_LIBRARY"
 cmakeDefsName=package.upcase+"_DEFINITIONS"
 cmakeFoundName=package.upcase+"_FOUND"
-cmakeQuietName=package.upcase+"_QUIETLY"
-cmakeRequiredName=package.upcase+"_REQUIRED"
+cmakeQuietName=package+"_FIND_QUIETLY"
+cmakeRequiredName=package+"_FIND_REQUIRED"
 
 file=File.new("Find#{package}.cmake", "w+")
 
@@ -77,9 +77,9 @@ file.printf("  IF(NOT #{cmakeQuietName})\n")
 file.printf("    MESSAGE(STATUS \"Found #{package}: ${#{cmakeLibName}}\")\n")
 file.printf("  ENDIF(NOT #{cmakeQuietName})\n")
 file.printf("ELSE(#{cmakeFoundName})\n")
-file.printf("  IF(NOT #{cmakeRequiredName})\n")
+file.printf("  IF(#{cmakeRequiredName})\n")
 file.printf("    MESSAGE(SEND_ERROR \"Could not find #{package}\")\n")
-file.printf("  ENDIF(NOT #{cmakeRequiredName})\n")
+file.printf("  ENDIF(#{cmakeRequiredName})\n")
 file.printf("ENDIF(#{cmakeFoundName})\n\n")
 
 printf("Done, generated Find#{package}.cmake\n")
\ No newline at end of file
diff --git a/modules/FindBZip2.cmake b/modules/FindBZip2.cmake
index b6a99d62..cc248ad1 100644
--- a/modules/FindBZip2.cmake
+++ b/modules/FindBZip2.cmake
@@ -27,12 +27,12 @@ IF(BZIP2_INCLUDE_DIR AND BZIP2_LIBRARY)
 ENDIF(BZIP2_INCLUDE_DIR AND BZIP2_LIBRARY)
 
 IF(BZIP2_FOUND)
-  IF(NOT BZIP2_QUIETLY)
+  IF(NOT BZip2_FIND_QUIETLY)
     MESSAGE(STATUS "Found BZip2: ${BZIP2_LIBRARY}")
-  ENDIF(NOT BZIP2_QUIETLY)
+  ENDIF(NOT BZip2_FIND_QUIETLY)
 ELSE(BZIP2_FOUND)
-  IF(NOT BZIP2_REQUIRED)
+  IF(BZip2_FIND_REQUIRED)
     MESSAGE(SEND_ERROR "Could not find BZip2")
-  ENDIF(NOT BZIP2_REQUIRED)
+  ENDIF(BZip2_FIND_REQUIRED)
 ENDIF(BZIP2_FOUND)
 
diff --git a/modules/FindCups.cmake b/modules/FindCups.cmake
index 1e669d45..f0518f68 100644
--- a/modules/FindCups.cmake
+++ b/modules/FindCups.cmake
@@ -24,12 +24,12 @@ IF(CUPS_INCLUDE_DIR AND CUPS_LIBRARY)
 ENDIF(CUPS_INCLUDE_DIR AND CUPS_LIBRARY)
 
 IF(CUPS_FOUND)
-  IF(NOT CUPS_QUIETLY)
+  IF(NOT Cups_FIND_QUIETLY)
     MESSAGE(STATUS "Found Cups: ${CUPS_LIBRARY}")
-  ENDIF(NOT CUPS_QUIETLY)
+  ENDIF(NOT Cups_FIND_QUIETLY)
 ELSE(CUPS_FOUND)
-  IF(NOT CUPS_REQUIRED)
+  IF(Cups_FIND_REQUIRED)
     MESSAGE(SEND_ERROR "Could not find Cups")
-  ENDIF(NOT CUPS_REQUIRED)
+  ENDIF(Cups_FIND_REQUIRED)
 ENDIF(CUPS_FOUND)
 
diff --git a/modules/FindJasper.cmake b/modules/FindJasper.cmake
index 4123229e..87bdb70d 100644
--- a/modules/FindJasper.cmake
+++ b/modules/FindJasper.cmake
@@ -17,11 +17,11 @@ ENDIF(JASPER_INCLUDE_DIR AND JASPER_LIBRARY)
 
 
 IF(JASPER_FOUND)
-   IF(NOT JASPER_FIND_QUIETLY)
+   IF(NOT Jasper_FIND_QUIETLY)
       MESSAGE(STATUS "Found jasper: ${JASPER_LIBRARY}")
-   ENDIF(NOT JASPER_FIND_QUIETLY)
+   ENDIF(NOT Jasper_FIND_QUIETLY)
 ELSE(JASPER_FOUND)
-   IF(JASPER_FIND_REQUIRED)
+   IF(Jasper_FIND_REQUIRED)
       MESSAGE(SEND_ERROR "Could not find jasper library")
-   ENDIF(JASPER_FIND_REQUIRED)
+   ENDIF(Jasper_FIND_REQUIRED)
 ENDIF(JASPER_FOUND)
diff --git a/modules/FindLibArt.cmake b/modules/FindLibArt.cmake
index e8bd5a6b..3a716fef 100644
--- a/modules/FindLibArt.cmake
+++ b/modules/FindLibArt.cmake
@@ -26,11 +26,11 @@ ENDIF(LIBART_INCLUDE_DIR AND LIBART_LIBRARY)
 
 
 IF(LIBART_FOUND)
-   IF(NOT LIBART_FIND_QUIETLY)
+   IF(NOT LibArt_FIND_QUIETLY)
       MESSAGE(STATUS "Found libart: ${LIBART_LIBRARY}")
-   ENDIF(NOT LIBART_FIND_QUIETLY)
+   ENDIF(NOT LibArt_FIND_QUIETLY)
 ELSE(LIBART_FOUND)
-   IF(LIBART_FIND_REQUIRED)
+   IF(LibArt_FIND_REQUIRED)
       MESSAGE(SEND_ERROR "Could not find libart")
-   ENDIF(LIBART_FIND_REQUIRED)
+   ENDIF(LibArt_FIND_REQUIRED)
 ENDIF(LIBART_FOUND)
diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake
index 37486afc..4be22454 100644
--- a/modules/FindLibXml2.cmake
+++ b/modules/FindLibXml2.cmake
@@ -34,12 +34,12 @@ IF(LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARY)
 ENDIF(LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARY)
 
 IF(LIBXML2_FOUND)
-  IF(NOT LIBXML2_QUIETLY)
+  IF(NOT LibXml2_FIND_QUIETLY)
     MESSAGE(STATUS "Found LibXml2: ${LIBXML2_LIBRARY}")
-  ENDIF(NOT LIBXML2_QUIETLY)
+  ENDIF(NOT LibXml2_FIND_QUIETLY)
 ELSE(LIBXML2_FOUND)
-  IF(NOT LIBXML2_REQUIRED)
+  IF(LibXml2_FIND_REQUIRED)
     MESSAGE(SEND_ERROR "Could not find LibXml2")
-  ENDIF(NOT LIBXML2_REQUIRED)
+  ENDIF(LibXml2_FIND_REQUIRED)
 ENDIF(LIBXML2_FOUND)
 
diff --git a/modules/FindLibXslt.cmake b/modules/FindLibXslt.cmake
index ed23fd64..f8007ce0 100644
--- a/modules/FindLibXslt.cmake
+++ b/modules/FindLibXslt.cmake
@@ -34,12 +34,12 @@ IF(LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARY)
 ENDIF(LIBXSLT_INCLUDE_DIR AND LIBXSLT_LIBRARY)
 
 IF(LIBXSLT_FOUND)
-  IF(NOT LIBXSLT_QUIETLY)
+  IF(NOT LibXslt_FIND_QUIETLY)
     MESSAGE(STATUS "Found LibXslt: ${LIBXSLT_LIBRARY}")
-  ENDIF(NOT LIBXSLT_QUIETLY)
+  ENDIF(NOT LibXslt_FIND_QUIETLY)
 ELSE(LIBXSLT_FOUND)
-  IF(NOT LIBXSLT_REQUIRED)
+  IF(LibXslt_FIND_REQUIRED)
     MESSAGE(SEND_ERROR "Could not find LibXslt")
-  ENDIF(NOT LIBXSLT_REQUIRED)
+  ENDIF(LibXslt_FIND_REQUIRED)
 ENDIF(LIBXSLT_FOUND)
 
diff --git a/modules/FindOpenSSL.cmake b/modules/FindOpenSSL.cmake
index 8b6d6e5d..1b13d63f 100644
--- a/modules/FindOpenSSL.cmake
+++ b/modules/FindOpenSSL.cmake
@@ -16,11 +16,11 @@ ENDIF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARY)
 
 
 IF(OPENSSL_FOUND)
-   IF(NOT OPENSSL_FIND_QUIETLY)
+   IF(NOT OpenSSL_FIND_QUIETLY)
       MESSAGE(STATUS "Found OpenSSL: ${OPENSSL_LIBRARY}")
-   ENDIF(NOT OPENSSL_FIND_QUIETLY)
+   ENDIF(NOT OpenSSL_FIND_QUIETLY)
 ELSE(OPENSSL_FOUND)
-   IF(OPENSSL_FIND_REQUIRED)
+   IF(OpenSSL_FIND_REQUIRED)
       MESSAGE(SEND_ERROR "Could not find OpenSSL")
-   ENDIF(OPENSSL_FIND_REQUIRED)
+   ENDIF(OpenSSL_FIND_REQUIRED)
 ENDIF(OPENSSL_FOUND)