Mac changes for Subversion bundling.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c2124c4bce0136dc40167d3aafc48b92425455df..1f4db46f664f47bdda873b8d6044eda4df32e0d4 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,9 +118,6 @@ endif (MSVC AND MSVC_3RDPARTY_ROOT)
 find_package(Boost REQUIRED)
 set (BOOST_CXX_FLAGS "-DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION -DBOOST_BIMAP_DISABLE_SERIALIZATION")
 
-find_package(ZLIB REQUIRED)
-find_package(Threads REQUIRED)
-
 if(SIMGEAR_HEADLESS)
     message(STATUS "SimGear mode: HEADLESS")
 else()
@@ -156,6 +153,9 @@ else()
     message(STATUS "Subversion client support: DISABLED")
 endif(ENABLE_LIBSVN)
 
+find_package(ZLIB REQUIRED)
+find_package(Threads REQUIRED)
+
 check_include_file(sys/time.h HAVE_SYS_TIME_H)
 check_include_file(sys/timeb.h HAVE_SYS_TIMEB_H)
 check_include_file(unistd.h HAVE_UNISTD_H)

diff --git a/CMakeModules/FindSvnClient.cmake b/CMakeModules/FindSvnClient.cmake
index 15f6ba27a630dd2c4ff687e0839c76edd1549bdb..5a985c53041c879f9b2c59304ed733951cfa1417 100644 (file)
--- a/CMakeModules/FindSvnClient.cmake
+++ b/CMakeModules/FindSvnClient.cmake
@@ -16,14 +16,18 @@ macro(find_static_component comp libs)
     string(TOUPPER "${comp}" compLibBase)
     set( compLibName ${compLibBase}_LIBRARY )
 
+    # NO_DEFAULT_PATH is important on Mac - we need to ensure subversion
+    # libraires in dist/ or Macports are picked over the Apple version 
+    # in /usr, since that's what we will ship.
     FIND_LIBRARY(${compLibName}
+      NO_DEFAULT_PATH
       NAMES ${compLib}
-      HINTS $ENV{PLIBDIR}
+      HINTS $ENV{LIBSVN_DIR} ${CMAKE_INSTALL_PREFIX} 
       PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
       PATHS
+      /opt/local
       /usr/local
       /usr
-      /opt
     )
 
        list(APPEND ${libs} ${${compLibName}})
@@ -49,13 +53,14 @@ endif(HAVE_APR_CONFIG)
 
 if(HAVE_APR_CONFIG OR MSVC)
        find_path(LIBSVN_INCLUDE_DIR svn_client.h
+      NO_DEFAULT_PATH
          HINTS
-         $ENV{LIBSVN_DIR}
+         $ENV{LIBSVN_DIR} ${CMAKE_INSTALL_PREFIX}
          PATH_SUFFIXES include/subversion-1
          PATHS
+      /opt/local
          /usr/local
          /usr
-         /opt
        )
        
        set(LIBSVN_LIBRARIES "")

diff --git a/simgear/CMakeLists.txt b/simgear/CMakeLists.txt
index fb5f8b1cabcf77b4bf9b59e7da1ebcef5b23fdcb..46a22b6571f7be7e24584ee9bde3aea5e8dd8b2a 100644 (file)
--- a/simgear/CMakeLists.txt
+++ b/simgear/CMakeLists.txt
@@ -59,12 +59,7 @@ if(SIMGEAR_SHARED)
 
     if(LIBSVN_FOUND)
         add_definitions(${APR_CFLAGS})
-
-        IF(APPLE)
-            set_property(SOURCE scene/tsync/terrasync.cxx PROPERTY COMPILE_FLAGS "-iwithsysroot ${LIBSVN_INCLUDE_DIR}")
-        ELSE()
-            include_directories(${LIBSVN_INCLUDE_DIR})
-        ENDIF(APPLE)
+        include_directories(${LIBSVN_INCLUDE_DIR})
         target_link_libraries(SimGearCore ${LIBSVN_LIBRARIES})
     endif(LIBSVN_FOUND)
 

diff --git a/simgear/scene/tsync/CMakeLists.txt b/simgear/scene/tsync/CMakeLists.txt
index 5c0be4297e7a5ab53de9c642d71bf361cdbb7601..fceba2de023ff9eb514a322377e43574fc5fbce2 100644 (file)
--- a/simgear/scene/tsync/CMakeLists.txt
+++ b/simgear/scene/tsync/CMakeLists.txt
@@ -10,13 +10,7 @@ set(SOURCES
 
 if(LIBSVN_FOUND)
        add_definitions(${APR_CFLAGS})
-
-       IF(APPLE)
-               set_property(SOURCE terrasync.cxx PROPERTY COMPILE_FLAGS "-iwithsysroot ${LIBSVN_INCLUDE_DIR}")
-       ELSE()
-               include_directories(${LIBSVN_INCLUDE_DIR})
-       ENDIF(APPLE)
-
+       include_directories(${LIBSVN_INCLUDE_DIR})
 endif()
 
 simgear_component(tsync scene/tsync "${SOURCES}" "${HEADERS}")