diff options
author | Merov Linden <merov@lindenlab.com> | 2011-03-11 16:01:21 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2011-03-11 16:01:21 -0800 |
commit | 22946d446e86222a466d84ddc9afd8387164e00a (patch) | |
tree | 05d238e0c3efb72ae6533ffc5d76ff6dd0657b9f /indra | |
parent | d550a7e8bc84284ef4460af9d1cf5a09fc0bcf48 (diff) | |
parent | 8a22154e5d3d57170e3a3a02e0a2444473000d99 (diff) |
STORM-1073 : pull into viewer-development
Diffstat (limited to 'indra')
-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}) |