improve version automation based on CMake project version

bashbaug · bashbaug · commit 9a7f3f3f0817 · 2022-09-11T15:52:12.000-07:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,7 +6,7 @@ if(TARGET OpenCL)
 endif()
 
 project (OpenCL-ICD-Loader
-    VERSION 1.2
+    VERSION 1.2.3
     LANGUAGES C)
 
 find_package (Threads REQUIRED)
@@ -106,8 +106,11 @@ 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")
 
+target_compile_definitions (OpenCL PRIVATE OPENCL_ICD_LOADER_VERSION_REV=${PROJECT_VERSION_PATCH})
+
 if (WIN32)
     target_link_libraries (OpenCL PRIVATE cfgmgr32.lib runtimeobject.lib)
 
diff --git 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
diff --git a/loader/windows/OpenCL.rc b/loader/windows/OpenCL.rc
@@ -20,7 +20,6 @@
 
 #define OPENCL_ICD_LOADER_VERSION_MAJOR 3
 #define OPENCL_ICD_LOADER_VERSION_MINOR 0
-#define OPENCL_ICD_LOADER_VERSION_REV   3
 
 #ifdef RC_INVOKED
 

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ void khrIcdInitializeTrace(void)`
`43`	`43`	`{`
`44`	`44`	`khrEnableTrace = 1;`
`45`	`45`	`}`
	`46`	`+ KHR_ICD_TRACE("OpenCL ICD Loader Revision %u\n", OPENCL_ICD_LOADER_VERSION_REV);`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`// entrypoint to initialize the ICD and add all vendors`