diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2008-12-23 09:41:26 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2008-12-23 09:41:26 +0000 |
| commit | 3e35ce31b2824e0a37b98cba98d29a5227f46370 (patch) | |
| tree | 53118ff5f7a1ae48b17baf0ae5927bab7fe1ab41 | |
| parent | 81e042e87254db5293e1a1e3891f9529d0373b4d (diff) | |
| download | extra-cmake-modules-3e35ce31b2824e0a37b98cba98d29a5227f46370.tar.gz extra-cmake-modules-3e35ce31b2824e0a37b98cba98d29a5227f46370.tar.bz2 | |
-replace UsePkgConfig with FindPkgConfig
Alex
svn path=/trunk/KDE/kdelibs/; revision=900552
| -rw-r--r-- | modules/FindENCHANT.cmake | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/modules/FindENCHANT.cmake b/modules/FindENCHANT.cmake index 76d577c6..0b30f326 100644 --- a/modules/FindENCHANT.cmake +++ b/modules/FindENCHANT.cmake @@ -21,24 +21,24 @@ else (ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES) if (NOT WIN32) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls - include(UsePkgConfig) - - pkgconfig(enchant _ENCHANTIncDir _ENCHANTLinkDir _ENCHANTLinkFlags _ENCHANTCflags) - - set(ENCHANT_DEFINITIONS ${_ENCHANTCflags}) + find_package(PkgConfig) + pkg_check_modules(PC_ENCHANT enchant) + set(ENCHANT_DEFINITIONS ${PC_ENCHANT_CFLAGS_OTHER}) endif (NOT WIN32) find_path(ENCHANT_INCLUDE_DIR - NAMES enchant++.h - PATH_SUFFIXES enchant - PATHS ${_ENCHANTIncDir} ) + NAMES enchant++.h + HINTS ${PC_ENCHANT_INCLUDEDIR} + ${PC_ENCHANT_INCLUDE_DIRS} + PATH_SUFFIXES enchant ) find_library(ENCHANT_LIBRARIES NAMES enchant - PATHS ${_ENCHANTLinkDir} ) + HINTS ${PC_ENCHANT_LIBDIR} + ${PC_ENCHANT_LIBRARY_DIRS} ) include(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(ENCHANT DEFAULT_MSG ENCHANT_INCLUDE_DIR ENCHANT_LIBRARIES ) + find_package_handle_standard_args(ENCHANT DEFAULT_MSG ENCHANT_INCLUDE_DIR ENCHANT_LIBRARIES ) mark_as_advanced(ENCHANT_INCLUDE_DIR ENCHANT_LIBRARIES) - + endif (ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES) |