aboutsummaryrefslogtreecommitdiffstats
path: root/xcode/Config
diff options
context:
space:
mode:
authorpreston.a.jackson <preston.a.jackson@861a406c-534a-0410-8894-cb66d6ee9925>2009-08-21 14:00:34 +0000
committerpreston.a.jackson <preston.a.jackson@861a406c-534a-0410-8894-cb66d6ee9925>2009-08-21 14:00:34 +0000
commit6149876141b4a5d16d1481835bf5519618183980 (patch)
treeb6f4e8b6dd6f1cdd6f0ace685010a1e4adf09f24 /xcode/Config
parent888b6ebe7d8b2b1f0ee781b69126dd6981b368a5 (diff)
downloadgoogletest-6149876141b4a5d16d1481835bf5519618183980.tar.gz
googletest-6149876141b4a5d16d1481835bf5519618183980.tar.bz2
googletest-6149876141b4a5d16d1481835bf5519618183980.zip
Cleaning up gtest.xcode. Removing old tests, using gtest-all.cc, adding a static libgtest.a and a static libgtest_main.a, fixing the sample code to work with changes.
Diffstat (limited to 'xcode/Config')
-rw-r--r--xcode/Config/InternalPythonTestTarget.xcconfig8
-rw-r--r--xcode/Config/InternalTestTarget.xcconfig8
-rw-r--r--xcode/Config/StaticLibraryTarget.xcconfig15
3 files changed, 15 insertions, 16 deletions
diff --git a/xcode/Config/InternalPythonTestTarget.xcconfig b/xcode/Config/InternalPythonTestTarget.xcconfig
deleted file mode 100644
index e0044453..00000000
--- a/xcode/Config/InternalPythonTestTarget.xcconfig
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// InternalPythonTestTarget.xcconfig
-//
-// These are Test target settings for the gtest framework and examples. It
-// is set in the "Based On:" dropdown in the "Target" info dialog.
-
-PRODUCT_NAME = $(TARGET_NAME)_
-HEADER_SEARCH_PATHS = ../ ../include
diff --git a/xcode/Config/InternalTestTarget.xcconfig b/xcode/Config/InternalTestTarget.xcconfig
deleted file mode 100644
index c50fd9c5..00000000
--- a/xcode/Config/InternalTestTarget.xcconfig
+++ /dev/null
@@ -1,8 +0,0 @@
-//
-// InternalTestTarget.xcconfig
-//
-// These are Test target settings for the gtest framework and examples. It
-// is set in the "Based On:" dropdown in the "Target" info dialog.
-
-PRODUCT_NAME = $(TARGET_NAME)
-HEADER_SEARCH_PATHS = ../ ../include
diff --git a/xcode/Config/StaticLibraryTarget.xcconfig b/xcode/Config/StaticLibraryTarget.xcconfig
new file mode 100644
index 00000000..67f840ad
--- /dev/null
+++ b/xcode/Config/StaticLibraryTarget.xcconfig
@@ -0,0 +1,15 @@
+//
+// StaticLibraryTarget.xcconfig
+//
+// These are static library target settings for libgtest.a. It
+// is set in the "Based On:" dropdown in the "Target" info dialog.
+// This file is based on the Xcode Configuration files in:
+// http://code.google.com/p/google-toolbox-for-mac/
+//
+
+// Static libs can be included in bundles so make them position independent
+GCC_DYNAMIC_NO_PIC = NO
+
+// Static libs should not have their internal globals or external symbols
+// stripped.
+STRIP_STYLE = debugging