|
|
@@ -7,10 +7,6 @@
|
|
|
objects = {
|
|
|
|
|
|
/* Begin PBXBuildFile section */
|
|
|
- CD0C59BA20C4124700454F82 /* matrix_dummy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD0C59B920C4124700454F82 /* matrix_dummy.cpp */; };
|
|
|
- CD0C59BB20C4124D00454F82 /* matrix.hpp in Headers */ = {isa = PBXBuildFile; fileRef = CD0E428D1D9B3955002FFED1 /* matrix.hpp */; };
|
|
|
- CD0C59BC20C4124D00454F82 /* matrix_helpers.hpp in Headers */ = {isa = PBXBuildFile; fileRef = CD0E428E1D9B3955002FFED1 /* matrix_helpers.hpp */; };
|
|
|
- CD0C59D620C412AD00454F82 /* libmatrix.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CD0C59B520C4123700454F82 /* libmatrix.dylib */; };
|
|
|
CD0C59DE20C412C400454F82 /* GoogleMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD0C59C520C4127400454F82 /* GoogleMock.framework */; };
|
|
|
CD0C59DF20C412C800454F82 /* matrix_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD0C59CC20C4128F00454F82 /* matrix_test.cpp */; };
|
|
|
CD0C59E120C4314B00454F82 /* matrix_helper_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD0C59E020C4314B00454F82 /* matrix_helper_test.cpp */; };
|
|
|
@@ -45,13 +41,6 @@
|
|
|
remoteGlobalIDString = 05818F901A685AEA0072A469;
|
|
|
remoteInfo = GoogleMockTests;
|
|
|
};
|
|
|
- CD0C59D720C412AD00454F82 /* PBXContainerItemProxy */ = {
|
|
|
- isa = PBXContainerItemProxy;
|
|
|
- containerPortal = CD0E42711D9B38A9002FFED1 /* Project object */;
|
|
|
- proxyType = 1;
|
|
|
- remoteGlobalIDString = CD0C59B420C4123700454F82;
|
|
|
- remoteInfo = matrix;
|
|
|
- };
|
|
|
CD0C59DC20C412BF00454F82 /* PBXContainerItemProxy */ = {
|
|
|
isa = PBXContainerItemProxy;
|
|
|
containerPortal = CD0C59BD20C4127400454F82 /* GoogleMock.xcodeproj */;
|
|
|
@@ -62,8 +51,6 @@
|
|
|
/* End PBXContainerItemProxy section */
|
|
|
|
|
|
/* Begin PBXFileReference section */
|
|
|
- CD0C59B520C4123700454F82 /* libmatrix.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libmatrix.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
|
|
|
- CD0C59B920C4124700454F82 /* matrix_dummy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = matrix_dummy.cpp; sourceTree = "<group>"; };
|
|
|
CD0C59BD20C4127400454F82 /* GoogleMock.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = GoogleMock.xcodeproj; path = "../../../gmock-xcode-master/GoogleMock.xcodeproj"; sourceTree = "<group>"; };
|
|
|
CD0C59CC20C4128F00454F82 /* matrix_test.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = matrix_test.cpp; sourceTree = "<group>"; };
|
|
|
CD0C59D120C412AD00454F82 /* matrix_test.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = matrix_test.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
|
|
|
@@ -74,19 +61,11 @@
|
|
|
/* End PBXFileReference section */
|
|
|
|
|
|
/* Begin PBXFrameworksBuildPhase section */
|
|
|
- CD0C59B220C4123700454F82 /* Frameworks */ = {
|
|
|
- isa = PBXFrameworksBuildPhase;
|
|
|
- buildActionMask = 2147483647;
|
|
|
- files = (
|
|
|
- );
|
|
|
- runOnlyForDeploymentPostprocessing = 0;
|
|
|
- };
|
|
|
CD0C59CE20C412AD00454F82 /* Frameworks */ = {
|
|
|
isa = PBXFrameworksBuildPhase;
|
|
|
buildActionMask = 2147483647;
|
|
|
files = (
|
|
|
CD0C59DE20C412C400454F82 /* GoogleMock.framework in Frameworks */,
|
|
|
- CD0C59D620C412AD00454F82 /* libmatrix.dylib in Frameworks */,
|
|
|
);
|
|
|
runOnlyForDeploymentPostprocessing = 0;
|
|
|
};
|
|
|
@@ -117,7 +96,6 @@
|
|
|
CD0E427A1D9B38A9002FFED1 /* Products */ = {
|
|
|
isa = PBXGroup;
|
|
|
children = (
|
|
|
- CD0C59B520C4123700454F82 /* libmatrix.dylib */,
|
|
|
CD0C59D120C412AD00454F82 /* matrix_test.xctest */,
|
|
|
);
|
|
|
name = Products;
|
|
|
@@ -128,7 +106,6 @@
|
|
|
children = (
|
|
|
CD0E428D1D9B3955002FFED1 /* matrix.hpp */,
|
|
|
CD0E428E1D9B3955002FFED1 /* matrix_helpers.hpp */,
|
|
|
- CD0C59B920C4124700454F82 /* matrix_dummy.cpp */,
|
|
|
);
|
|
|
name = src;
|
|
|
sourceTree = "<group>";
|
|
|
@@ -145,36 +122,7 @@
|
|
|
};
|
|
|
/* End PBXGroup section */
|
|
|
|
|
|
-/* Begin PBXHeadersBuildPhase section */
|
|
|
- CD0C59B320C4123700454F82 /* Headers */ = {
|
|
|
- isa = PBXHeadersBuildPhase;
|
|
|
- buildActionMask = 2147483647;
|
|
|
- files = (
|
|
|
- CD0C59BB20C4124D00454F82 /* matrix.hpp in Headers */,
|
|
|
- CD0C59BC20C4124D00454F82 /* matrix_helpers.hpp in Headers */,
|
|
|
- );
|
|
|
- runOnlyForDeploymentPostprocessing = 0;
|
|
|
- };
|
|
|
-/* End PBXHeadersBuildPhase section */
|
|
|
-
|
|
|
/* Begin PBXNativeTarget section */
|
|
|
- CD0C59B420C4123700454F82 /* matrix */ = {
|
|
|
- isa = PBXNativeTarget;
|
|
|
- buildConfigurationList = CD0C59B820C4123800454F82 /* Build configuration list for PBXNativeTarget "matrix" */;
|
|
|
- buildPhases = (
|
|
|
- CD0C59B120C4123700454F82 /* Sources */,
|
|
|
- CD0C59B220C4123700454F82 /* Frameworks */,
|
|
|
- CD0C59B320C4123700454F82 /* Headers */,
|
|
|
- );
|
|
|
- buildRules = (
|
|
|
- );
|
|
|
- dependencies = (
|
|
|
- );
|
|
|
- name = matrix;
|
|
|
- productName = matrix;
|
|
|
- productReference = CD0C59B520C4123700454F82 /* libmatrix.dylib */;
|
|
|
- productType = "com.apple.product-type.library.dynamic";
|
|
|
- };
|
|
|
CD0C59D020C412AD00454F82 /* matrix_test */ = {
|
|
|
isa = PBXNativeTarget;
|
|
|
buildConfigurationList = CD0C59D920C412AD00454F82 /* Build configuration list for PBXNativeTarget "matrix_test" */;
|
|
|
@@ -187,7 +135,6 @@
|
|
|
);
|
|
|
dependencies = (
|
|
|
CD0C59DD20C412BF00454F82 /* PBXTargetDependency */,
|
|
|
- CD0C59D820C412AD00454F82 /* PBXTargetDependency */,
|
|
|
);
|
|
|
name = matrix_test;
|
|
|
productName = matrix_test;
|
|
|
@@ -200,12 +147,9 @@
|
|
|
CD0E42711D9B38A9002FFED1 /* Project object */ = {
|
|
|
isa = PBXProject;
|
|
|
attributes = {
|
|
|
- LastUpgradeCheck = 0720;
|
|
|
+ LastUpgradeCheck = 1000;
|
|
|
ORGANIZATIONNAME = "Sam Jaffe";
|
|
|
TargetAttributes = {
|
|
|
- CD0C59B420C4123700454F82 = {
|
|
|
- CreatedOnToolsVersion = 7.2.1;
|
|
|
- };
|
|
|
CD0C59D020C412AD00454F82 = {
|
|
|
CreatedOnToolsVersion = 7.2.1;
|
|
|
};
|
|
|
@@ -229,7 +173,6 @@
|
|
|
);
|
|
|
projectRoot = "";
|
|
|
targets = (
|
|
|
- CD0C59B420C4123700454F82 /* matrix */,
|
|
|
CD0C59D020C412AD00454F82 /* matrix_test */,
|
|
|
);
|
|
|
};
|
|
|
@@ -277,14 +220,6 @@
|
|
|
/* End PBXResourcesBuildPhase section */
|
|
|
|
|
|
/* Begin PBXSourcesBuildPhase section */
|
|
|
- CD0C59B120C4123700454F82 /* Sources */ = {
|
|
|
- isa = PBXSourcesBuildPhase;
|
|
|
- buildActionMask = 2147483647;
|
|
|
- files = (
|
|
|
- CD0C59BA20C4124700454F82 /* matrix_dummy.cpp in Sources */,
|
|
|
- );
|
|
|
- runOnlyForDeploymentPostprocessing = 0;
|
|
|
- };
|
|
|
CD0C59CD20C412AD00454F82 /* Sources */ = {
|
|
|
isa = PBXSourcesBuildPhase;
|
|
|
buildActionMask = 2147483647;
|
|
|
@@ -297,11 +232,6 @@
|
|
|
/* End PBXSourcesBuildPhase section */
|
|
|
|
|
|
/* Begin PBXTargetDependency section */
|
|
|
- CD0C59D820C412AD00454F82 /* PBXTargetDependency */ = {
|
|
|
- isa = PBXTargetDependency;
|
|
|
- target = CD0C59B420C4123700454F82 /* matrix */;
|
|
|
- targetProxy = CD0C59D720C412AD00454F82 /* PBXContainerItemProxy */;
|
|
|
- };
|
|
|
CD0C59DD20C412BF00454F82 /* PBXTargetDependency */ = {
|
|
|
isa = PBXTargetDependency;
|
|
|
name = GoogleMock;
|
|
|
@@ -310,26 +240,6 @@
|
|
|
/* End PBXTargetDependency section */
|
|
|
|
|
|
/* Begin XCBuildConfiguration section */
|
|
|
- CD0C59B620C4123800454F82 /* Debug */ = {
|
|
|
- isa = XCBuildConfiguration;
|
|
|
- buildSettings = {
|
|
|
- DYLIB_COMPATIBILITY_VERSION = 1;
|
|
|
- DYLIB_CURRENT_VERSION = 1;
|
|
|
- EXECUTABLE_PREFIX = lib;
|
|
|
- PRODUCT_NAME = "$(TARGET_NAME)";
|
|
|
- };
|
|
|
- name = Debug;
|
|
|
- };
|
|
|
- CD0C59B720C4123800454F82 /* Release */ = {
|
|
|
- isa = XCBuildConfiguration;
|
|
|
- buildSettings = {
|
|
|
- DYLIB_COMPATIBILITY_VERSION = 1;
|
|
|
- DYLIB_CURRENT_VERSION = 1;
|
|
|
- EXECUTABLE_PREFIX = lib;
|
|
|
- PRODUCT_NAME = "$(TARGET_NAME)";
|
|
|
- };
|
|
|
- name = Release;
|
|
|
- };
|
|
|
CD0C59DA20C412AD00454F82 /* Debug */ = {
|
|
|
isa = XCBuildConfiguration;
|
|
|
buildSettings = {
|
|
|
@@ -360,13 +270,23 @@
|
|
|
CLANG_CXX_LIBRARY = "libc++";
|
|
|
CLANG_ENABLE_MODULES = YES;
|
|
|
CLANG_ENABLE_OBJC_ARC = YES;
|
|
|
+ CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
|
|
|
CLANG_WARN_BOOL_CONVERSION = YES;
|
|
|
+ CLANG_WARN_COMMA = YES;
|
|
|
CLANG_WARN_CONSTANT_CONVERSION = YES;
|
|
|
+ CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
|
|
|
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
|
|
|
CLANG_WARN_EMPTY_BODY = YES;
|
|
|
CLANG_WARN_ENUM_CONVERSION = YES;
|
|
|
+ CLANG_WARN_INFINITE_RECURSION = YES;
|
|
|
CLANG_WARN_INT_CONVERSION = YES;
|
|
|
+ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
|
|
|
+ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
|
|
|
+ CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
|
|
|
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
|
|
|
+ CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
|
|
|
+ CLANG_WARN_STRICT_PROTOTYPES = YES;
|
|
|
+ CLANG_WARN_SUSPICIOUS_MOVE = YES;
|
|
|
CLANG_WARN_UNREACHABLE_CODE = YES;
|
|
|
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
|
|
CODE_SIGN_IDENTITY = "-";
|
|
|
@@ -392,7 +312,7 @@
|
|
|
MTL_ENABLE_DEBUG_INFO = YES;
|
|
|
ONLY_ACTIVE_ARCH = YES;
|
|
|
SDKROOT = macosx;
|
|
|
- USER_HEADER_SEARCH_PATHS = "../../paradigm/declarative ../";
|
|
|
+ USER_HEADER_SEARCH_PATHS = "../../paradigm/declarative/expect/include/ ../";
|
|
|
WARNING_CFLAGS = "-Wno-gnu-zero-variadic-macro-arguments";
|
|
|
};
|
|
|
name = Debug;
|
|
|
@@ -405,13 +325,23 @@
|
|
|
CLANG_CXX_LIBRARY = "libc++";
|
|
|
CLANG_ENABLE_MODULES = YES;
|
|
|
CLANG_ENABLE_OBJC_ARC = YES;
|
|
|
+ CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
|
|
|
CLANG_WARN_BOOL_CONVERSION = YES;
|
|
|
+ CLANG_WARN_COMMA = YES;
|
|
|
CLANG_WARN_CONSTANT_CONVERSION = YES;
|
|
|
+ CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
|
|
|
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
|
|
|
CLANG_WARN_EMPTY_BODY = YES;
|
|
|
CLANG_WARN_ENUM_CONVERSION = YES;
|
|
|
+ CLANG_WARN_INFINITE_RECURSION = YES;
|
|
|
CLANG_WARN_INT_CONVERSION = YES;
|
|
|
+ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
|
|
|
+ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
|
|
|
+ CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
|
|
|
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
|
|
|
+ CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
|
|
|
+ CLANG_WARN_STRICT_PROTOTYPES = YES;
|
|
|
+ CLANG_WARN_SUSPICIOUS_MOVE = YES;
|
|
|
CLANG_WARN_UNREACHABLE_CODE = YES;
|
|
|
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
|
|
CODE_SIGN_IDENTITY = "-";
|
|
|
@@ -430,7 +360,7 @@
|
|
|
MACOSX_DEPLOYMENT_TARGET = 10.10;
|
|
|
MTL_ENABLE_DEBUG_INFO = NO;
|
|
|
SDKROOT = macosx;
|
|
|
- USER_HEADER_SEARCH_PATHS = "../../paradigm/declarative ../";
|
|
|
+ USER_HEADER_SEARCH_PATHS = "../../paradigm/declarative/expect/include/ ../";
|
|
|
WARNING_CFLAGS = "-Wno-gnu-zero-variadic-macro-arguments";
|
|
|
};
|
|
|
name = Release;
|
|
|
@@ -438,14 +368,6 @@
|
|
|
/* End XCBuildConfiguration section */
|
|
|
|
|
|
/* Begin XCConfigurationList section */
|
|
|
- CD0C59B820C4123800454F82 /* Build configuration list for PBXNativeTarget "matrix" */ = {
|
|
|
- isa = XCConfigurationList;
|
|
|
- buildConfigurations = (
|
|
|
- CD0C59B620C4123800454F82 /* Debug */,
|
|
|
- CD0C59B720C4123800454F82 /* Release */,
|
|
|
- );
|
|
|
- defaultConfigurationIsVisible = 0;
|
|
|
- };
|
|
|
CD0C59D920C412AD00454F82 /* Build configuration list for PBXNativeTarget "matrix_test" */ = {
|
|
|
isa = XCConfigurationList;
|
|
|
buildConfigurations = (
|
|
|
@@ -453,6 +375,7 @@
|
|
|
CD0C59DB20C412AD00454F82 /* Release */,
|
|
|
);
|
|
|
defaultConfigurationIsVisible = 0;
|
|
|
+ defaultConfigurationName = Release;
|
|
|
};
|
|
|
CD0E42741D9B38A9002FFED1 /* Build configuration list for PBXProject "matrix" */ = {
|
|
|
isa = XCConfigurationList;
|