[khronos-opencl-headers] 01/03: Updated macro definitions for cl2.hpp tests.

[James Price]

This is an automated email from the git hooks/post-receive script.

jprice-guest pushed a commit to branch master
in repository khronos-opencl-headers.

commit 37b5e2708c9ab21ec7f7fb36723a809c14c8ad9e
Author: James Price <j.price at bristol.ac.uk>
Date:   Sat Oct 24 01:13:54 2015 +0100

    Updated macro definitions for cl2.hpp tests.
---
 debian/t/Makefile | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/debian/t/Makefile b/debian/t/Makefile
index d90d3f2..57e5425 100644
--- a/debian/t/Makefile
+++ b/debian/t/Makefile
@@ -4,15 +4,25 @@ endif
 CFLAGS		+= -I. $(OPENCLFLAGS) $(ARCHFLAGS)
 CXXFLAGS	+= -std=c++11 -I. $(OPENCLFLAGS) $(ARCHFLAGS)
 
+OPENCL_CLH_FLAGS_1_0 = -DCL_USE_DEPRECATED_OPENCL_1_0_APIS
+OPENCL_CLH_FLAGS_1_1 = -DCL_USE_DEPRECATED_OPENCL_1_1_APIS
+OPENCL_CLH_FLAGS_1_2 = -DCL_USE_DEPRECATED_OPENCL_1_2_APIS
+
+OPENCL_CLHPP_FLAGS_1_0 = -DCL_HPP_TARGET_OPENCL_VERSION=100 -DCL_HPP_MINIMUM_OPENCL_VERSION=100
+OPENCL_CLHPP_FLAGS_1_1 = -DCL_HPP_TARGET_OPENCL_VERSION=110 -DCL_HPP_MINIMUM_OPENCL_VERSION=110
+OPENCL_CLHPP_FLAGS_1_2 = -DCL_HPP_TARGET_OPENCL_VERSION=120 -DCL_HPP_MINIMUM_OPENCL_VERSION=120
+OPENCL_CLHPP_FLAGS_2_0 = -DCL_HPP_TARGET_OPENCL_VERSION=200 -DCL_HPP_MINIMUM_OPENCL_VERSION=200
+
 check:
 	$(MAKE) compile_opencl_h
-	$(MAKE) compile_opencl_h OPENCLFLAGS=-DCL_USE_DEPRECATED_OPENCL_2_0_APIS
-	$(MAKE) compile_opencl_h OPENCLFLAGS=-DCL_USE_DEPRECATED_OPENCL_1_1_APIS
-	$(MAKE) compile_opencl_h OPENCLFLAGS=-DCL_USE_DEPRECATED_OPENCL_1_0_APIS
-	$(MAKE) compile_cl_hpp
-	$(MAKE) compile_cl_hpp OPENCLFLAGS=-DCL_USE_DEPRECATED_OPENCL_2_0_APIS
-	$(MAKE) compile_cl_hpp OPENCLFLAGS=-DCL_USE_DEPRECATED_OPENCL_1_1_APIS
-	$(MAKE) compile_cl_hpp OPENCLFLAGS=-DCL_USE_DEPRECATED_OPENCL_1_0_APIS
+	$(MAKE) compile_opencl_h OPENCLFLAGS="$(OPENCL_CLH_FLAGS_1_0)"
+	$(MAKE) compile_opencl_h OPENCLFLAGS="$(OPENCL_CLH_FLAGS_1_1)"
+	$(MAKE) compile_opencl_h OPENCLFLAGS="$(OPENCL_CLH_FLAGS_1_2)"
+
+	$(MAKE) compile_cl_hpp OPENCLFLAGS="$(OPENCL_CLHPP_FLAGS_1_0)"
+	$(MAKE) compile_cl_hpp OPENCLFLAGS="$(OPENCL_CLHPP_FLAGS_1_1)"
+	$(MAKE) compile_cl_hpp OPENCLFLAGS="$(OPENCL_CLHPP_FLAGS_1_2)"
+	$(MAKE) compile_cl_hpp OPENCLFLAGS="$(OPENCL_CLHPP_FLAGS_2_0)"
 
 compile_opencl_h:
 	$(CC) $(CPPFLAGS) $(CFLAGS) -c opencl_h.c

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/khronos-opencl-headers.git