Mac changes for Subversion bundling.

Clang (in Xcode 4.4) is being strict about dependent lookup rules, so apply the recommended fix-it.

CMakeLists.txt

@@ -110,9 +110,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()
@@ -148,6 +145,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)

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 "")

simgear/CMakeLists.txt

@@ -59,12 +59,7 @@ if(SIMGEAR_SHARED)
 
     if(LIBSVN_FOUND)
         add_definitions(${APR_CFLAGS})
-
+        include_directories(${LIBSVN_INCLUDE_DIR})
-        IF(APPLE)
-            set_property(SOURCE scene/tsync/terrasync.cxx PROPERTY COMPILE_FLAGS "-iwithsysroot ${LIBSVN_INCLUDE_DIR}")
-        ELSE()
-            include_directories(${LIBSVN_INCLUDE_DIR})
-        ENDIF(APPLE)
         target_link_libraries(SimGearCore ${LIBSVN_LIBRARIES})
     endif(LIBSVN_FOUND)
 

simgear/props/ExtendedPropertyAdapter.hxx

@@ -46,7 +46,7 @@ public:
         if (_elements.size() < num_components)
             throw sg_exception();
         for (int i = 0; i < num_components; ++i)
-            result[i] = _elements[i]->getValue<double>();
+            result[i] = _elements[i]->template getValue<double>();
         return result;
     }
     void set(const T& val)

simgear/props/propertyObject.hxx

@@ -108,7 +108,7 @@ public:
 // conversion operators
   operator T () const
   {
-    return getOrThrow()->getValue<T>();
+    return getOrThrow()->template getValue<T>();
   }
 
   T operator=(const T& aValue)

simgear/scene/material/EffectBuilder.hxx

@@ -195,7 +195,7 @@ void findAttr(const effect::EffectPropertyMap<T>& pMap,
 {
     using namespace effect;
     typename EffectPropertyMap<T>::BMap::iterator itr
-        = pMap._map.get<from>().find(name);
+        = pMap._map.template get<from>().find(name);
     if (itr == pMap._map.end()) {
         throw effect::BuilderException(string("findAttr: could not find attribute ")
                                + string(name));
@@ -233,7 +233,7 @@ const T* findAttr(const effect::EffectPropertyMap<T>& pMap,
 {
     using namespace effect;
     typename EffectPropertyMap<T>::BMap::iterator itr
-        = pMap._map.get<from>().find(name);
+        = pMap._map.template get<from>().find(name);
     if (itr == pMap._map.end())
         return 0;
     else 
@@ -267,8 +267,8 @@ std::string findName(const effect::EffectPropertyMap<T>& pMap, T value)
     using namespace effect;
     std::string result;
     typename EffectPropertyMap<T>::BMap::template index_iterator<to>::type itr
-        = pMap._map.get<to>().find(value);
+        = pMap._map.template get<to>().find(value);
-    if (itr != pMap._map.get<to>().end())
+    if (itr != pMap._map.template get<to>().end())
         result = itr->first;
     return result;
 }

simgear/scene/tsync/CMakeLists.txt

@@ -10,13 +10,7 @@ set(SOURCES
 
 if(LIBSVN_FOUND)
 	add_definitions(${APR_CFLAGS})
-
+	include_directories(${LIBSVN_INCLUDE_DIR})
-	IF(APPLE)
-		set_property(SOURCE terrasync.cxx PROPERTY COMPILE_FLAGS "-iwithsysroot ${LIBSVN_INCLUDE_DIR}")
-	ELSE()
-		include_directories(${LIBSVN_INCLUDE_DIR})
-	ENDIF(APPLE)
-
 endif()
 
 simgear_component(tsync scene/tsync "${SOURCES}" "${HEADERS}")