fly/flightgear
1
0
Fork 0
Code Activity

Fix Apple libsvn include for isysroot (SDK) builds.

Browse source
This commit is contained in:
James Turner 2011-01-22 18:49:54 +00:00
parent 45b239fe26
commit 0ad9ac4f3d
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
utils/TerraSync/CMakeLists.txt
View file

@ -1,7 +1,4 @@
if(LIBSVN_FOUND)
include_directories(${LIBSVN_INCLUDE_DIR})
endif(LIBSVN_FOUND)
add_executable(terrasync terrasync.cxx) add_executable(terrasync terrasync.cxx)
@ -12,7 +9,13 @@ target_link_libraries(terrasync
if(LIBSVN_FOUND) if(LIBSVN_FOUND)
target_link_libraries(terrasync ${LIBSVN_LIBRARIES}) 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() endif()

2
utils/TerraSync/terrasync.cxx
View file

@ -183,8 +183,10 @@ int mysvn_setup(void) {
if (err) if (err)
return svn_cmdline_handle_exit_error(err, pool, "terrasync: "); return svn_cmdline_handle_exit_error(err, pool, "terrasync: ");
mysvn_ctx->auth_baton = ab; mysvn_ctx->auth_baton = ab;
#if (SVN_VER_MINOR >= 5)
mysvn_ctx->conflict_func = NULL; mysvn_ctx->conflict_func = NULL;
mysvn_ctx->conflict_baton = NULL; mysvn_ctx->conflict_baton = NULL;
#endif
// Now our magic revisions // Now our magic revisions
mysvn_rev = (svn_opt_revision_t*) apr_palloc(pool, mysvn_rev = (svn_opt_revision_t*) apr_palloc(pool,
sizeof(svn_opt_revision_t)); sizeof(svn_opt_revision_t));