diff options
| author | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2011-01-18 00:34:09 +0100 |
|---|---|---|
| committer | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2011-01-18 00:34:09 +0100 |
| commit | 8a22154e5d3d57170e3a3a02e0a2444473000d99 (patch) | |
| tree | 0dd000fd872455074e5a045dc2c8f0ff57d641b5 /indra/cmake | |
| parent | 7314ad41be6142463123e8523c8b97b38400dd9b (diff) | |
| parent | eb9f19dabdbe80dd047069edc8e1d04e906e7529 (diff) | |
merged VWR-24520: Don't use pkg_check_modules( ... QUIET ) on CMake < 2.8.2
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}) |