Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
7e7e3a6f
Unverified
Commit
7e7e3a6f
authored
Aug 15, 2018
by
Gennadiy Civil
Committed by
GitHub
Aug 15, 2018
Browse files
Merge branch 'master' into patch-1
parents
b50b2f77
997d343d
Changes
204
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
googletest/xcode/Config/FrameworkTarget.xcconfig
googletest/xcode/Config/FrameworkTarget.xcconfig
+1
-1
googletest/xcode/Config/General.xcconfig
googletest/xcode/Config/General.xcconfig
+1
-1
googletest/xcode/Config/ReleaseProject.xcconfig
googletest/xcode/Config/ReleaseProject.xcconfig
+1
-1
googletest/xcode/Config/StaticLibraryTarget.xcconfig
googletest/xcode/Config/StaticLibraryTarget.xcconfig
+1
-1
No files found.
googletest/xcode/Config/FrameworkTarget.xcconfig
View file @
7e7e3a6f
...
...
@@ -4,7 +4,7 @@
// These are Framework target settings for the gtest framework and examples. 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
/
// http
s
://
github.com/google
/google-toolbox-for-mac
//
// Dynamic libs need to be position independent
...
...
googletest/xcode/Config/General.xcconfig
View file @
7e7e3a6f
...
...
@@ -4,7 +4,7 @@
// These are General configuration settings for the gtest framework and
// examples.
// This file is based on the Xcode Configuration files in:
// http://
code.google.com/p
/google-toolbox-for-mac
/
// http
s
://
github.com/google
/google-toolbox-for-mac
//
// Build for PPC and Intel, 32- and 64-bit
...
...
googletest/xcode/Config/ReleaseProject.xcconfig
View file @
7e7e3a6f
...
...
@@ -5,7 +5,7 @@
// and examples. It is set in the "Based On:" dropdown in the "Project" info
// dialog.
// This file is based on the Xcode Configuration files in:
// http://
code.google.com/p
/google-toolbox-for-mac
/
// http
s
://
github.com/google
/google-toolbox-for-mac
//
#include "General.xcconfig"
...
...
googletest/xcode/Config/StaticLibraryTarget.xcconfig
View file @
7e7e3a6f
...
...
@@ -4,7 +4,7 @@
// 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
/
// http
s
://
github.com/google
/google-toolbox-for-mac
//
// Static libs can be included in bundles so make them position independent
...
...
Prev
1
…
7
8
9
10
11
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment