[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/cmake/modules
From:       Alexander Neundorf <neundorf () kde ! org>
Date:       2008-11-13 22:29:41
Message-ID: 1226615381.214066.16131.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 883966 by neundorf:

-lowercasing
-use find_package_handle_standard_args()

Alex




 M  +8 -23     FindQCA2.cmake  


--- trunk/KDE/kdelibs/cmake/modules/FindQCA2.cmake #883965:883966
@@ -24,7 +24,7 @@
 else (QCA2_INCLUDE_DIR AND QCA2_LIBRARIES)
 
 
-  IF (NOT WIN32)
+  if (NOT WIN32)
     find_package(PkgConfig)
     pkg_check_modules(QCA2 qca2)
 
@@ -45,32 +45,17 @@
        find_path(QCA2_INCLUDE_DIR qca.h PATH_SUFFIXES QtCrypto)
     endif(QCA2_FOUND)
 
-  ELSE (NOT WIN32)
-    FIND_LIBRARY_WITH_DEBUG(QCA2_LIBRARIES
+  else (NOT WIN32)
+    find_library_with_debug(QCA2_LIBRARIES
                     WIN32_DEBUG_POSTFIX d
                     NAMES qca)
 
-    FIND_PATH(QCA2_INCLUDE_DIR_tmp QtCrypto/qca.h)
-    IF(QCA2_INCLUDE_DIR_tmp)
-      SET(QCA2_INCLUDE_DIR ${QCA2_INCLUDE_DIR_tmp}/QtCrypto CACHE TYPE PATH FORCE)
-    ENDIF(QCA2_INCLUDE_DIR_tmp)
-  ENDIF (NOT WIN32)
+    find_path(QCA2_INCLUDE_DIR qca.h PATH_SUFFIXES QtCrypto)
+  endif (NOT WIN32)
 
+   include(FindPackageHandleStandardArgs)
+   find_package_handle_standard_args(QCA2  DEFAULT_MSG  QCA2_LIBRARIES QCA2_INCLUDE_DIR)
 
-  if (QCA2_INCLUDE_DIR AND QCA2_LIBRARIES)
-    set(QCA2_FOUND TRUE)
-  else (QCA2_INCLUDE_DIR AND QCA2_LIBRARIES)
-    if (NOT QCA2_INCLUDE_DIR)
-      message(STATUS "Could NOT find QCA2 includes")
-    endif (NOT QCA2_INCLUDE_DIR)
-    if (NOT QCA2_LIBRARIES)
-      message(STATUS "Could NOT find QCA2 libraries")
-    endif (NOT QCA2_LIBRARIES)
-    if (QCA2_FIND_REQUIRED)
-      message(FATAL_ERROR "Could NOT find QCA2")
-    endif (QCA2_FIND_REQUIRED)
-  endif (QCA2_INCLUDE_DIR AND QCA2_LIBRARIES)
+  mark_as_advanced(QCA2_INCLUDE_DIR QCA2_LIBRARIES)
 
-  MARK_AS_ADVANCED(QCA2_INCLUDE_DIR QCA2_LIBRARIES)
-
 endif (QCA2_INCLUDE_DIR AND QCA2_LIBRARIES)
[prev in list] [next in list] [prev in thread] [next in thread]