From 488b258ab5ad316d6cb7ffc8ee98218235b70d31 Mon Sep 17 00:00:00 2001 From: Ben Ashbaugh Date: Sun, 11 Sep 2022 15:52:12 -0700 Subject: [PATCH] improve version automation based on CMake project version --- CMakeLists.txt | 5 +++-- loader/icd.c | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e855054e..6f4f8955 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ if(TARGET OpenCL) endif() project (OpenCL-ICD-Loader - VERSION 1.2 + VERSION 1.2.5 LANGUAGES C) find_package (Threads REQUIRED) @@ -119,6 +119,7 @@ endif() add_library (OpenCL::OpenCL ALIAS OpenCL) +# We could eventually use OpenCL-ICD-Loader_VERSION or PROJECT_VERSION here instead of a hardcoded 1.2. set_target_properties (OpenCL PROPERTIES VERSION "1.2" SOVERSION "1") if (WIN32) @@ -156,7 +157,7 @@ set (OPENCL_COMPILE_DEFINITIONS CL_TARGET_OPENCL_VERSION=300 OPENCL_ICD_LOADER_VERSION_MAJOR=3 OPENCL_ICD_LOADER_VERSION_MINOR=0 - OPENCL_ICD_LOADER_VERSION_REV=5 + OPENCL_ICD_LOADER_VERSION_REV=${PROJECT_VERSION_PATCH} $<$:CL_ENABLE_LAYERS> ) diff --git a/loader/icd.c b/loader/icd.c index bbd6ec3a..3931d23e 100644 --- a/loader/icd.c +++ b/loader/icd.c @@ -43,6 +43,7 @@ void khrIcdInitializeTrace(void) { khrEnableTrace = 1; } + KHR_ICD_TRACE("OpenCL ICD Loader Revision %u\n", OPENCL_ICD_LOADER_VERSION_REV); } // entrypoint to initialize the ICD and add all vendors