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

List:       kde-commits
Subject:    KDE/kdebase/runtime/cmake/modules
From:       Andreas Schneider <mail () cynapses ! org>
Date:       2010-03-15 16:18:24
Message-ID: 1268669904.787034.5568.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1103667 by anschneider:

Fixed the libssh find module.


 M  +10 -11    FindLibSSH.cmake  
 D             FindPackageVersionCheck.cmake  


--- trunk/KDE/kdebase/runtime/cmake/modules/FindLibSSH.cmake #1103666:1103667
@@ -29,7 +29,7 @@
       ${CMAKE_INCLUDE_PATH}
       ${CMAKE_INSTALL_PREFIX}/include
   )
-  
+
   find_library(SSH_LIBRARY
     NAMES
       ssh
@@ -44,14 +44,14 @@
   )
 
   if (LIBSSH_INCLUDE_DIR AND SSH_LIBRARY)
-    set(SSH_FOUND TRUE)
+    set(LIBSSH_FOUND TRUE)
   endif (LIBSSH_INCLUDE_DIR AND SSH_LIBRARY)
 
   set(LIBSSH_INCLUDE_DIRS
     ${LIBSSH_INCLUDE_DIR}
   )
 
-  if (SSH_FOUND)
+  if (LIBSSH_FOUND)
     set(LIBSSH_LIBRARIES
       ${LIBSSH_LIBRARIES}
       ${SSH_LIBRARY}
@@ -60,26 +60,25 @@
     if (LibSSH_FIND_VERSION)
       file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_MAJOR
         REGEX "#define[ ]+LIBSSH_VERSION_MAJOR[ ]+[0-9]+")
+
       # Older versions of libssh like libssh-0.2 have LIBSSH_VERSION but not \
LIBSSH_VERSION_MAJOR  if (LIBSSH_VERSION_MAJOR)
         string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_MAJOR ${LIBSSH_VERSION_MAJOR})
-	file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_MINOR
+        file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_MINOR
           REGEX "#define[ ]+LIBSSH_VERSION_MINOR[ ]+[0-9]+")
-	string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_MINOR ${LIBSSH_VERSION_MINOR})
-	file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_PATCH
+        string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_MINOR ${LIBSSH_VERSION_MINOR})
+        file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_PATCH
           REGEX "#define[ ]+LIBSSH_VERSION_MICRO[ ]+[0-9]+")
-	string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_PATCH ${LIBSSH_VERSION_PATCH})
+        string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_PATCH ${LIBSSH_VERSION_PATCH})
 
-	set(LibSSH_VERSION \
${LIBSSH_VERSION_MAJOR}.${LIBSSH_VERSION_MINOR}.${LIBSSH_VERSION_PATCH}) +        \
set(LIBSSH_VERSION ${LIBSSH_VERSION_MAJOR}.${LIBSSH_VERSION_MINOR}.${LIBSSH_VERSION_PATCH})
  
-	include(FindPackageVersionCheck)
-	find_package_version_check(LibSSH DEFAULT_MSG)
       else (LIBSSH_VERSION_MAJOR)
         message(STATUS "LIBSSH_VERSION_MAJOR not found in \
${LIBSSH_INCLUDE_DIR}/libssh/libssh.h, assuming libssh is too old")  set(LIBSSH_FOUND \
FALSE)  endif (LIBSSH_VERSION_MAJOR)
     endif (LibSSH_FIND_VERSION)
-  endif (SSH_FOUND)
+  endif (LIBSSH_FOUND)
 
   # If the version is too old, but libs and includes are set,
   # find_package_handle_standard_args will set LIBSSH_FOUND to TRUE again,


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