Fix logic (When we don't find mini version of lib

we must exit)

svn path=/trunk/KDE/kdelibs/; revision=679228

4 files changed, 59 insertions, 63 deletions

diff --git a/modules/FindExiv2.cmake b/modules/FindExiv2.cmake
index 6e34d60e..2f6caa1d 100644
--- a/modules/FindExiv2.cmake
+++ b/modules/FindExiv2.cmake
@@ -59,22 +59,21 @@ else (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES)
      if (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES)
         set(EXIV2_FOUND TRUE)
      endif (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES)
-  
-     if (EXIV2_FOUND)
-        if (NOT Exiv2_FIND_QUIETLY)
-         message(STATUS "Found Exiv2: ${EXIV2_LIBRARIES}")
-        endif (NOT Exiv2_FIND_QUIETLY)
-     else (EXIV2_FOUND)
-       if (Exiv2_FIND_REQUIRED)
-         if (NOT EXIV2_INCLUDE_DIR)
-           message(FATAL_ERROR "Could NOT find Exiv2 header files")
-         endif (NOT EXIV2_INCLUDE_DIR)
-         if (NOT EXIV2_LIBRARIES)
+   endif(EXIV2_VERSION_GOOD_FOUND)
+   if (EXIV2_FOUND)
+      if (NOT Exiv2_FIND_QUIETLY)
+       message(STATUS "Found Exiv2: ${EXIV2_LIBRARIES}")
+      endif (NOT Exiv2_FIND_QUIETLY)
+   else (EXIV2_FOUND)
+     if (Exiv2_FIND_REQUIRED)
+       if (NOT EXIV2_INCLUDE_DIR)
+         message(FATAL_ERROR "Could NOT find Exiv2 header files")
+       endif (NOT EXIV2_INCLUDE_DIR)
+       if (NOT EXIV2_LIBRARIES)
            message(FATAL_ERROR "Could NOT find Exiv2 library")
-         endif (NOT EXIV2_LIBRARIES)
-       endif (Exiv2_FIND_REQUIRED)
-     endif (EXIV2_FOUND)
-  endif(EXIV2_VERSION_GOOD_FOUND)
+       endif (NOT EXIV2_LIBRARIES)
+     endif (Exiv2_FIND_REQUIRED)
+   endif (EXIV2_FOUND)
 
   MARK_AS_ADVANCED(EXIV2_INCLUDE_DIR EXIV2_LIBRARIES)
   
diff --git a/modules/FindKdcraw.cmake b/modules/FindKdcraw.cmake
index 06e408d6..371ff9c3 100644
--- a/modules/FindKdcraw.cmake
+++ b/modules/FindKdcraw.cmake
@@ -78,22 +78,21 @@ else (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES)
         if (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES)
             set(KDCRAW_FOUND TRUE)
         endif (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES)
-    
-        if (KDCRAW_FOUND)
-            if (NOT Kdcraw_FIND_QUIETLY)
-                message(STATUS "Found libkdcraw: ${KDCRAW_LIBRARIES}")
-            endif (NOT Kdcraw_FIND_QUIETLY)
-        else (KDCRAW_FOUND)
-            if (Kdcraw_FIND_REQUIRED)
-                if (NOT KDCRAW_INCLUDE_DIR)
-                    message(FATAL_ERROR "Could NOT find libkdcraw header files")
-                endif (NOT KDCRAW_INCLUDE_DIR)
-                if (NOT KDCRAW_LIBRARIES)
-                    message(FATAL_ERROR "Could NOT find libkdcraw library")
-                endif (NOT KDCRAW_LIBRARIES)
-            endif (Kdcraw_FIND_REQUIRED)
-        endif (KDCRAW_FOUND)
-    endif(KDCRAW_VERSION_GOOD_FOUND)
+     endif(KDCRAW_VERSION_GOOD_FOUND) 
+     if (KDCRAW_FOUND)
+         if (NOT Kdcraw_FIND_QUIETLY)
+             message(STATUS "Found libkdcraw: ${KDCRAW_LIBRARIES}")
+         endif (NOT Kdcraw_FIND_QUIETLY)
+     else (KDCRAW_FOUND)
+         if (Kdcraw_FIND_REQUIRED)
+             if (NOT KDCRAW_INCLUDE_DIR)
+                 message(FATAL_ERROR "Could NOT find libkdcraw header files")
+             endif (NOT KDCRAW_INCLUDE_DIR)
+             if (NOT KDCRAW_LIBRARIES)
+                 message(FATAL_ERROR "Could NOT find libkdcraw library")
+             endif (NOT KDCRAW_LIBRARIES)
+         endif (Kdcraw_FIND_REQUIRED)
+     endif (KDCRAW_FOUND)
     
     MARK_AS_ADVANCED(KDCRAW_INCLUDE_DIR KDCRAW_LIBRARIES)
 
