From 0037dcb6af2e9c9172d4fe642fb9e0b718580053 Mon Sep 17 00:00:00 2001
From: Sean McBride <sean@rogue-research.com>
Date: Tue, 17 Aug 2010 16:11:33 -0400
Subject: Removed most usage of Carbon in favour of CoreFoundation

---
 Source/CMakeLists.txt              |  4 ++--
 Source/CPack/OSXScriptLauncher.cxx |  1 -
 Tests/BundleTest/BundleLib.cxx     |  4 ++--
 Tests/BundleTest/BundleTest.cxx    |  6 +++---
 Tests/BundleTest/CMakeLists.txt    | 12 ++++++------
 bootstrap                          |  4 ++--
 6 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 7722c19..278d4df 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -343,7 +343,7 @@ TARGET_LINK_LIBRARIES(CMakeLib cmsys
   ${CMAKE_TAR_LIBRARIES} ${CMAKE_COMPRESS_LIBRARIES}
   ${CMAKE_CURL_LIBRARIES} )
 
-# On Apple we need Carbon
+# On Apple we need CoreFoundation
 IF(APPLE)
   TARGET_LINK_LIBRARIES(CMakeLib "-framework CoreFoundation")
 ENDIF(APPLE)
@@ -465,7 +465,7 @@ IF(APPLE)
   ADD_EXECUTABLE(OSXScriptLauncher
     CPack/OSXScriptLauncher.cxx)
   TARGET_LINK_LIBRARIES(OSXScriptLauncher cmsys)
-  TARGET_LINK_LIBRARIES(OSXScriptLauncher "-framework Carbon")
+  TARGET_LINK_LIBRARIES(OSXScriptLauncher "-framework CoreFoundation")
 ENDIF(APPLE)
 
 # Build CMake executable
diff --git a/Source/CPack/OSXScriptLauncher.cxx b/Source/CPack/OSXScriptLauncher.cxx
index 99ffecc..e0fbe9b 100644
--- a/Source/CPack/OSXScriptLauncher.cxx
+++ b/Source/CPack/OSXScriptLauncher.cxx
@@ -14,7 +14,6 @@
 #include <cmsys/ios/fstream>
 #include <cmsys/ios/iostream>
 
-#include <Carbon/Carbon.h>
 #include <CoreFoundation/CoreFoundation.h>
 
 // For the PATH_MAX constant
diff --git a/Tests/BundleTest/BundleLib.cxx b/Tests/BundleTest/BundleLib.cxx
index bab745e..b68ee25 100644
--- a/Tests/BundleTest/BundleLib.cxx
+++ b/Tests/BundleTest/BundleLib.cxx
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <Carbon/Carbon.h>
+#include <CoreFoundation/CoreFoundation.h>
 
 int fileExists(char* filename)
 {
@@ -51,7 +51,7 @@ int findBundleFile(char* exec, const char* file)
 
 int foo(char *exec)
 {
-  // Call a "Carbon" function...
+  // Call a CoreFoundation function...
   //
   CFBundleRef br = CFBundleGetMainBundle();
   (void) br;
diff --git a/Tests/BundleTest/BundleTest.cxx b/Tests/BundleTest/BundleTest.cxx
index 29d17db..a66d601 100644
--- a/Tests/BundleTest/BundleTest.cxx
+++ b/Tests/BundleTest/BundleTest.cxx
@@ -1,6 +1,6 @@
 #include <stdio.h>
 
-#include <Carbon/Carbon.h>
+#include <CoreFoundation/CoreFoundation.h>
 
 extern int foo(char* exec);
 
@@ -8,8 +8,8 @@ int main(int argc, char* argv[])
 {
   printf("Started with: %d arguments\n", argc);
 
-  // Call a "Carbon" function... but pull in the link dependency on "-framework
-  // Carbon" via CMake's dependency chaining mechanism. This code exists to
+  // Call a CoreFoundation function... but pull in the link dependency on "-framework
+  // CoreFoundation" via CMake's dependency chaining mechanism. This code exists to
   // verify that the chaining mechanism works with "-framework blah" style
   // link dependencies.
   //
diff --git a/Tests/BundleTest/CMakeLists.txt b/Tests/BundleTest/CMakeLists.txt
index 5ccf2bf..5342f49 100644
--- a/Tests/BundleTest/CMakeLists.txt
+++ b/Tests/BundleTest/CMakeLists.txt
@@ -25,14 +25,14 @@ SET_SOURCE_FILES_PROPERTIES(
 SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/foobar")
 
 # Test building a bundle linking to a shared library where the
-# shared library links to Carbon, but the executable does not
-# explicitly link to Carbon, but the executable does *depend*
-# on Carbon. There should be a link failure for the executable
+# shared library links to CoreFoundation, but the executable does not
+# explicitly link to CoreFoundation, but the executable does *depend*
+# on CoreFoundation. There should be a link failure for the executable
 # if CMake's dependency chaining for libraries with "-framework
 # blah" style dependencies gets broken...
 #
 ADD_LIBRARY(BundleTestLib SHARED BundleLib.cxx)
-TARGET_LINK_LIBRARIES(BundleTestLib "-framework Carbon")
+TARGET_LINK_LIBRARIES(BundleTestLib "-framework CoreFoundation")
 
 ADD_EXECUTABLE(BundleTest
   MACOSX_BUNDLE
@@ -43,8 +43,8 @@ ADD_EXECUTABLE(BundleTest
   )
 TARGET_LINK_LIBRARIES(BundleTest BundleTestLib)
 #
-# DO NOT: TARGET_LINK_LIBRARIES(BundleTest "-framework Carbon")
-#   (see above comments about Carbon)
+# DO NOT: TARGET_LINK_LIBRARIES(BundleTest "-framework CoreFoundation")
+#   (see above comments about CoreFoundation)
 #
 
 # Test bundle installation.
diff --git a/bootstrap b/bootstrap
index b95e36a..c999888 100755
--- a/bootstrap
+++ b/bootstrap
@@ -666,9 +666,9 @@ if ${cmake_system_cygwin}; then
   cmake_ld_flags="${LDFLAGS} -Wl,--enable-auto-import"
 fi
 
-# Add Carbon framework on Darwin
+# Add CoreFoundation framework on Darwin
 if ${cmake_system_darwin}; then
-  cmake_ld_flags="${LDFLAGS} -framework Carbon"  
+  cmake_ld_flags="${LDFLAGS} -framework CoreFoundation"
 fi
 
 # Add BeOS toolkits...
-- 
cgit v0.12