diff options
| author | Helio Castro <helio@kde.org> | 2008-11-11 15:30:12 +0000 |
|---|---|---|
| committer | Helio Castro <helio@kde.org> | 2008-11-11 15:30:12 +0000 |
| commit | 3c3016a1dff7df3966a1a627e11e9a41a8fadb51 (patch) | |
| tree | a89960994d8c0ba9274a6db4034e93cb94c8ff9b /modules | |
| parent | daf29017c6ca5901d7d14918dbbcd326f23e0c5c (diff) | |
| download | extra-cmake-modules-3c3016a1dff7df3966a1a627e11e9a41a8fadb51.tar.gz extra-cmake-modules-3c3016a1dff7df3966a1a627e11e9a41a8fadb51.tar.bz2 | |
- Fix includedirs and add requires for pkgconfig
svn path=/trunk/KDE/kdelibs/; revision=882894
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/FindExiv2.cmake | 2 | ||||
| -rw-r--r-- | modules/FindXine.cmake | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/modules/FindExiv2.cmake b/modules/FindExiv2.cmake index 4895b6c4..c16e210b 100644 --- a/modules/FindExiv2.cmake +++ b/modules/FindExiv2.cmake @@ -12,6 +12,8 @@ if (EXIV2_INCLUDEDIR AND EXIV2_LIBRARIES) else (EXIV2_INCLUDEDIR AND EXIV2_LIBRARIES) if (NOT WIN32) + find_package(PkgConfig REQUIRED) + if(NOT EXIV2_MIN_VERSION) set(EXIV2_MIN_VERSION "0.12") endif(NOT EXIV2_MIN_VERSION) diff --git a/modules/FindXine.cmake b/modules/FindXine.cmake index 388e1ab7..6221f96a 100644 --- a/modules/FindXine.cmake +++ b/modules/FindXine.cmake @@ -7,18 +7,19 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -if (XINE_INCLUDEDIR AND XINE_LIBRARY) +if (XINE_INCLUDEDIR AND XINE_LIBRARIES) # Already in cache, be silent set(Xine_FIND_QUIETLY TRUE) -endif (XINE_INCLUDE_DIR AND XINE_LIBRARY) +endif (XINE_INCLUDEDIR AND XINE_LIBRARIES) IF (NOT WIN32) - PKG_CHECK_MODULES(PKG_XINE libxine>=1.1.9) + find_package(PkgConfig REQUIRED) + pkg_check_modules(XINE libxine>=1.1.9) ENDIF (NOT WIN32) if( XINE_FOUND ) SET(CMAKE_REQUIRED_INCLUDES ${XINE_INCLUDEDIR}) - SET(CMAKE_REQUIRED_LIBRARIES ${XINE_LIBRARY}) + SET(CMAKE_REQUIRED_LIBRARIES ${XINE_LIBRARIES}) if (NOT Xine_FIND_QUIETLY) message(STATUS "Found XINE: ${XINE_LIBRARY}") endif (NOT Xine_FIND_QUIETLY) |