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

List:       kde-commits
Subject:    KDE/kdepimlibs/cmake/modules
From:       Allen Winter <winter () kde ! org>
Date:       2008-07-31 0:01:21
Message-ID: 1217462481.464117.25711.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 839868 by winterz:

fix to find libical and libicalss stuff


 M  +13 -11    FindLibical.cmake  


--- trunk/KDE/kdepimlibs/cmake/modules/FindLibical.cmake #839867:839868
@@ -1,7 +1,7 @@
 # Find Libical
 #
 #  LIBICAL_FOUND - system has Libical
-#  LIBICAL_INCLUDE_DIRS - the Libical include directory
+#  LIBICAL_INCLUDE_DIRS - the Libical include directories
 #  LIBICAL_LIBRARIES - The libraries needed to use Libical
 
 # Copyright (c) 2008, Allen Winter <winter@kde.org>
@@ -9,21 +9,23 @@
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
-SET (LIBICAL_FIND_REQUIRED ${Libical_FIND_REQUIRED})
-if (LIBICAL_INCLUDE_DIR AND LIBICAL_LIBRARIES)
+set(LIBICAL_FIND_REQUIRED ${Libical_FIND_REQUIRED})
+if(LIBICAL_INCLUDE_DIRS AND LIBICAL_LIBRARIES)
 
   # Already in cache, be silent
   set(LIBICAL_FIND_QUIETLY TRUE)
 
-else (LIBICAL_INCLUDE_DIR AND LIBICAL_LIBRARIES)
+endif(LIBICAL_INCLUDE_DIRS AND LIBICAL_LIBRARIES)
 
-  find_path(LIBICAL_INCLUDE_DIR ical.h)
-  find_library(LIBICAL_LIBRARIES NAMES ical )
+find_path(LIBICAL_INCLUDE_DIR NAMES ical.h PATH_SUFFIXES libical)
+find_path(LIBICALSS_INCLUDE_DIR NAMES icalss.h PATH_SUFFIXES libicalss)
+set(LIBICAL_INCLUDE_DIRS ${LIBICAL_INCLUDE_DIR} ${LIBICALSS_INCLUDE_DIR})
 
-  include(FindPackageHandleStandardArgs)
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBICAL DEFAULT_MSG
-                                    LIBICAL_LIBRARIES LIBICAL_INCLUDE_DIR)
+find_library(LIBICAL_LIBRARY NAMES ical)
+find_library(LIBICALSS_LIBRARY NAMES icalss)
+set(LIBICAL_LIBRARIES ${LIBICAL_LIBRARY} ${LIBICALSS_LIBRARY})
 
-  mark_as_advanced(LIBICAL_INCLUDE_DIR LIBICAL_LIBRARIES)
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBICAL DEFAULT_MSG LIBICAL_LIBRARIES LIBICAL_INCLUDE_DIRS)
 
-endif (LIBICAL_INCLUDE_DIR AND LIBICAL_LIBRARIES)
+mark_as_advanced(LIBICAL_INCLUDE_DIRS LIBICAL_LIBRARIES)
[prev in list] [next in list] [prev in thread] [next in thread]