diff options
author | Oz Linden <oz@lindenlab.com> | 2011-03-16 21:24:21 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-03-16 21:24:21 -0400 |
commit | 25b69823e6a29e21310ada2961dd4bbe08756f55 (patch) | |
tree | 5b0b5970f1d3510afff41dc9448444dfaed19e3c /indra/cmake | |
parent | 65bdb537531141bcfb00163888540624a600a17b (diff) | |
parent | 31edad0a226a14b5b87fe364c629f8450bda567c (diff) |
merge changes for storm-1064
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}) |