diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-03-14 12:03:14 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-03-14 12:03:14 -0400 |
| commit | 13705596af001078d185dfe5aa7e98d9642f8c8a (patch) | |
| tree | 7731814de2a2d988ba1c4ce2031b4a7f663f28b4 /indra/cmake | |
| parent | 8903578344987432cebc46d889b94574bc005007 (diff) | |
| parent | b7635b6112b7c7fd448aa4400bba2edbf15a5b0a (diff) | |
Automated merge up from viewer-development into mesh-development
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}) |