From: James Turner <zakalawe@mac.com>
Date: Sat, 22 Jan 2011 18:49:54 +0000 (+0000)
Subject: Fix Apple libsvn include for isysroot (SDK) builds.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0ad9ac4f3daf6360c91898d877ec8dbdbe08de06;p=flightgear.git

Fix Apple libsvn include for isysroot (SDK) builds.
---

diff --git a/utils/TerraSync/CMakeLists.txt b/utils/TerraSync/CMakeLists.txt
index 86526eb0b..88b208c16 100644
--- a/utils/TerraSync/CMakeLists.txt
+++ b/utils/TerraSync/CMakeLists.txt
@@ -1,7 +1,4 @@
 
-if(LIBSVN_FOUND)
-	include_directories(${LIBSVN_INCLUDE_DIR})
-endif(LIBSVN_FOUND)
 	
 add_executable(terrasync terrasync.cxx)
 
@@ -12,7 +9,13 @@ target_link_libraries(terrasync
 
 if(LIBSVN_FOUND)
 	target_link_libraries(terrasync ${LIBSVN_LIBRARIES})
-	set_property(TARGET terrasync APPEND PROPERTY COMPILE_FLAGS ${APR_CFLAGS})
+	set_property(TARGET terrasync APPEND PROPERTY COMPILE_FLAGS "${APR_CFLAGS}")
+	
+	IF(APPLE)
+	    set_property(SOURCE terrasync.cxx PROPERTY COMPILE_FLAGS "-iwithsysroot ${LIBSVN_INCLUDE_DIR}")
+	ELSE()
+	    include_directories(${LIBSVN_INCLUDE_DIR})
+	ENDIF(APPLE)
 endif()
 
 
diff --git a/utils/TerraSync/terrasync.cxx b/utils/TerraSync/terrasync.cxx
index 8776cdc5a..f1a2cc46b 100644
--- a/utils/TerraSync/terrasync.cxx
+++ b/utils/TerraSync/terrasync.cxx
@@ -183,8 +183,10 @@ int mysvn_setup(void) {
     if (err)
         return svn_cmdline_handle_exit_error(err, pool, "terrasync: ");
     mysvn_ctx->auth_baton = ab;
+#if (SVN_VER_MINOR >= 5)
     mysvn_ctx->conflict_func = NULL;
     mysvn_ctx->conflict_baton = NULL;
+#endif
     // Now our magic revisions
     mysvn_rev = (svn_opt_revision_t*) apr_palloc(pool, 
         sizeof(svn_opt_revision_t));