Skip to content

Commit c9f7a62

Browse files
authored
Merge pull request swiftlang#192 from ddunbar/rdar35299761
[Xcode] Add GTEST_NO_LLVM_RAW_OSTREAM declarations for Xcode project.
2 parents c9249a7 + 4a54f51 commit c9f7a62

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

llbuild.xcodeproj/project.pbxproj

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3188,6 +3188,7 @@
31883188
GCC_PREPROCESSOR_DEFINITIONS = (
31893189
"$(inherited)",
31903190
"GTEST_HAS_RTTI=0",
3191+
"GTEST_NO_LLVM_RAW_OSTREAM=1",
31913192
);
31923193
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/utils/unittest/googletest/include";
31933194
};
@@ -3199,6 +3200,7 @@
31993200
GCC_PREPROCESSOR_DEFINITIONS = (
32003201
NDEBUG,
32013202
"GTEST_HAS_RTTI=0",
3203+
"GTEST_NO_LLVM_RAW_OSTREAM=1",
32023204
);
32033205
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/utils/unittest/googletest/include";
32043206
};
@@ -3244,6 +3246,7 @@
32443246
GCC_PREPROCESSOR_DEFINITIONS = (
32453247
"$(inherited)",
32463248
"GTEST_HAS_RTTI=0",
3249+
"GTEST_NO_LLVM_RAW_OSTREAM=1",
32473250
);
32483251
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/utils/unittest/googletest/include";
32493252
};
@@ -3255,6 +3258,7 @@
32553258
GCC_PREPROCESSOR_DEFINITIONS = (
32563259
"$(inherited)",
32573260
"GTEST_HAS_RTTI=0",
3261+
"GTEST_NO_LLVM_RAW_OSTREAM=1",
32583262
);
32593263
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/utils/unittest/googletest/include";
32603264
};
@@ -3519,6 +3523,7 @@
35193523
GCC_PREPROCESSOR_DEFINITIONS = (
35203524
"$(inherited)",
35213525
"GTEST_HAS_RTTI=0",
3526+
"GTEST_NO_LLVM_RAW_OSTREAM=1",
35223527
);
35233528
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/utils/unittest/googletest/include $(SRCROOT)/utils/unittest/googletest";
35243529
};
@@ -3530,6 +3535,7 @@
35303535
GCC_PREPROCESSOR_DEFINITIONS = (
35313536
"$(inherited)",
35323537
"GTEST_HAS_RTTI=0",
3538+
"GTEST_NO_LLVM_RAW_OSTREAM=1",
35333539
);
35343540
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/utils/unittest/googletest/include $(SRCROOT)/utils/unittest/googletest";
35353541
};
@@ -3541,6 +3547,7 @@
35413547
GCC_PREPROCESSOR_DEFINITIONS = (
35423548
"$(inherited)",
35433549
"GTEST_HAS_RTTI=0",
3550+
"GTEST_NO_LLVM_RAW_OSTREAM=1",
35443551
);
35453552
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/utils/unittest/googletest/include";
35463553
};
@@ -3552,6 +3559,7 @@
35523559
GCC_PREPROCESSOR_DEFINITIONS = (
35533560
"$(inherited)",
35543561
"GTEST_HAS_RTTI=0",
3562+
"GTEST_NO_LLVM_RAW_OSTREAM=1",
35553563
);
35563564
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/utils/unittest/googletest/include";
35573565
};
@@ -3563,6 +3571,7 @@
35633571
GCC_PREPROCESSOR_DEFINITIONS = (
35643572
"$(inherited)",
35653573
"GTEST_HAS_RTTI=0",
3574+
"GTEST_NO_LLVM_RAW_OSTREAM=1",
35663575
);
35673576
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/utils/unittest/googletest/include";
35683577
};
@@ -3574,6 +3583,7 @@
35743583
GCC_PREPROCESSOR_DEFINITIONS = (
35753584
"$(inherited)",
35763585
"GTEST_HAS_RTTI=0",
3586+
"GTEST_NO_LLVM_RAW_OSTREAM=1",
35773587
);
35783588
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/utils/unittest/googletest/include";
35793589
};
@@ -3585,6 +3595,7 @@
35853595
GCC_PREPROCESSOR_DEFINITIONS = (
35863596
"$(inherited)",
35873597
"GTEST_HAS_RTTI=0",
3598+
"GTEST_NO_LLVM_RAW_OSTREAM=1",
35883599
);
35893600
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/utils/unittest/googletest/include";
35903601
};
@@ -3596,6 +3607,7 @@
35963607
GCC_PREPROCESSOR_DEFINITIONS = (
35973608
"$(inherited)",
35983609
"GTEST_HAS_RTTI=0",
3610+
"GTEST_NO_LLVM_RAW_OSTREAM=1",
35993611
);
36003612
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/utils/unittest/googletest/include";
36013613
};

0 commit comments

Comments
 (0)