[clblas] 51/125: Renamed version.h to clBLAS.version.h

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository clblas.

commit 2d5a3ea56e406cb1a74f576c587623faea7749b7
Author: Kent Knox <kent.knox at amd>
Date:   Fri Jan 24 17:43:08 2014 -0600

    Renamed version.h to clBLAS.version.h
    
    If the clBLAS and clFFT projects are installed into the same directory,
    there is a filename collision with version.h.  Only the last file to
    be installed survived, and would break the other project.
---
 src/CMakeLists.txt                        | 4 ++--
 src/{version.h.in => clBLAS.version.h.in} | 0
 src/library/blas/init.c                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 73a1296..4e0cc74 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -249,7 +249,7 @@ endif( )
 #TODO:  We should remove this pre-processor define for our 1.8 build; this means removing our deprecated image functions such as calls clCreateImage2D( )
 add_definitions( -DCL_USE_DEPRECATED_OPENCL_1_1_APIS )
 
-configure_file( "${PROJECT_SOURCE_DIR}/version.h.in" "${PROJECT_BINARY_DIR}/include/version.h" )
+configure_file( "${PROJECT_SOURCE_DIR}/clBLAS.version.h.in" "${PROJECT_BINARY_DIR}/include/clBLAS.version.h" )
 
 # configure a header file to pass the CMake version settings to the source, and package the header files in the output archive
 install( FILES 
@@ -257,7 +257,7 @@ install( FILES
 			"clAmdBlas.h"
 			"clAmdBlas.version.h"
 			"clBLAS-complex.h"
-			"${PROJECT_BINARY_DIR}/include/version.h"
+			"${PROJECT_BINARY_DIR}/include/clBLAS.version.h"
 		DESTINATION 
 			"./include" )
 
diff --git a/src/version.h.in b/src/clBLAS.version.h.in
similarity index 100%
rename from src/version.h.in
rename to src/clBLAS.version.h.in
diff --git a/src/library/blas/init.c b/src/library/blas/init.c
index 5095cb0..2b257a8 100644
--- a/src/library/blas/init.c
+++ b/src/library/blas/init.c
@@ -18,7 +18,7 @@
 #include <clBLAS.h>
 #include <toolslib.h>
 #include <kern_cache.h>
-#include <version.h>
+#include <clBLAS.version.h>
 #include <trace_malloc.h>
 
 #include "clblas-internal.h"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/clblas.git