Fixed CI build settings.

erikdoe · Oct 26, 2021 · 939039f · 939039f
1 parent d1bf6fb
commit 939039f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -28,7 +28,7 @@ ci: ci-macos ci-ios ci-swiftpm
 
 ci-macos:
 	@echo "Building macOS framework and running tests..."
-	$(XCODECI) -scheme OCMock -destination 'generic/platform=macOS test | xcpretty -c
+	$(XCODECI) -scheme OCMock -destination 'platform=macOS' test | xcpretty -c
 
 ci-ios:
 	@echo "Building iOS library and running tests..."

diff --git a/Source/OCMock.xcodeproj/project.pbxproj b/Source/OCMock.xcodeproj/project.pbxproj
@@ -1862,10 +1862,7 @@
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Carthage/Build/Mac",
-				);
+				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "OCMockTests/OCMockTests-Prefix.pch";
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
@@ -1887,10 +1884,7 @@
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/Carthage/Build/Mac",
-				);
+				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "OCMockTests/OCMockTests-Prefix.pch";
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;

diff --git a/Source/OCMockCI.xcconfig b/Source/OCMockCI.xcconfig
@@ -4,5 +4,5 @@
 // If you change these here you must also update the makefile
 // Note that OBJROOT is not defined in terms of SYMROOT. For some
 // reason that doesn't work; PIFcache files get misplaced.
-SYMROOT = $(PROJECT_DIR)/../Build
-OBJROOT = $(PROJECT_DIR)/../Build/Intermediaries
+//SYMROOT = $(PROJECT_DIR)/../Build
+//OBJROOT = $(PROJECT_DIR)/../Build/Intermediaries