Pārlūkot izejas kodu

chore: fix includes, flags

Sam Jaffe 1 gadu atpakaļ
vecāks
revīzija
232f64be05
2 mainītis faili ar 208 papildinājumiem un 5 dzēšanām
  1. 3 3
      include/math/vector/vector.hpp
  2. 205 2
      vector.xcodeproj/project.pbxproj

+ 3 - 3
include/math/vector/vector.hpp

@@ -16,10 +16,10 @@
 #include <stdexcept>
 #include <type_traits>
 
-#include "expect/expect.hpp"
+#include <expect/expect.hpp>
 
-#include "forward.h"
-#include "traits.hpp"
+#include "math/vector/forward.h"
+#include "math/vector/traits.hpp"
 
 #define VECTOR_ENABLE_IF_LT_N(index, expr)                                     \
   template <bool _ = true>                                                     \

+ 205 - 2
vector.xcodeproj/project.pbxproj

@@ -41,6 +41,27 @@
 			remoteGlobalIDString = 05818F901A685AEA0072A469;
 			remoteInfo = GoogleMockTests;
 		};
+		CDAE625F2B77B93600551FB8 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CDAE62592B77B93600551FB8 /* expect.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = CDD476BD29C5423B00BDB829;
+			remoteInfo = expect;
+		};
+		CDAE62612B77B93600551FB8 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CDAE62592B77B93600551FB8 /* expect.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = CDEC1E8A235248390091D9F2;
+			remoteInfo = "expect-test";
+		};
+		CDAE62632B77B94100551FB8 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = CDAE62592B77B93600551FB8 /* expect.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = CDD476BC29C5423B00BDB829;
+			remoteInfo = expect;
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
@@ -49,6 +70,8 @@
 		CD10425824E837FB00C0DF2A /* vector-test.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "vector-test.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		CD10425C24E837FB00C0DF2A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		CD10426824E8701100C0DF2A /* math */ = {isa = PBXFileReference; lastKnownFileType = folder; name = math; path = include/math; sourceTree = "<group>"; };
+		CDAE62452B77B8A800551FB8 /* libvector.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libvector.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		CDAE62592B77B93600551FB8 /* expect.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = expect.xcodeproj; path = ../expect/expect.xcodeproj; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -60,12 +83,20 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		CDAE62432B77B8A800551FB8 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
 		0E5DFDD01BB4D3360063976E = {
 			isa = PBXGroup;
 			children = (
+				CDAE62592B77B93600551FB8 /* expect.xcodeproj */,
 				CD0C597A20C31CC300454F82 /* GoogleMock.xcodeproj */,
 				CD10426824E8701100C0DF2A /* math */,
 				CD10423524E836A700C0DF2A /* test */,
@@ -79,6 +110,7 @@
 			isa = PBXGroup;
 			children = (
 				CD10425824E837FB00C0DF2A /* vector-test.xctest */,
+				CDAE62452B77B8A800551FB8 /* libvector.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -117,8 +149,27 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		CDAE625A2B77B93600551FB8 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				CDAE62602B77B93600551FB8 /* libexpect.a */,
+				CDAE62622B77B93600551FB8 /* expect-test.xctest */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
+/* Begin PBXHeadersBuildPhase section */
+		CDAE62412B77B8A800551FB8 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
 /* Begin PBXNativeTarget section */
 		CD10425724E837FB00C0DF2A /* vector-test */ = {
 			isa = PBXNativeTarget;
@@ -137,6 +188,25 @@
 			productReference = CD10425824E837FB00C0DF2A /* vector-test.xctest */;
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
+		CDAE62442B77B8A800551FB8 /* vector */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = CDAE624C2B77B8A800551FB8 /* Build configuration list for PBXNativeTarget "vector" */;
+			buildPhases = (
+				CDAE62412B77B8A800551FB8 /* Headers */,
+				CDAE62422B77B8A800551FB8 /* Sources */,
+				CDAE62432B77B8A800551FB8 /* Frameworks */,
+				CDAE624D2B77B8BB00551FB8 /* ShellScript */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				CDAE62642B77B94100551FB8 /* PBXTargetDependency */,
+			);
+			name = vector;
+			productName = vector;
+			productReference = CDAE62452B77B8A800551FB8 /* libvector.a */;
+			productType = "com.apple.product-type.library.static";
+		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
@@ -149,6 +219,10 @@
 						CreatedOnToolsVersion = 11.3.1;
 						ProvisioningStyle = Automatic;
 					};
+					CDAE62442B77B8A800551FB8 = {
+						CreatedOnToolsVersion = 13.4.1;
+						ProvisioningStyle = Automatic;
+					};
 				};
 			};
 			buildConfigurationList = 0E5DFDD41BB4D3360063976E /* Build configuration list for PBXProject "vector" */;
