[clblas] 113/125: add clBLAS- prefix to the client and tune executable
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Fri May 29 06:57:28 UTC 2015
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch master
in repository clblas.
commit 26a8097fc24e18d0fecc81b3d7641315d9b6ce04
Author: Gaëtan Lehmann <gaetan.lehmann at gmail.com>
Date: Fri Feb 27 09:48:11 2015 +0100
add clBLAS- prefix to the client and tune executable
in order to avoid conflict with other projects
---
.travis.yml | 2 +-
src/client/CMakeLists.txt | 4 +++-
src/library/tools/tune/CMakeLists.txt | 4 +++-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 33f44b5..230587a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,7 +30,7 @@ script:
# Run a simple test to validate that the build works; CPU device in a VM
- cd package/bin
- export LD_LIBRARY_PATH=${TRAVIS_BUILD_DIR}/bin/clBLAS/package/lib64:${LD_LIBRARY_PATH}
- - ./client --cpu
+ - ./clBLAS-client --cpu
after_success:
- cd ${TRAVIS_BUILD_DIR}/bin/clBLAS
diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index 2ebebf1..eb66f8a 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -52,7 +52,9 @@ include_directories(
add_executable(client ${CLIENT_SRC} ${CLIENT_HEADER})
target_link_libraries(client ${Boost_LIBRARIES} ${OPENCL_LIBRARIES} clBLAS)
-set_target_properties( client PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" )
+set_target_properties( client PROPERTIES
+ RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging"
+ OUTPUT_NAME clBLAS-client )
add_executable(testPerfWrapper ${WRAPPER_SRC})
target_link_libraries(testPerfWrapper ${Boost_LIBRARIES})
diff --git a/src/library/tools/tune/CMakeLists.txt b/src/library/tools/tune/CMakeLists.txt
index 2de5bf3..7f61513 100644
--- a/src/library/tools/tune/CMakeLists.txt
+++ b/src/library/tools/tune/CMakeLists.txt
@@ -138,7 +138,9 @@ endif()
add_executable(tune ${TOOLS_SRC} ${TOOLS_EXTERNAL_SRC})
add_dependencies(tune GENERATE_CLT)
target_link_libraries(tune ${OPENCL_LIBRARIES} ${TIME_LIBRARY} ${MATH_LIBRARY})
-set_target_properties( tune PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" )
+set_target_properties( tune PROPERTIES
+ RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging"
+ OUTPUT_NAME clBLAS-tune )
# CPack configuration; include the executable into the package
install( TARGETS tune
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/clblas.git
More information about the debian-science-commits
mailing list