diff options
| author | Dario Freddi <drf@kde.org> | 2009-12-24 12:17:27 +0000 |
|---|---|---|
| committer | Dario Freddi <drf@kde.org> | 2009-12-24 12:17:27 +0000 |
| commit | cb43713608b19412095db8f883fef4584aa592d4 (patch) | |
| tree | 238a7e7d7571d55a11fcbfaba420de31e28a9d57 | |
| parent | cb44bade9b0d2ee0eaf730e782ed67592e464234 (diff) | |
| download | extra-cmake-modules-cb43713608b19412095db8f883fef4584aa592d4.tar.gz extra-cmake-modules-cb43713608b19412095db8f883fef4584aa592d4.tar.bz2 | |
CCMAIL: neundorf@kde.org
Strange indeed. I applied your patch, but to make it work I had to change the find_path calls with
find_file, which actually makes more sense, also. They both work here (but the previous method worked too),
let's see how CDash likes this.
Ah, let me remind you of this: http://mail.kde.org/pipermail/kde-buildsystem/2009-December/006459.html
it's quite critical and should be solved before 4.4 release.
Merry christmas and a happy new year
svn path=/trunk/KDE/kdelibs/; revision=1065822
| -rw-r--r-- | modules/FindPolkitQt-1.cmake | 8 | ||||
| -rw-r--r-- | modules/FindPolkitQt.cmake | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/modules/FindPolkitQt-1.cmake b/modules/FindPolkitQt-1.cmake index 15f6f59b..8ef5b3c9 100644 --- a/modules/FindPolkitQt-1.cmake +++ b/modules/FindPolkitQt-1.cmake @@ -35,14 +35,14 @@ find_path( POLKITQT-1_INCLUDE_DIR PATH_SUFFIXES polkit-qt-1 ) -find_path( POLKITQT-1_VERSION_FILE - NAMES polkitqt1-version.h - PATH_SUFFIXES polkit-qt-1 +find_file( POLKITQT-1_VERSION_FILE + NAMES polkit-qt-1/polkitqt1-version.h + PATHS ${POLKITQT-1_INCLUDE_DIR} ) set(POLKITQT-1_VERSION_OK TRUE) if(POLKITQT-1_VERSION_FILE) - file(READ ${POLKITQT-1_INCLUDE_DIR}/polkitqt1-version.h POLKITQT-1_VERSION_CONTENT) + file(READ ${POLKITQT-1_VERSION_FILE} POLKITQT-1_VERSION_CONTENT) string (REGEX MATCH "POLKITQT1_VERSION_STRING \".*\"\n" POLKITQT-1_VERSION_MATCH "${POLKITQT-1_VERSION_CONTENT}") if(POLKITQT-1_VERSION_MATCH) diff --git a/modules/FindPolkitQt.cmake b/modules/FindPolkitQt.cmake index b6f883f9..8f9f712f 100644 --- a/modules/FindPolkitQt.cmake +++ b/modules/FindPolkitQt.cmake @@ -41,14 +41,14 @@ find_path( POLKITQT_INCLUDE_DIR PATH_SUFFIXES PolicyKit ) -find_path( POLKITQT_VERSION_FILE - NAMES polkit-qt/polkitqtversion.h - PATH_SUFFIXES PolicyKit +find_file( POLKITQT_VERSION_FILE + polkit-qt/polkitqtversion.h + PATHS ${POLKITQT_INCLUDE_DIR} ) set(POLKITQT_VERSION_OK TRUE) if(POLKITQT_VERSION_FILE) - file(READ ${POLKITQT_INCLUDE_DIR}/polkit-qt/polkitqtversion.h POLKITQT_VERSION_CONTENT) + file(READ ${POLKITQT_VERSION_FILE} POLKITQT_VERSION_CONTENT) string (REGEX MATCH "POLKITQT_VERSION_STRING \".*\"\n" POLKITQT_VERSION_MATCH "${POLKITQT_VERSION_CONTENT}") if(POLKITQT_VERSION_MATCH) |