aboutsummaryrefslogtreecommitdiffstats
path: root/gtest/xcode/Config
diff options
context:
space:
mode:
Diffstat (limited to 'gtest/xcode/Config')
-rw-r--r--gtest/xcode/Config/FrameworkTarget.xcconfig4
-rw-r--r--gtest/xcode/Config/InternalPythonTestTarget.xcconfig8
-rw-r--r--gtest/xcode/Config/InternalTestTarget.xcconfig8
-rw-r--r--gtest/xcode/Config/StaticLibraryTarget.xcconfig18
4 files changed, 20 insertions, 18 deletions
diff --git a/gtest/xcode/Config/FrameworkTarget.xcconfig b/gtest/xcode/Config/FrameworkTarget.xcconfig
index 3deadcd..357b1c8 100644
--- a/gtest/xcode/Config/FrameworkTarget.xcconfig
+++ b/gtest/xcode/Config/FrameworkTarget.xcconfig
@@ -13,5 +13,5 @@ GCC_DYNAMIC_NO_PIC = NO
// Dynamic libs should not have their external symbols stripped.
STRIP_STYLE = non-global
-// Installation Directory
-INSTALL_PATH = @loader_path/../Frameworks
+// Let the user install by specifying the $DSTROOT with xcodebuild
+SKIP_INSTALL = NO
diff --git a/gtest/xcode/Config/InternalPythonTestTarget.xcconfig b/gtest/xcode/Config/InternalPythonTestTarget.xcconfig
deleted file mode 100644
index e004445..0000000
--- a/gtest/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/gtest/xcode/Config/InternalTestTarget.xcconfig b/gtest/xcode/Config/InternalTestTarget.xcconfig
deleted file mode 100644
index c50fd9c..0000000
--- a/gtest/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/gtest/xcode/Config/StaticLibraryTarget.xcconfig b/gtest/xcode/Config/StaticLibraryTarget.xcconfig
new file mode 100644
index 0000000..3922fa5
--- /dev/null
+++ b/gtest/xcode/Config/StaticLibraryTarget.xcconfig
@@ -0,0 +1,18 @@
+//
+// 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
+
+// Let the user install by specifying the $DSTROOT with xcodebuild
+SKIP_INSTALL = NO