Fixed convertToJSON dependency issues

* Made convertToJSON macOS-only. * Gave convertToJSON a Target Dependency of MDLVoxelAsset. * Changed MDLVoxelAsset scheme's Run Executable to “Ask on Launch” so it doesn't try to use the macOS-only convertToJSON for iOS builds.
capnslipp · Nov 16, 2024 · 36ea677 · 36ea677
1 parent daa42d9
commit 36ea677
Show file tree

Hide file tree

Showing 3 changed files with 79 additions and 14 deletions.
diff --git a/MDLVoxelAsset.xcodeproj/project.pbxproj b/MDLVoxelAsset.xcodeproj/project.pbxproj
@@ -59,6 +59,13 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
+		FA1BA1062CE93C6400E640BC /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = FA2685791CEA9A71003B86C8 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = FAA6CF0729D690A700EECC6C;
+			remoteInfo = MDLVoxelAsset;
+		};
 		FA9CACD71CF17E0200B1ABA4 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = FA2685791CEA9A71003B86C8 /* Project object */;
@@ -504,6 +511,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				FA1BA1072CE93C6400E640BC /* PBXTargetDependency */,
 			);
 			name = convertToJSON;
 			productName = convertToJSON;
@@ -688,6 +696,11 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
+		FA1BA1072CE93C6400E640BC /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = FAA6CF0729D690A700EECC6C /* MDLVoxelAsset */;
+			targetProxy = FA1BA1062CE93C6400E640BC /* PBXContainerItemProxy */;
+		};
 		FA9CACD81CF17E0200B1ABA4 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = FA9694FF1CF1725000DC632A /* VoxViewer (OS X) */;
@@ -1164,10 +1177,12 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CODE_SIGN_IDENTITY = "-";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path";
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
+				SUPPORTED_PLATFORMS = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 			};
 			name = DebugVerbose;
@@ -1180,10 +1195,12 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CODE_SIGN_IDENTITY = "-";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path";
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
+				SUPPORTED_PLATFORMS = macosx;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 			};
 			name = Debug;
@@ -1196,10 +1213,12 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CODE_SIGN_IDENTITY = "-";
+				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path";
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
+				SUPPORTED_PLATFORMS = macosx;
 			};
 			name = Release;
 		};

diff --git a/MDLVoxelAsset.xcodeproj/xcshareddata/xcschemes/MDLVoxelAsset.xcscheme b/MDLVoxelAsset.xcodeproj/xcshareddata/xcschemes/MDLVoxelAsset.xcscheme
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1140"
-   version = "1.3">
+   version = "2.0">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "FA9CACC91CF17E0200B1ABA4"
+               BlueprintIdentifier = "FAA6CF0729D690A700EECC6C"
                BuildableName = "MDLVoxelAsset.framework"
                BlueprintName = "MDLVoxelAsset"
                ReferencedContainer = "container:MDLVoxelAsset.xcodeproj">
@@ -45,21 +45,13 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
+      askForAppToLaunch = "Yes"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "FAF7D45F1E73E1B7007CFA66"
-            BuildableName = "convertToJSON"
-            BlueprintName = "convertToJSON"
-            ReferencedContainer = "container:MDLVoxelAsset.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
+      allowLocationSimulation = "YES"
+      launchAutomaticallySubstyle = "2">
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -70,7 +62,7 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "FA9CACC91CF17E0200B1ABA4"
+            BlueprintIdentifier = "FAA6CF0729D690A700EECC6C"
             BuildableName = "MDLVoxelAsset.framework"
             BlueprintName = "MDLVoxelAsset"
             ReferencedContainer = "container:MDLVoxelAsset.xcodeproj">

diff --git a/MDLVoxelAsset.xcodeproj/xcshareddata/xcschemes/MDLVoxelAssetTests (iOS).xcscheme b/MDLVoxelAsset.xcodeproj/xcshareddata/xcschemes/MDLVoxelAssetTests (iOS).xcscheme
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1610"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "FA26858B1CEA9A71003B86C8"
+               BuildableName = "MDLVoxelAssetTests.xctest"
+               BlueprintName = "MDLVoxelAssetTests (iOS)"
+               ReferencedContainer = "container:MDLVoxelAsset.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>