diff -r 9e99b2c8fb28 -r 4b348e0e4816 doc/contributions.txt --- a/doc/contributions.txt Wed Dec 15 20:12:17 2010 +0100 +++ b/doc/contributions.txt Mon Jan 17 18:52:24 2011 +0100 @@ -74,6 +74,7 @@ VWR-14426 VWR-24247 VWR-24252 + VWR-24520 SNOW-84 SNOW-477 SNOW-744 diff -r 9e99b2c8fb28 -r 4b348e0e4816 indra/cmake/FindLLQtWebkit.cmake --- a/indra/cmake/FindLLQtWebkit.cmake Wed Dec 15 20:12:17 2010 +0100 +++ b/indra/cmake/FindLLQtWebkit.cmake Mon Jan 17 18:52:24 2011 +0100 @@ -22,9 +22,9 @@ 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})