diff --git a/modules/FindKexiv2.cmake b/modules/FindKexiv2.cmake
index e292334b..8093fbd4 100644
--- a/modules/FindKexiv2.cmake
+++ b/modules/FindKexiv2.cmake
@@ -78,22 +78,21 @@ else (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES)
         if (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES)
             set(KEXIV2_FOUND TRUE)
         endif (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES)
-    
-        if (KEXIV2_FOUND)
-            if (NOT Kexiv2_FIND_QUIETLY)
-                message(STATUS "Found libkexiv2: ${KEXIV2_LIBRARIES}")
-            endif (NOT Kexiv2_FIND_QUIETLY)
-        else (KEXIV2_FOUND)
-            if (Kexiv2_FIND_REQUIRED)
-                if (NOT KEXIV2_INCLUDE_DIR)
-                    message(FATAL_ERROR "Could NOT find libkexiv2 header files")
-                endif (NOT KEXIV2_INCLUDE_DIR)
-                if (NOT KEXIV2_LIBRARIES)
-                    message(FATAL_ERROR "Could NOT find libkexiv2 library")
-                endif (NOT KEXIV2_LIBRARIES)
-            endif (Kexiv2_FIND_REQUIRED)
-        endif (KEXIV2_FOUND)
-    endif(KEXIV2_VERSION_GOOD_FOUND)
+      endif(KEXIV2_VERSION_GOOD_FOUND) 
+      if (KEXIV2_FOUND)
+          if (NOT Kexiv2_FIND_QUIETLY)
+              message(STATUS "Found libkexiv2: ${KEXIV2_LIBRARIES}")
+          endif (NOT Kexiv2_FIND_QUIETLY)
+      else (KEXIV2_FOUND)
+          if (Kexiv2_FIND_REQUIRED)
+              if (NOT KEXIV2_INCLUDE_DIR)
+                  message(FATAL_ERROR "Could NOT find libkexiv2 header files")
+              endif (NOT KEXIV2_INCLUDE_DIR)
+              if (NOT KEXIV2_LIBRARIES)
+                  message(FATAL_ERROR "Could NOT find libkexiv2 library")
+              endif (NOT KEXIV2_LIBRARIES)
+          endif (Kexiv2_FIND_REQUIRED)
+      endif (KEXIV2_FOUND)
     
     MARK_AS_ADVANCED(KEXIV2_INCLUDE_DIR KEXIV2_LIBRARIES)
 
diff --git a/modules/FindKipi.cmake b/modules/FindKipi.cmake
index 5f8430dc..9afbbcdd 100644
--- a/modules/FindKipi.cmake
+++ b/modules/FindKipi.cmake
@@ -78,22 +78,21 @@ else (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES)
         if (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES)
             set(KIPI_FOUND TRUE)
         endif (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES)
-    
-        if (KIPI_FOUND)
-            if (NOT Kipi_FIND_QUIETLY)
-                message(STATUS "Found libkipi: ${KIPI_LIBRARIES}")
-            endif (NOT Kipi_FIND_QUIETLY)
-        else (KIPI_FOUND)
-            if (Kipi_FIND_REQUIRED)
-                if (NOT KIPI_INCLUDE_DIR)
-                    message(FATAL_ERROR "Could NOT find libkipi header files")
-                endif (NOT KIPI_INCLUDE_DIR)
-                if (NOT KIPI_LIBRARIES)
-                    message(FATAL_ERROR "Could NOT find libkipi library")
-                endif (NOT KIPI_LIBRARIES)
-            endif (Kipi_FIND_REQUIRED)
-        endif (KIPI_FOUND)
-    endif(KIPI_VERSION_GOOD_FOUND)
+      endif(KIPI_VERSION_GOOD_FOUND)
+      if (KIPI_FOUND)
+          if (NOT Kipi_FIND_QUIETLY)
+              message(STATUS "Found libkipi: ${KIPI_LIBRARIES}")
+          endif (NOT Kipi_FIND_QUIETLY)
+      else (KIPI_FOUND)
+          if (Kipi_FIND_REQUIRED)
+              if (NOT KIPI_INCLUDE_DIR)
+                  message(FATAL_ERROR "Could NOT find libkipi header files")
+              endif (NOT KIPI_INCLUDE_DIR)
+              if (NOT KIPI_LIBRARIES)
+                  message(FATAL_ERROR "Could NOT find libkipi library")
+              endif (NOT KIPI_LIBRARIES)
+          endif (Kipi_FIND_REQUIRED)
+      endif (KIPI_FOUND)
     
     MARK_AS_ADVANCED(KIPI_INCLUDE_DIR KIPI_LIBRARIES)