diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-24 07:48:06 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-24 07:48:06 -0400 |
| commit | 4386bb173b17ca499e0c63809b8c7227da3f0e1c (patch) | |
| tree | 7893d4c6d3eccfaf0839d48618b32de5628cd218 /indra/cmake/FindLLQtWebkit.cmake | |
| parent | eef9b265b951337d0633d18186dad2b734b30d5a (diff) | |
| parent | 1c375a8c880354432da2b218c321ed708497e161 (diff) | |
merge changes for storm-1018
Diffstat (limited to 'indra/cmake/FindLLQtWebkit.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}) |