Use CoreServices, not Cocoa, for FSFindFolder

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b77576cda167a3315f9e5891cf2572ffa35975c3..f25cf760535bb6b777a5ee729358aa20084d10d3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -168,6 +168,10 @@ if (MSVC AND MSVC_3RDPARTY_ROOT)
   set (OPENAL_LIBRARY_DIR ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/lib)
 endif (MSVC AND MSVC_3RDPARTY_ROOT)
 
+if(APPLE)
+  find_library(CORE_SERVICES_LIBRARY CoreServices)
+endif()
+
 find_package(Boost REQUIRED)
 set (BOOST_CXX_FLAGS "-DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION -DBOOST_BIMAP_DISABLE_SERIALIZATION")
 
@@ -378,11 +382,8 @@ if(ENABLE_TESTS)
             ${CMAKE_THREAD_LIBS_INIT}
             ${ZLIB_LIBRARY}
             ${WINSOCK_LIBRARY}
-            ${RT_LIBRARY})
-        if(APPLE)
-          find_library(COCOA_LIBRARY Cocoa)
-          list(APPEND TEST_LIBS ${COCOA_LIBRARY})
-        endif()
+            ${RT_LIBRARY}
+            ${CORE_SERVICES_LIBRARY})
     endif()
 
     if(NOT SIMGEAR_HEADLESS)

diff --git a/simgear/CMakeLists.txt b/simgear/CMakeLists.txt
index ca49747a2ad2a562792354d049d99662ee85f0b5..096d01800b7ccf3b11e9b22671407db052d82257 100644 (file)
--- a/simgear/CMakeLists.txt
+++ b/simgear/CMakeLists.txt
@@ -66,7 +66,8 @@ if(SIMGEAR_SHARED)
     target_link_libraries(SimGearCore ${ZLIB_LIBRARY} ${RT_LIBRARY} 
         ${LibArchive_LIBRARIES}
         ${EXPAT_LIBRARIES}
-        ${CMAKE_THREAD_LIBS_INIT})
+        ${CMAKE_THREAD_LIBS_INIT}
+        ${CORE_SERVICES_LIBRARY})
 
     if(LIBSVN_FOUND)
         target_link_libraries(SimGearCore ${LIBSVN_LIBRARIES})