diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2011-03-15 09:10:39 -0700 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2011-03-15 09:10:39 -0700 |
| commit | 57ac771b154d7722e4774b40a607a11f3286f472 (patch) | |
| tree | 20a555064cedcbdd6bbea3dbeeb866f95601ba19 /indra/cmake | |
| parent | 18ae6c639e58c4c996d4c3b2a4b34ef41deab970 (diff) | |
| parent | bc0833d5db9e887f72ea6e7a630781203ad6ad77 (diff) | |
Merge
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/FindLLQtWebkit.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/cmake/FindLLQtWebkit.cmake b/indra/cmake/FindLLQtWebkit.cmake index c747ec32a2..4bf5f5cb73 100644 --- a/indra/cmake/FindLLQtWebkit.cmake +++ b/indra/cmake/FindLLQtWebkit.cmake @@ -22,9 +22,9 @@ if (PKG_CONFIG_FOUND) else (LLQtWebkit_FIND_REQUIRED AND LLQtWebkit_FIND_VERSION) set(_PACKAGE_ARGS libllqtwebkit) endif (LLQtWebkit_FIND_REQUIRED AND LLQtWebkit_FIND_VERSION) - if (NOT "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_LESS "2.8") + if (NOT "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_LESS "2.8.2") # As virtually nobody will have a pkg-config file for this, do this check always quiet. - # Unfortunately cmake 2.8 or higher is required for pkg_check_modules to have a 'QUIET'. + # Unfortunately cmake 2.8.2 or higher is required for pkg_check_modules to have a 'QUIET'. set(_PACKAGE_ARGS ${_PACKAGE_ARGS} QUIET) endif () pkg_check_modules(LLQTWEBKIT ${_PACKAGE_ARGS}) |