diff options
-rw-r--r-- | CMakeLists.txt | 12 | ||||
-rw-r--r-- | src/OCLConfig.h.in | 1 | ||||
-rw-r--r-- | src/cl_platform_id.h | 3 |
3 files changed, 13 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 30d0735a..4ed27b52 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0) PROJECT(OCL) set (LIBCL_DRIVER_VERSION_MAJOR 0) -set (LIBCL_DRIVER_VERSION_MINOR 3) +set (LIBCL_DRIVER_VERSION_MINOR 8) +set (LIBCL_DRIVER_VERSION_PATCH 0) set (LIBCL_C_VERSION_MAJOR 1) set (LIBCL_C_VERSION_MINOR 1) @@ -18,7 +19,6 @@ configure_file ( "src/OCLConfig.h" ) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) SET(CMAKE_VERBOSE_MAKEFILE "false") @@ -146,3 +146,11 @@ ADD_SUBDIRECTORY(include) ADD_SUBDIRECTORY(backend) ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(utests) + +SET(CPACK_PACKAGE_VERSION_MAJOR "${LIBCL_DRIVER_VERSION_MAJOR}") +SET(CPACK_PACKAGE_VERSION_MINOR "${LIBCL_DRIVER_VERSION_MINOR}") +SET(CPACK_PACKAGE_VERSION_PATCH "${LIBCL_DRIVER_VERSION_PATCH}") +SET(CPACK_SOURCE_GENERATOR "TGZ;TZ") +SET(CPACK_PACKAGE_NAME "Beignet") +SET(CPACK_PACKAGE_VENDOR "Intel Open Source Technology Center") +INCLUDE(CPack) diff --git a/src/OCLConfig.h.in b/src/OCLConfig.h.in index 8662584d..71de4b30 100644 --- a/src/OCLConfig.h.in +++ b/src/OCLConfig.h.in @@ -1,5 +1,6 @@ // the configured options and settings for LIBCL #define LIBCL_DRIVER_VERSION_MAJOR @LIBCL_DRIVER_VERSION_MAJOR@ #define LIBCL_DRIVER_VERSION_MINOR @LIBCL_DRIVER_VERSION_MINOR@ +#define LIBCL_DRIVER_VERSION_PATCH @LIBCL_DRIVER_VERSION_PATCH@ #define LIBCL_C_VERSION_MAJOR @LIBCL_C_VERSION_MAJOR@ #define LIBCL_C_VERSION_MINOR @LIBCL_C_VERSION_MINOR@ diff --git a/src/cl_platform_id.h b/src/cl_platform_id.h index 6b70aeec..c7c716e0 100644 --- a/src/cl_platform_id.h +++ b/src/cl_platform_id.h @@ -61,9 +61,10 @@ extern cl_int cl_get_platform_info(cl_platform_id platform, #define _STR(x) #x #define _JOINT(x, y) _STR(x) "." _STR(y) +#define _JOINT3(x, y, z) _STR(x) "." _STR(y) "." _STR(z) -#define LIBCL_DRIVER_VERSION_STRING _JOINT(LIBCL_DRIVER_VERSION_MAJOR, LIBCL_DRIVER_VERSION_MINOR) +#define LIBCL_DRIVER_VERSION_STRING _JOINT3(LIBCL_DRIVER_VERSION_MAJOR, LIBCL_DRIVER_VERSION_MINOR, LIBCL_DRIVER_VERSION_PATCH) #define LIBCL_VERSION_STRING "OpenCL " _JOINT(LIBCL_C_VERSION_MAJOR, LIBCL_C_VERSION_MINOR) " beignet " LIBCL_DRIVER_VERSION_STRING #define LIBCL_C_VERSION_STRING "OpenCL C " _JOINT(LIBCL_C_VERSION_MAJOR, LIBCL_C_VERSION_MINOR) " beignet " LIBCL_DRIVER_VERSION_STRING |