From feceb1b6fdeddc2d8769cb98363bb68d31962076 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 28 Jun 2015 21:13:54 +0200 Subject: [PATCH] Improve subversion detection with CMake MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 3f79686acfa65183461f55eaa0f56c111df8c07d) --- tdeioslave/svn/ConfigureChecks.cmake | 7 ++++--- 1 file 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 )