[clfft] 51/109: Travis fix: The DIRECTORY tag on get_filename_component( ) was introduced in cmake 2.8.10.2, which Travis CI does not have by default. Revert to the old name PATH.
Jérôme Kieffer
kieffer-guest at moszumanska.debian.org
Wed May 20 07:29:27 UTC 2015
This is an automated email from the git hooks/post-receive script.
kieffer-guest pushed a commit to branch debian
in repository clfft.
commit 02f07f4ea9464a0fb14f943dc7e10ca39585ee67
Author: Kent Knox <kent.knox at amd>
Date: Tue Apr 1 15:38:47 2014 -0500
Travis fix: The DIRECTORY tag on get_filename_component( ) was introduced
in cmake 2.8.10.2, which Travis CI does not have by default. Revert to
the old name PATH.
---
src/tests/copyTestDependencies.cmake.in | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/tests/copyTestDependencies.cmake.in b/src/tests/copyTestDependencies.cmake.in
index 2c5e447..9397bcf 100644
--- a/src/tests/copyTestDependencies.cmake.in
+++ b/src/tests/copyTestDependencies.cmake.in
@@ -18,7 +18,7 @@ endif( )
# message( fixedTestLocation ": ${fixedTestLocation}" )
# Get the directory that the test executable resides in; this helps get_prerequisites( ) find dependent libraries
-get_filename_component( testDir "${fixedTestLocation}" DIRECTORY )
+get_filename_component( testDir "${fixedTestLocation}" PATH )
# message( testDir ": ${testDir}" )
set( installPath "" )
@@ -32,8 +32,8 @@ endif( )
set( depList "" )
#This logic assumes that FindFFTW.cmake has been called
-get_filename_component( fftwDirSingle "@FFTW_SINGLE_PRECISION_LIBRARIES@" DIRECTORY )
-get_filename_component( fftwDirDouble "@FFTW_DOUBLE_PRECISION_LIBRARIES@" DIRECTORY )
+get_filename_component( fftwDirSingle "@FFTW_SINGLE_PRECISION_LIBRARIES@" PATH )
+get_filename_component( fftwDirDouble "@FFTW_DOUBLE_PRECISION_LIBRARIES@" PATH )
if( EXISTS "${fftwDirSingle}" )
list( APPEND depList "${fftwDirSingle}" )
@@ -47,8 +47,8 @@ if( ${fftwDiffDirs} AND EXISTS "${fftwDirDouble}" )
endif( )
#This logic assumes that FindGTest.cmake has been called
-get_filename_component( gtestDir "@GTEST_LIBRARY@" DIRECTORY )
-get_filename_component( gtestDirDebug "@GTEST_LIBRARY_DEBUG@" DIRECTORY )
+get_filename_component( gtestDir "@GTEST_LIBRARY@" PATH )
+get_filename_component( gtestDirDebug "@GTEST_LIBRARY_DEBUG@" PATH )
if( EXISTS "${gtestDir}" )
list( APPEND depList "${gtestDir}" )
@@ -62,7 +62,7 @@ if( ${gtestDiffDirs} AND EXISTS "${gtestDirDebug}" )
endif( )
#This logic assumes that FindOpenCL.cmake has been called
-get_filename_component( openclDir "@OPENCL_LIBRARIES@" DIRECTORY )
+get_filename_component( openclDir "@OPENCL_LIBRARIES@" PATH )
if( EXISTS "${openclDir}" )
list( APPEND depList "${openclDir}" )
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/clfft.git
More information about the debian-science-commits
mailing list