diff options
| author | David Faure <faure@kde.org> | 2010-11-17 12:34:39 +0000 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2010-11-17 12:34:39 +0000 |
| commit | 1a5d78694b048fc1a9f4b9f281dc0e94cf6538bb (patch) | |
| tree | 60880bf1c17ec6a53ddcd4345c90de1e2035b372 | |
| parent | d0833e1c26ee7da6b3392f7291c229d65b924977 (diff) | |
| download | extra-cmake-modules-1a5d78694b048fc1a9f4b9f281dc0e94cf6538bb.tar.gz extra-cmake-modules-1a5d78694b048fc1a9f4b9f281dc0e94cf6538bb.tar.bz2 | |
Fix version handling (by setting SharedDesktopOntologies_FIND_VERSION, which is what FindPackageHandleStandardArgs looks at)
svn path=/trunk/KDE/kdelibs/; revision=1198106
| -rw-r--r-- | modules/FindSharedDesktopOntologies.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/modules/FindSharedDesktopOntologies.cmake b/modules/FindSharedDesktopOntologies.cmake index a384b1ba..e2a62b67 100644 --- a/modules/FindSharedDesktopOntologies.cmake +++ b/modules/FindSharedDesktopOntologies.cmake @@ -28,6 +28,10 @@ if( "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSI find_path(_SDO_CONFIG_DIR SharedDesktopOntologiesConfig.cmake PATH_SUFFIXES share/cmake/SharedDesktopOntologies/ ) endif( "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_LESS "2.6.3") +if(NOT SharedDesktopOntologies_FIND_VERSION) + set(SharedDesktopOntologies_FIND_VERSION "${SDO_MIN_VERSION}") +endif(NOT SharedDesktopOntologies_FIND_VERSION) + find_package(SharedDesktopOntologies ${SharedDesktopOntologies_FIND_VERSION} QUIET NO_MODULE HINTS "${_SDO_CONFIG_DIR}" ) if (SHAREDDESKTOPONTOLOGIES_ROOT_DIR) @@ -35,4 +39,4 @@ if (SHAREDDESKTOPONTOLOGIES_ROOT_DIR) endif (SHAREDDESKTOPONTOLOGIES_ROOT_DIR) include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(SharedDesktopOntologies REQUIRED_VARS SHAREDDESKTOPONTOLOGIES_ROOT_DIR VERSION_VAR SDO_MIN_VERSION) +find_package_handle_standard_args(SharedDesktopOntologies REQUIRED_VARS SHAREDDESKTOPONTOLOGIES_ROOT_DIR) |