From 7b122eb913bc935f57f2dcc1fc2300f56dd4c0b2 Mon Sep 17 00:00:00 2001 From: Billy Robert O'Neal III Date: Wed, 17 Sep 2025 13:56:38 -0700 Subject: [PATCH] Use all caps for version variables. Appears to be necessary on modern versions of CMake where variables are no longer case insensitive. Fixes build error on macOS 15.6.1 like the following: ```console /Users/vcpkg/vcpkg/installed/arm64-osx/include/CL/cl_version.h:22:9: warning: cl_version.h: CL_TARGET_OPENCL_VERSION is not defined. Defaulting to 300 (OpenCL 3.0) [-W#pragma-messages] 22 | #pragma message("cl_version.h: CL_TARGET_OPENCL_VERSION is not defined. Defaulting to 300 (OpenCL 3.0)") | ^ /Users/vcpkg/vcpkg/buildtrees/clblas/src/v2.12-ffa3881f06.clean/src/library/blas/init.c:36:32: error: expected expression 36 | *major = clblasVersionMajor; | ^ /Users/vcpkg/vcpkg/buildtrees/clblas/src/v2.12-ffa3881f06.clean/src/library/blas/init.c:37:32: error: expected expression 37 | *minor = clblasVersionMinor; | ^ /Users/vcpkg/vcpkg/buildtrees/clblas/src/v2.12-ffa3881f06.clean/src/library/blas/init.c:38:32: error: expected expression 38 | *patch = clblasVersionPatch; | ^ 1 warning and 3 errors generated. ```` --- src/CMakeLists.txt | 20 ++++++++++---------- src/clBLAS.version.h.in | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6a88c410..b067afff 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -103,19 +103,19 @@ else( ) endif( ) # Define a version for the code -if( NOT DEFINED clBLAS_VERSION_MAJOR ) - set( clBLAS_VERSION_MAJOR 2 ) +if( NOT DEFINED CLBLAS_VERSION_MAJOR ) + set( CLBLAS_VERSION_MAJOR 2 ) endif( ) -if( NOT DEFINED clBLAS_VERSION_MINOR ) - set( clBLAS_VERSION_MINOR 12 ) +if( NOT DEFINED CLBLAS_VERSION_MINOR ) + set( CLBLAS_VERSION_MINOR 12 ) endif( ) -if( NOT DEFINED clBLAS_VERSION_PATCH ) - set( clBLAS_VERSION_PATCH 0 ) +if( NOT DEFINED CLBLAS_VERSION_PATCH ) + set( CLBLAS_VERSION_PATCH 0 ) endif( ) -set( clBLAS_VERSION "${clBLAS_VERSION_MAJOR}.${clBLAS_VERSION_MINOR}.${clBLAS_VERSION_PATCH}") +set( clBLAS_VERSION "${CLBLAS_VERSION_MAJOR}.${CLBLAS_VERSION_MINOR}.${CLBLAS_VERSION_PATCH}") # Increment this if we break backward compatibility. set( clBLAS_SOVERSION 2 ) @@ -422,9 +422,9 @@ endif( ) set( CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${clBLAS_VERSION}-${CMAKE_HOST_SYSTEM_NAME}-Source") -set( CPACK_PACKAGE_VERSION_MAJOR ${clBLAS_VERSION_MAJOR} ) -set( CPACK_PACKAGE_VERSION_MINOR ${clBLAS_VERSION_MINOR} ) -set( CPACK_PACKAGE_VERSION_PATCH ${clBLAS_VERSION_PATCH} ) +set( CPACK_PACKAGE_VERSION_MAJOR ${CLBLAS_VERSION_MAJOR} ) +set( CPACK_PACKAGE_VERSION_MINOR ${CLBLAS_VERSION_MINOR} ) +set( CPACK_PACKAGE_VERSION_PATCH ${CLBLAS_VERSION_PATCH} ) set( CPACK_PACKAGE_DESCRIPTION_SUMMARY "OpenCL implementation of a BLAS library") set( CPACK_PACKAGE_VENDOR "Neutral") set( CPACK_SOURCE_IGNORE_FILES "/\\\\.hg/;/\\\\.svn/;/\\\\.git/" ) diff --git a/src/clBLAS.version.h.in b/src/clBLAS.version.h.in index a05cbce1..ab22a87e 100644 --- a/src/clBLAS.version.h.in +++ b/src/clBLAS.version.h.in @@ -17,6 +17,6 @@ /* the configured version and settings for clblas */ -#define clblasVersionMajor @clBLAS_VERSION_MAJOR@ -#define clblasVersionMinor @clBLAS_VERSION_MINOR@ -#define clblasVersionPatch @clBLAS_VERSION_PATCH@ +#define clblasVersionMajor @CLBLAS_VERSION_MAJOR@ +#define clblasVersionMinor @CLBLAS_VERSION_MINOR@ +#define clblasVersionPatch @CLBLAS_VERSION_PATCH@