SOURCES: kde4-kdenetwork-FindIDN.patch (NEW) - old style FindIDN

shadzik shadzik at pld-linux.org
Thu Nov 20 12:25:19 CET 2008


Author: shadzik                      Date: Thu Nov 20 11:25:19 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- old style FindIDN

---- Files affected:
SOURCES:
   kde4-kdenetwork-FindIDN.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/kde4-kdenetwork-FindIDN.patch
diff -u /dev/null SOURCES/kde4-kdenetwork-FindIDN.patch:1.1
--- /dev/null	Thu Nov 20 12:25:20 2008
+++ SOURCES/kde4-kdenetwork-FindIDN.patch	Thu Nov 20 12:25:14 2008
@@ -0,0 +1,67 @@
+--- cmake/modules/FindIDN.cmake	2008-11-12 17:38:12.000000000 +0100
++++ cmake/modules/FindIDN.cmake-new	2008-11-20 12:00:35.898731500 +0100
+@@ -9,37 +9,32 @@
+ #
+ # Redistribution and use is allowed according to the terms of the BSD license.
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
++IF (NOT WIN32)
++  INCLUDE(UsePkgConfig)
+ 
+-if (IDN_INCLUDEDIR AND IDN_LIBRARIES)
+-    # cached
+-    SET(IDN_FOUND TRUE)
+-else (IDN_INCLUDEDIR AND IDN_LIBRARIES)
+-    if (NOT WIN32)
+-        find_package(PkgConfig)
+-        if(PKG_CONFIG_EXECUTABLE)
+-            pkg_check_modules(IDN libidn)
+-        endif(PKG_CONFIG_EXECUTABLE)
+-    endif (NOT WIN32)
+-  
+-    if(NOT IDN_FOUND)
+-        find_path(IDN_INCLUDEDIR idna.h)
+-        find_library(IDN_LIBRARIES NAMES idn)
+-        if (IDN_INCLUDEDIR AND IDN_LIBRARIES)
+-            SET(IDN_FOUND TRUE)
+-        endif (IDN_INCLUDEDIR AND IDN_LIBRARIES)
+-    endif(NOT IDN_FOUND)
+-
+-    if(IDN_FOUND)
+-        set(IDN_DEFINITIONS ${IDN_CFLAGS})
+-        if(NOT IDN_FIND_QUIETLY)
+-            message(STATUS "Found libidn: ${IDN_LIBRARIES}")
+-        endif(NOT IDN_FIND_QUIETLY)
+-        set(IDN_INCLUDE_DIR ${IDN_INCLUDEDIR})
+-        mark_as_advanced( IDN_INCLUDE_DIR )
+-    else(IDN_FOUND)
+-        if (IDN_FIND_REQUIRED)
+-            message(FATAL_ERROR "Not found required libidn")
+-        endif (IDN_FIND_REQUIRED)
+-    endif(IDN_FOUND)
+-endif (IDN_INCLUDEDIR AND IDN_LIBRARIES)
++  PKGCONFIG(libidn _IDNIncDir _IDNLinkDir _IDNLinkFlags _IDNCflags)
++
++  FIND_PATH(IDN_INCLUDE_DIR idna.h
++    PATHS
++    ${_IDNIncDir}
++    NO_DEFAULT_PATH
++  )
++
++  set(IDN_DEFINITIONS ${_IDNCflags})
++
++  FIND_LIBRARY(IDN_LIBRARY NAMES idn
++    PATHS
++    ${_IDNLinkDir} 
++    NO_DEFAULT_PATH 
++  )
++ELSE (NOT WIN32)
++  FIND_PATH(IDN_INCLUDE_DIR idna.h)
++  FIND_LIBRARY(IDN_LIBRARY NAMES idn idn-11 libidn-11)
++ENDIF (NOT WIN32)
++set(IDN_INCLUDES ${IDN_INCLUDE_DIR} )
++
++include(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(IDN DEFAULT_MSG IDN_INCLUDES IDN_LIBRARY )
++
++MARK_AS_ADVANCED(IDN_INCLUDE_DIR IDN_LIBRARY)
+ 
================================================================


More information about the pld-cvs-commit mailing list