summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2015-06-28 21:13:54 +0200
committerSlávek Banko <slavek.banko@axis.cz>2015-06-28 21:16:37 +0200
commitfeceb1b6fdeddc2d8769cb98363bb68d31962076 (patch)
tree70d852ade2a700f4a2a276556ca6373550d7ae18
parent0769233ac2047278a7cdc2954fc46f4b2f59ed67 (diff)
downloadtdesdk-feceb1b6fdeddc2d8769cb98363bb68d31962076.tar.gz
tdesdk-feceb1b6fdeddc2d8769cb98363bb68d31962076.zip
Improve subversion detection with CMake
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 3f79686acfa65183461f55eaa0f56c111df8c07d)
-rw-r--r--tdeioslave/svn/ConfigureChecks.cmake7
1 files changed, 4 insertions, 3 deletions
diff --git a/tdeioslave/svn/ConfigureChecks.cmake b/tdeioslave/svn/ConfigureChecks.cmake
index 3d46c748..d5fd9e52 100644
--- a/tdeioslave/svn/ConfigureChecks.cmake
+++ b/tdeioslave/svn/ConfigureChecks.cmake
@@ -42,9 +42,10 @@ if( SVN_INCLUDE_DIR )
check_include_file( "svn_types.h" HAVE_SVN_TYPES_H )
tde_restore( CMAKE_REQUIRED_INCLUDES )
else( )
- # FIXME must be improved
- check_include_file( "/usr/include/subversion-1/svn_types.h" HAVE_SVN_TYPES_H )
- set( SVN_INCLUDE_DIR "/usr/include/subversion-1" )
+ find_file( HAVE_SVN_TYPES_H "subversion-1/svn_types.h" )
+ if( HAVE_SVN_TYPES_H )
+ get_filename_component( SVN_INCLUDE_DIR ${HAVE_SVN_TYPES_H} PATH CACHE )
+ endif( )
endif( )
tde_restore( CMAKE_REQUIRED_FLAGS CMAKE_REQUIRED_DEFINITIONS )