@@ -163,6 +237,10 @@
 			productRefGroup = 0E5DFDF41BB4D5040063976E /* Products */;
 			projectDirPath = "";
 			projectReferences = (
+				{
+					ProductGroup = CDAE625A2B77B93600551FB8 /* Products */;
+					ProjectRef = CDAE62592B77B93600551FB8 /* expect.xcodeproj */;
+				},
 				{
 					ProductGroup = CD0C597B20C31CC300454F82 /* Products */;
 					ProjectRef = CD0C597A20C31CC300454F82 /* GoogleMock.xcodeproj */;
@@ -171,6 +249,7 @@
 			projectRoot = "";
 			targets = (
 				CD10425724E837FB00C0DF2A /* vector-test */,
+				CDAE62442B77B8A800551FB8 /* vector */,
 			);
 		};
 /* End PBXProject section */
@@ -204,6 +283,20 @@
 			remoteRef = CD0C598720C31CC300454F82 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		CDAE62602B77B93600551FB8 /* libexpect.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libexpect.a;
+			remoteRef = CDAE625F2B77B93600551FB8 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		CDAE62622B77B93600551FB8 /* expect-test.xctest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = "expect-test.xctest";
+			remoteRef = CDAE62612B77B93600551FB8 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 /* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */
@@ -217,6 +310,26 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		CDAE624D2B77B8BB00551FB8 /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "mkdir -p ${BUILT_PRODUCTS_DIR}/usr/local/include/\ncp -r ${PROJECT_DIR}/include/* ${BUILT_PRODUCTS_DIR}/usr/local/include/\n";
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		CD10425424E837FB00C0DF2A /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -226,8 +339,23 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		CDAE62422B77B8A800551FB8 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXSourcesBuildPhase section */
 
+/* Begin PBXTargetDependency section */
+		CDAE62642B77B94100551FB8 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = expect;
+			targetProxy = CDAE62632B77B94100551FB8 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
 /* Begin XCBuildConfiguration section */
 		0E5DFDD21BB4D3360063976E /* Debug */ = {
 			isa = XCBuildConfiguration;
@@ -261,9 +389,10 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = "$(TARGET_BUILD_DIR)/usr/local/include";
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
-				USER_HEADER_SEARCH_PATHS = "include/ extern/expect/include/";
+				USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/include";
 				WARNING_CFLAGS = "-Wno-gnu-zero-variadic-macro-arguments";
 			};
 			name = Debug;
@@ -299,8 +428,9 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = "$(TARGET_BUILD_DIR)/usr/local/include";
 				SDKROOT = macosx;
-				USER_HEADER_SEARCH_PATHS = "include/ extern/expect/include/";
+				USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/include";
 				WARNING_CFLAGS = "-Wno-gnu-zero-variadic-macro-arguments";
 			};
 			name = Release;
@@ -375,6 +505,70 @@
 			};
 			name = Release;
 		};
+		CDAE62462B77B8A800551FB8 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_STYLE = Automatic;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				EXECUTABLE_PREFIX = lib;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				MACOSX_DEPLOYMENT_TARGET = 12.3;
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+				MTL_FAST_MATH = YES;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+			};
+			name = Debug;
+		};
+		CDAE62472B77B8A800551FB8 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CODE_SIGN_STYLE = Automatic;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				EXECUTABLE_PREFIX = lib;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				MACOSX_DEPLOYMENT_TARGET = 12.3;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				MTL_FAST_MATH = YES;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+			};
+			name = Release;
+		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
@@ -396,6 +590,15 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		CDAE624C2B77B8A800551FB8 /* Build configuration list for PBXNativeTarget "vector" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				CDAE62462B77B8A800551FB8 /* Debug */,
+				CDAE62472B77B8A800551FB8 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 /* End XCConfigurationList section */
 	};
 	rootObject = 0E5DFDD11BB4D3360063976E /* Project object */;