[clfft] 39/109: Fixes #14 Renamed version.h to clFFT.version.h

[Jérôme Kieffer]

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

kieffer-guest pushed a commit to branch debian
in repository clfft.

commit 2bc3b58a68d9a35cf09833ff021ff4bc8c0b7ac4
Author: Kent Knox <kent.knox at amd>
Date:   Fri Jan 24 17:51:00 2014 -0600

    Fixes #14
    Renamed version.h to clFFT.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/include/clFFT.h                              | 2 +-
 src/include/{version.h.in => clFFT.version.h.in} | 0
 src/tests/gtest_main.cpp                         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a791b3f..ad2484b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -225,9 +225,9 @@ message( STATUS "CMAKE_CXX_COMPILER relwithdebinfo flags: " ${CMAKE_CXX_FLAGS_RE
 message( STATUS "CMAKE_EXE_LINKER link flags: " ${CMAKE_EXE_LINKER_FLAGS} )
 
 # configure a header file to pass the CMake version settings to the source, and package the header files in the output archive
-configure_file( "${PROJECT_SOURCE_DIR}/include/version.h.in" "${PROJECT_BINARY_DIR}/include/version.h" )
+configure_file( "${PROJECT_SOURCE_DIR}/include/clFFT.version.h.in" "${PROJECT_BINARY_DIR}/include/clFFT.version.h" )
 install( FILES 
-			"${PROJECT_BINARY_DIR}/include/version.h" 
+			"${PROJECT_BINARY_DIR}/include/clFFT.version.h" 
 			"include/clFFT.h"
 			"include/clAmdFft.h"
 			"include/clAmdFft.version.h" 
diff --git a/src/include/clFFT.h b/src/include/clFFT.h
index 738141f..583a76b 100644
--- a/src/include/clFFT.h
+++ b/src/include/clFFT.h
@@ -33,7 +33,7 @@
 	#include <CL/cl.h>
 #endif
 
-#include "version.h"
+#include "clFFT.version.h"
 
 /*! This preprocessor definition is the standard way of making exporting APIs
  *  from a DLL simpler. All files within this DLL are compiled with the CLFFT_EXPORTS
diff --git a/src/include/version.h.in b/src/include/clFFT.version.h.in
similarity index 100%
rename from src/include/version.h.in
rename to src/include/clFFT.version.h.in
diff --git a/src/tests/gtest_main.cpp b/src/tests/gtest_main.cpp
index ec22e98..b30c3ea 100644
--- a/src/tests/gtest_main.cpp
+++ b/src/tests/gtest_main.cpp
@@ -18,7 +18,7 @@
 #include <gtest/gtest.h>
 #include <boost/program_options.hpp>
 #include "clFFT.h"
-#include "version.h"
+#include "clFFT.version.h"
 #include "test_constants.h"
 #include "../client/openCL.misc.h"
 #include "unicode.compatibility.h"

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