[clblas] 40/125: Merge pull request #26 from kknox/develop

[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 70c45a19f3677feea1ddf6902c2a081a7697c4d8
Merge: 3bb2214 546bd32
Author: Timmy <timmy.liu at amd.com>
Date:   Wed Nov 20 10:39:35 2013 -0800

    Merge pull request #26 from kknox/develop
    
    Adding 'staging' directory to make it easier to debug

 .travis.yml                                       |  4 +-
 src/client/CMakeLists.txt                         |  2 +
 src/library/CMakeLists.txt                        | 32 ++++++++++
 src/library/blas/gens/legacy/tests/CMakeLists.txt |  1 +
 src/library/blas/gens/tests/CMakeLists.txt        |  1 +
 src/library/common/tests/CMakeLists.txt           |  2 +
 src/library/tools/ktest/CMakeLists.txt            |  1 +
 src/library/tools/tune/CMakeLists.txt             |  1 +
 src/tests/CMakeLists.txt                          | 21 ++++++-
 src/tests/copyTestDependencies.cmake.in           | 72 +++++++++++++++++++++++
 10 files changed, 134 insertions(+), 3 deletions(-)

diff --cc src/tests/CMakeLists.txt
index d4a03f7,feda624..e0ebede
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@@ -335,8 -338,9 +340,9 @@@ if( GTEST_FOUND 
  		add_executable(test-short ${SRC_CORR} ${SRC_COMMON} ${SRC_COMMON_REFIMPL}
  					  ${CORR_HEADERS} ${TESTS_HEADERS})
  		set_target_properties( test-short PROPERTIES COMPILE_DEFINITIONS SHORT_TESTS )
+         set_target_properties( test-short PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" )
  
 -		if( NOT CORR_TEST_WITH_ACML AND NOT WIN32)
 +		if( NOT CORR_TEST_WITH_ACML AND NOT WIN32 AND NOT APPLE)
  			set_target_properties( test-correctness PROPERTIES LINKER_LANGUAGE Fortran )
  			set_target_properties( test-medium PROPERTIES LINKER_LANGUAGE Fortran )
  			set_target_properties( test-short PROPERTIES LINKER_LANGUAGE Fortran )

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