Skip to content

Commit 02f07f4

Browse files
author
Kent Knox
committed
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.
1 parent ee5da40 commit 02f07f4

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/tests/copyTestDependencies.cmake.in

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ endif( )
1818

1919
# message( fixedTestLocation ": ${fixedTestLocation}" )
2020
# Get the directory that the test executable resides in; this helps get_prerequisites( ) find dependent libraries
21-
get_filename_component( testDir "${fixedTestLocation}" DIRECTORY )
21+
get_filename_component( testDir "${fixedTestLocation}" PATH )
2222
# message( testDir ": ${testDir}" )
2323

2424
set( installPath "" )
@@ -32,8 +32,8 @@ endif( )
3232
set( depList "" )
3333

3434
#This logic assumes that FindFFTW.cmake has been called
35-
get_filename_component( fftwDirSingle "@FFTW_SINGLE_PRECISION_LIBRARIES@" DIRECTORY )
36-
get_filename_component( fftwDirDouble "@FFTW_DOUBLE_PRECISION_LIBRARIES@" DIRECTORY )
35+
get_filename_component( fftwDirSingle "@FFTW_SINGLE_PRECISION_LIBRARIES@" PATH )
36+
get_filename_component( fftwDirDouble "@FFTW_DOUBLE_PRECISION_LIBRARIES@" PATH )
3737

3838
if( EXISTS "${fftwDirSingle}" )
3939
list( APPEND depList "${fftwDirSingle}" )
@@ -47,8 +47,8 @@ if( ${fftwDiffDirs} AND EXISTS "${fftwDirDouble}" )
4747
endif( )
4848

4949
#This logic assumes that FindGTest.cmake has been called
50-
get_filename_component( gtestDir "@GTEST_LIBRARY@" DIRECTORY )
51-
get_filename_component( gtestDirDebug "@GTEST_LIBRARY_DEBUG@" DIRECTORY )
50+
get_filename_component( gtestDir "@GTEST_LIBRARY@" PATH )
51+
get_filename_component( gtestDirDebug "@GTEST_LIBRARY_DEBUG@" PATH )
5252

5353
if( EXISTS "${gtestDir}" )
5454
list( APPEND depList "${gtestDir}" )
@@ -62,7 +62,7 @@ if( ${gtestDiffDirs} AND EXISTS "${gtestDirDebug}" )
6262
endif( )
6363

6464
#This logic assumes that FindOpenCL.cmake has been called
65-
get_filename_component( openclDir "@OPENCL_LIBRARIES@" DIRECTORY )
65+
get_filename_component( openclDir "@OPENCL_LIBRARIES@" PATH )
6666

6767
if( EXISTS "${openclDir}" )
6868
list( APPEND depList "${openclDir}" )

0 commit comments

Comments
 (0)