From 386c172f2042e87c0fc760cbbb14f9b6f0f449df Mon Sep 17 00:00:00 2001 From: Kevin Petit Date: Fri, 12 Oct 2018 13:44:04 +0100 Subject: [PATCH] cmake: don't set CL_INCLUDE_DIR in CMakeVendor.txt This will always override anything the user provides. We could turn it into a cache variable to avoid this but the default value assumes the location of headers in a hypothetical driver tree which probably doesn't work for anybody so just get rid of it instead. Also remove all references to OPENCL_DRIVER in the build system. Any such integration doesn't really belong in the CTS's build system and can triavialy be done with a wrapper project. Signed-off-by: Kevin Petit --- CMakeVendor.txt | 7 ------- 1 file changed, 7 deletions(-) diff --git a/CMakeVendor.txt b/CMakeVendor.txt index b42c43ab..3ce6f6f4 100644 --- a/CMakeVendor.txt +++ b/CMakeVendor.txt @@ -4,11 +4,6 @@ set(CONFORMANCE_PREFIX "test_conformance_" ) set(CONFORMNACE_SUFFIX "" ) -# Include cmake files to build driver -# to build driver as a dependency of tests -# in this example environment variable $OPENCL_DRIVER points to driver base -# Ex include($ENV{OPENCL_DRIVER}/driver.cmake) - # We intentionally hardcode "_win32" to ensure backwards compatibility (to avoid breaking HAAVE) if(ANDROID) if(ARM64_V8A) @@ -17,5 +12,3 @@ if(ANDROID) set(ARCH "32") endif(ARM64_V8A) endif (ANDROID) - -set (CL_INCLUDE_DIR "$ENV{OPENCL_DRIVER}/include/public/")