Skip to content

Commit

Permalink
gmock+xcode update...
Browse files Browse the repository at this point in the history
  • Loading branch information
@macmade
macmade committed Mar 8, 2017
1 parent bf8a11a commit da44079
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
10 changes: 7 additions & 3 deletions CPPAtomic.xcodeproj/project.pbxproj
View file
Expand Up @@ -214,7 +214,7 @@
05BD894A1A13FF4700A43CD8 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0800;
LastUpgradeCheck = 0820;
ORGANIZATIONNAME = "XS-Labs";
TargetAttributes = {
053BEDAB1B8EFDC1007D82A4 = {
Expand Down Expand Up @@ -428,6 +428,7 @@
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
Expand All @@ -437,6 +438,7 @@
CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down Expand Up @@ -486,7 +488,7 @@
GCC_WARN_UNUSED_PARAMETER = YES;
GCC_WARN_UNUSED_VALUE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
LLVM_LTO = YES_THIN;
LLVM_LTO = YES;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
Expand Down Expand Up @@ -538,6 +540,7 @@
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
Expand All @@ -547,6 +550,7 @@
CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down Expand Up @@ -591,7 +595,7 @@
GCC_WARN_UNUSED_PARAMETER = YES;
GCC_WARN_UNUSED_VALUE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
LLVM_LTO = YES_THIN;
LLVM_LTO = YES;
MACOSX_DEPLOYMENT_TARGET = 10.10;
MTL_ENABLE_DEBUG_INFO = NO;
RUN_CLANG_STATIC_ANALYZER = YES;
Expand Down
2 changes: 1 addition & 1 deletion CPPAtomic.xcodeproj/xcshareddata/xcschemes/CPPAtomic-Tests.xcscheme
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0800"
LastUpgradeVersion = "0820"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion Submodules/CPPTraits
Submodule CPPTraits updated 5 files
+5 −1 CPPTraits.xcodeproj/project.pbxproj
+7 −7 CPPTraits.xcodeproj/project.xcworkspace/xcshareddata/CPPTraits.xcscmblueprint
+1 −1 CPPTraits.xcodeproj/xcshareddata/xcschemes/CPPTraits-Tests.xcscheme
+4 −1 README.md
+1 −1 Submodules/gmock-xcode
2 changes: 1 addition & 1 deletion Submodules/gmock-xcode
Submodule gmock-xcode updated 44 files
+7 −1 GoogleMock.xcodeproj/project.pbxproj
+1 −1 GoogleMock.xcodeproj/xcshareddata/xcschemes/GoogleMock.xcscheme
+17 −13 Libraries/Makefile
+159 −32 Libraries/build/include/gmock/gmock-actions.h
+223 −261 Libraries/build/include/gmock/gmock-generated-actions.h
+50 −77 Libraries/build/include/gmock/gmock-generated-actions.h.pump
+126 −22 Libraries/build/include/gmock/gmock-generated-function-mockers.h
+30 −4 Libraries/build/include/gmock/gmock-generated-function-mockers.h.pump
+68 −79 Libraries/build/include/gmock/gmock-generated-matchers.h
+9 −11 Libraries/build/include/gmock/gmock-generated-matchers.h.pump
+574 −161 Libraries/build/include/gmock/gmock-matchers.h
+29 −16 Libraries/build/include/gmock/gmock-more-actions.h
+81 −25 Libraries/build/include/gmock/gmock-spec-builders.h
+8 −0 Libraries/build/include/gmock/internal/custom/gmock-generated-actions.h
+10 −0 Libraries/build/include/gmock/internal/custom/gmock-generated-actions.h.pump
+39 −0 Libraries/build/include/gmock/internal/custom/gmock-matchers.h
+46 −0 Libraries/build/include/gmock/internal/custom/gmock-port.h
+33 −33 Libraries/build/include/gmock/internal/gmock-generated-internal-utils.h
+4 −4 Libraries/build/include/gmock/internal/gmock-generated-internal-utils.h.pump
+29 −16 Libraries/build/include/gmock/internal/gmock-internal-utils.h
+17 −4 Libraries/build/include/gmock/internal/gmock-port.h
+35 −12 Libraries/build/include/gtest/gtest-param-test.h
+35 −12 Libraries/build/include/gtest/gtest-param-test.h.pump
+191 −53 Libraries/build/include/gtest/gtest-printers.h
+6 −2 Libraries/build/include/gtest/gtest-typed-test.h
+173 −228 Libraries/build/include/gtest/gtest.h
+69 −0 Libraries/build/include/gtest/internal/custom/gtest-port.h
+42 −0 Libraries/build/include/gtest/internal/custom/gtest-printers.h
+41 −0 Libraries/build/include/gtest/internal/custom/gtest.h
+136 −56 Libraries/build/include/gtest/internal/gtest-internal.h
+12 −2 Libraries/build/include/gtest/internal/gtest-linked_ptr.h
+43 −40 Libraries/build/include/gtest/internal/gtest-param-util-generated.h
+7 −22 Libraries/build/include/gtest/internal/gtest-param-util-generated.h.pump
+132 −20 Libraries/build/include/gtest/internal/gtest-param-util.h
+93 −0 Libraries/build/include/gtest/internal/gtest-port-arch.h
+792 −185 Libraries/build/include/gtest/internal/gtest-port.h
+8 −0 Libraries/build/include/gtest/internal/gtest-tuple.h
+8 −0 Libraries/build/include/gtest/internal/gtest-tuple.h.pump
+ − Libraries/build/lib/osx/libgmock.a
+ − Libraries/build/lib/osx/libgmock_main.a
+ − Libraries/build/lib/osx/libgtest.a
+ − Libraries/build/lib/osx/libgtest_main.a
+ − Libraries/source/gmock-1.7.0.zip
+4 −3 README.md

0 comments on commit da44079

Please sign in to comment.