From 94974e156e410db74d59a3cdfd6e4db01423523e Mon Sep 17 00:00:00 2001 From: foreman Date: Fri, 3 Nov 2017 14:29:13 -0400 Subject: [PATCH] P4 to Git Change 1478591 by kzhuravl@kzhuravl-fiji-ocllc on 2017/11/03 14:24:57 SWDEV-102733 - More cmake updates to fix few conformance tests with open source build - test_api min_max_language_version - test_basic kernel_preprocessor_macros Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/CMakeLists.txt#8 edit [ROCm/clr commit: ef5f4c2fd8994af9828d76f85e14f3300e365452] --- projects/clr/rocclr/runtime/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/clr/rocclr/runtime/CMakeLists.txt b/projects/clr/rocclr/runtime/CMakeLists.txt index 4e1c2aa4da..b08d2fc835 100644 --- a/projects/clr/rocclr/runtime/CMakeLists.txt +++ b/projects/clr/rocclr/runtime/CMakeLists.txt @@ -7,7 +7,8 @@ else (GENERIC_IS_ZERO) add_definitions(-DAMDGCN_TRIPLE=amdgcn-amd-amdhsa-opencl) endif (GENERIC_IS_ZERO) -add_definitions(-DLINUX -D__x86_64__ -D__AMD64__ -DUNIX_OS -DqLittleEndian -DOPENCL_MAJOR=2 -DOPENCL_MINOR=0 -DWITH_AQL -DWITH_ONLINE_COMPILER -DATI_OS_LINUX -DATI_ARCH_X86 -DLITTLEENDIAN_CPU -DATI_BITS_64 -DATI_COMP_GCC -DWITH_HSA_DEVICE -DWITH_TARGET_AMDGCN -DOPENCL_EXPORTS -DCL_USE_DEPRECATED_OPENCL_1_0_APIS -DCL_USE_DEPRECATED_OPENCL_1_1_APIS -DCL_USE_DEPRECATED_OPENCL_1_2_APIS -DCL_USE_DEPRECATED_OPENCL_2_0_APIS -DVEGA10_ONLY=false -DWITH_LIGHTNING_COMPILER) +add_definitions(-DLINUX -D__x86_64__ -D__AMD64__ -DUNIX_OS -DqLittleEndian -DOPENCL_MAJOR=2 -DOPENCL_MINOR=1 -DWITH_AQL -DWITH_ONLINE_COMPILER -DATI_OS_LINUX -DATI_ARCH_X86 -DLITTLEENDIAN_CPU -DATI_BITS_64 -DATI_COMP_GCC -DWITH_HSA_DEVICE -DWITH_TARGET_AMDGCN -DOPENCL_EXPORTS -DCL_USE_DEPRECATED_OPENCL_1_0_APIS -DCL_USE_DEPRECATED_OPENCL_1_1_APIS -DCL_USE_DEPRECATED_OPENCL_1_2_APIS -DCL_USE_DEPRECATED_OPENCL_2_0_APIS -DVEGA10_ONLY=false -DWITH_LIGHTNING_COMPILER) +add_definitions(-DOPENCL_C_MAJOR=2 -DOPENCL_C_MINOR=0) if(CMAKE_BUILD_TYPE MATCHES "^Debug$") add_definitions(-DDEBUG)