diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2010-03-14 22:22:30 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2010-03-14 22:22:30 +0000 |
| commit | 90f665ade5bd93e524499018c818de52cac46cc1 (patch) | |
| tree | 8b60ca04371813786e8ce0fc4c7dbcf8a9c83cc7 | |
| parent | bebe865fcb9da07d5dee4ab55c622ba48df9390f (diff) | |
| download | extra-cmake-modules-90f665ade5bd93e524499018c818de52cac46cc1.tar.gz extra-cmake-modules-90f665ade5bd93e524499018c818de52cac46cc1.tar.bz2 | |
-fix breakage, ignore those modules which don't set a FOO_VERSION variable for now
Alex
svn path=/trunk/KDE/kdelibs/; revision=1103360
| -rw-r--r-- | modules/FindPackageHandleStandardArgs.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/modules/FindPackageHandleStandardArgs.cmake b/modules/FindPackageHandleStandardArgs.cmake index 9e89d2b0..c4882386 100644 --- a/modules/FindPackageHandleStandardArgs.cmake +++ b/modules/FindPackageHandleStandardArgs.cmake @@ -74,6 +74,8 @@ FUNCTION(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FAIL_MSG _VAR1 ) # if the package was found, check for the version using <NAME>_FIND_VERSION IF (${_NAME_UPPER}_FOUND) SET(VERSION ${${_NAME_UPPER}_VERSION}) + + IF(VERSION) #hmm what do we do if the module in question doesn't set FOO_VERSION but something else ?... Ignore it for now IF(${_NAME}_FIND_VERSION_EXACT) # exact version required IF (NOT "${${_NAME}_FIND_VERSION}" VERSION_EQUAL "${VERSION}") @@ -92,6 +94,8 @@ FUNCTION(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FAIL_MSG _VAR1 ) ENDIF ("${${_NAME}_FIND_VERSION}" VERSION_GREATER "${VERSION}") ENDIF(${_NAME}_FIND_VERSION_EXACT) + ENDIF(VERSION) + # if the package was not found, but some a version was given, add that to the output: ELSE (${_NAME_UPPER}_FOUND) IF(${_NAME}_FIND_VERSION_EXACT) |