Parcourir la source

Re-arrange directories.

Sam Jaffe il y a 5 ans
Parent
commit
1022dc1b9b

opaque_typedef.hpp → include/opaque_typedef/opaque_typedef.hpp


+ 7 - 13
opaque_typedef.xcodeproj/project.pbxproj

@@ -7,9 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		CD70490220C48B68007C944C /* opaque_typedef.hpp in Headers */ = {isa = PBXBuildFile; fileRef = CD3C80761D63EE7800ACC795 /* opaque_typedef.hpp */; };
 		CD70491220C48B7C007C944C /* opaque_typedef_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD7048F020C48AE4007C944C /* opaque_typedef_test.cpp */; };
 		CD70491520C48B8C007C944C /* GoogleMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD7048FB20C48B30007C944C /* GoogleMock.framework */; };
+		CDE8546724DF5051006FE7C7 /* opaque_typedef in Resources */ = {isa = PBXBuildFile; fileRef = CDE8546624DF5051006FE7C7 /* opaque_typedef */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -59,11 +59,11 @@
 
 /* Begin PBXFileReference section */
 		CD3C80681D63EE0000ACC795 /* libopaque_typedef.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libopaque_typedef.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
-		CD3C80761D63EE7800ACC795 /* opaque_typedef.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = opaque_typedef.hpp; sourceTree = "<group>"; };
 		CD7048F020C48AE4007C944C /* opaque_typedef_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = opaque_typedef_test.cpp; sourceTree = "<group>"; };
 		CD7048F320C48B30007C944C /* GoogleMock.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = GoogleMock.xcodeproj; path = "../../../gmock-xcode-master/GoogleMock.xcodeproj"; sourceTree = "<group>"; };
 		CD70490720C48B75007C944C /* opaque_typedef_test.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = opaque_typedef_test.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		CD70490B20C48B75007C944C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		CDE8546624DF5051006FE7C7 /* opaque_typedef */ = {isa = PBXFileReference; lastKnownFileType = folder; name = opaque_typedef; path = include/opaque_typedef; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -89,7 +89,7 @@
 			isa = PBXGroup;
 			children = (
 				CD7048F320C48B30007C944C /* GoogleMock.xcodeproj */,
-				CD3C806A1D63EE0000ACC795 /* src */,
+				CDE8546624DF5051006FE7C7 /* opaque_typedef */,
 				CD7048F220C48B19007C944C /* test */,
 				CD70490820C48B75007C944C /* opaque_typedef_test */,
 				CD3C80691D63EE0000ACC795 /* Products */,
@@ -105,20 +105,12 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		CD3C806A1D63EE0000ACC795 /* src */ = {
-			isa = PBXGroup;
-			children = (
-				CD3C80761D63EE7800ACC795 /* opaque_typedef.hpp */,
-			);
-			name = src;
-			sourceTree = "<group>";
-		};
 		CD7048F220C48B19007C944C /* test */ = {
 			isa = PBXGroup;
 			children = (
 				CD7048F020C48AE4007C944C /* opaque_typedef_test.cpp */,
 			);
-			name = test;
+			path = test;
 			sourceTree = "<group>";
 		};
 		CD7048F420C48B30007C944C /* Products */ = {
@@ -147,7 +139,6 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				CD70490220C48B68007C944C /* opaque_typedef.hpp in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -268,6 +259,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				CDE8546724DF5051006FE7C7 /* opaque_typedef in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -357,6 +349,7 @@
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
+				USER_HEADER_SEARCH_PATHS = include/;
 			};
 			name = Debug;
 		};
@@ -405,6 +398,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
+				USER_HEADER_SEARCH_PATHS = include/;
 			};
 			name = Release;
 		};

+ 1 - 1
opaque_typedef_test.cpp

@@ -8,7 +8,7 @@
 #include <gmock/gmock.h>
 #include <cmath>
 
-#include "opaque_typedef.hpp"
+#include "opaque_typedef/opaque_typedef.hpp"
 
 struct degree;
 struct radian;