Skip to content

Commit 2bc3b58

Browse files
author
Kent Knox
committed
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.
1 parent 449d4f2 commit 2bc3b58

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

src/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,9 +225,9 @@ message( STATUS "CMAKE_CXX_COMPILER relwithdebinfo flags: " ${CMAKE_CXX_FLAGS_RE
225225
message( STATUS "CMAKE_EXE_LINKER link flags: " ${CMAKE_EXE_LINKER_FLAGS} )
226226

227227
# configure a header file to pass the CMake version settings to the source, and package the header files in the output archive
228-
configure_file( "${PROJECT_SOURCE_DIR}/include/version.h.in" "${PROJECT_BINARY_DIR}/include/version.h" )
228+
configure_file( "${PROJECT_SOURCE_DIR}/include/clFFT.version.h.in" "${PROJECT_BINARY_DIR}/include/clFFT.version.h" )
229229
install( FILES
230-
"${PROJECT_BINARY_DIR}/include/version.h"
230+
"${PROJECT_BINARY_DIR}/include/clFFT.version.h"
231231
"include/clFFT.h"
232232
"include/clAmdFft.h"
233233
"include/clAmdFft.version.h"

src/include/clFFT.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include <CL/cl.h>
3434
#endif
3535

36-
#include "version.h"
36+
#include "clFFT.version.h"
3737

3838
/*! This preprocessor definition is the standard way of making exporting APIs
3939
* from a DLL simpler. All files within this DLL are compiled with the CLFFT_EXPORTS

src/tests/gtest_main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <gtest/gtest.h>
1919
#include <boost/program_options.hpp>
2020
#include "clFFT.h"
21-
#include "version.h"
21+
#include "clFFT.version.h"
2222
#include "test_constants.h"
2323
#include "../client/openCL.misc.h"
2424
#include "unicode.compatibility.h"

0 commit comments

Comments
 (0)