[Piglit] [PATCH] CMakeLists: remove redundant waffle version check
Dylan Baker
baker.dylan.c at gmail.com
Wed Jan 22 11:08:17 PST 2014
On Monday, January 20, 2014 10:04:06 AM Daniel Kurtz wrote:
> This block was accidentally left in place when patch [0] was applied.
>
> [0] fc007bc7c6729c2d4ad61fe8360c43c973404ce5
> cmake: indent spaces -> tabs
>
> Signed-off-by: Daniel Kurtz <djkurtz at chromium.org>
> ---
> CMakeLists.txt | 14 --------------
> 1 file changed, 14 deletions(-)
>
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> index 47c8b10..48035bd 100644
> --- a/CMakeLists.txt
> +++ b/CMakeLists.txt
> @@ -58,20 +58,6 @@ if(PIGLIT_USE_WAFFLE)
> "piglit requires waffle-${WAFFLE_REQUIRED_VERSION}")
> endif()
>
> - # Check the installed waffle version.
> - #
> - # We cannot reliably check the version with pkg_check_modules(), but
> - # instead must check the version manually as below. The problem is that,
> - # if one passes a required version to pkg_check_modules(), CMake
> - # validates the required version at most once for the lifetime of the
> - # source tree. If someone changes the required version by editing the
> - # CMakeLists, CMake fails to detect the new requirement.
> - set(WAFFLE_REQUIRED_VERSION "1.3.0")
> - if(WAFFLE_VERSION VERSION_LESS WAFFLE_REQUIRED_VERSION)
> - message(FATAL_ERROR "Found waffle-${WAFFLE_VERSION}, but "
> - "piglit requires waffle-${WAFFLE_REQUIRED_VERSION}")
> - endif()
> -
> add_definitions(-DPIGLIT_USE_WAFFLE)
> add_definitions(-DWAFFLE_API_VERSION=0x0103)
> set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WAFFLE_CFLAGS}")
Reviewed-by: Dylan Baker <baker.dylan.c at gmail.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 490 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.freedesktop.org/archives/piglit/attachments/20140122/8999504c/attachment.pgp>
More information about the Piglit
mailing list