Skip to content

Commit bd6c887

Browse files
author
kyngchaos
committedMay 29, 2010
fix moc compile rule
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13597 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
final-1_7_1final-1_7_0
1 parent 8985c51 commit bd6c887

File tree

2 files changed

+42
-41
lines changed

2 files changed

+42
-41
lines changed
 

‎mac/xcode/Qgis.xcodeproj/project.pbxproj

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1688,7 +1688,7 @@
16881688
outputFiles = (
16891689
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
16901690
);
1691-
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
1691+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
16921692
};
16931693
721598151052B46D003D1610 /* PBXBuildRule */ = {
16941694
isa = PBXBuildRule;
@@ -1699,7 +1699,7 @@
16991699
outputFiles = (
17001700
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
17011701
);
1702-
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
1702+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
17031703
};
17041704
721828C110BA34E2008D715D /* PBXBuildRule */ = {
17051705
isa = PBXBuildRule;
@@ -1732,7 +1732,7 @@
17321732
outputFiles = (
17331733
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
17341734
);
1735-
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
1735+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
17361736
};
17371737
7225EF1D10B2265A00D23EA2 /* PBXBuildRule */ = {
17381738
isa = PBXBuildRule;
@@ -1754,7 +1754,7 @@
17541754
outputFiles = (
17551755
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
17561756
);
1757-
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
1757+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
17581758
};
17591759
7262ED980F7A770300498385 /* PBXBuildRule */ = {
17601760
isa = PBXBuildRule;
@@ -1765,7 +1765,7 @@
17651765
outputFiles = (
17661766
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
17671767
);
1768-
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
1768+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
17691769
};
17701770
7268C052118294F2001BC9C4 /* PBXBuildRule */ = {
17711771
isa = PBXBuildRule;
@@ -1787,7 +1787,7 @@
17871787
outputFiles = (
17881788
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
17891789
);
1790-
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
1790+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
17911791
};
17921792
7268E80811021E6B00B96374 /* PBXBuildRule */ = {
17931793
isa = PBXBuildRule;
@@ -1849,7 +1849,7 @@
18491849
outputFiles = (
18501850
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
18511851
);
1852-
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
1852+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
18531853
};
18541854
729286ED0F71BCE6006D9489 /* PBXBuildRule */ = {
18551855
isa = PBXBuildRule;
@@ -1883,7 +1883,7 @@
18831883
outputFiles = (
18841884
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
18851885
);
1886-
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
1886+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
18871887
};
18881888
729287920F71D0E6006D9489 /* PBXBuildRule */ = {
18891889
isa = PBXBuildRule;
@@ -1894,7 +1894,7 @@
18941894
outputFiles = (
18951895
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
18961896
);
1897-
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
1897+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
18981898
};
18991899
729287B50F71DE07006D9489 /* PBXBuildRule */ = {
19001900
isa = PBXBuildRule;
@@ -1905,7 +1905,7 @@
19051905
outputFiles = (
19061906
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
19071907
);
1908-
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
1908+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
19091909
};
19101910
729287B60F71DE33006D9489 /* PBXBuildRule */ = {
19111911
isa = PBXBuildRule;
@@ -1916,7 +1916,7 @@
19161916
outputFiles = (
19171917
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
19181918
);
1919-
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
1919+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
19201920
};
19211921
729287B70F71DE53006D9489 /* PBXBuildRule */ = {
19221922
isa = PBXBuildRule;
@@ -1927,7 +1927,7 @@
19271927
outputFiles = (
19281928
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
19291929
);
1930-
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
1930+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
19311931
};
19321932
729287BB0F71DE84006D9489 /* PBXBuildRule */ = {
19331933
isa = PBXBuildRule;
@@ -1938,7 +1938,7 @@
19381938
outputFiles = (
19391939
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
19401940
);
1941-
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
1941+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
19421942
};
19431943
729287C00F71DF16006D9489 /* PBXBuildRule */ = {
19441944
isa = PBXBuildRule;
@@ -1949,7 +1949,7 @@
19491949
outputFiles = (
19501950
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
19511951
);
1952-
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
1952+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
19531953
};
19541954
729287C20F71DF60006D9489 /* PBXBuildRule */ = {
19551955
isa = PBXBuildRule;
@@ -1960,7 +1960,7 @@
19601960
outputFiles = (
19611961
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
19621962
);
1963-
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
1963+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
19641964
};
19651965
729287C40F71DF90006D9489 /* PBXBuildRule */ = {
19661966
isa = PBXBuildRule;
@@ -1971,7 +1971,7 @@
19711971
outputFiles = (
19721972
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
19731973
);
1974-
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
1974+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
19751975
};
19761976
729287C90F71DFE4006D9489 /* PBXBuildRule */ = {
19771977
isa = PBXBuildRule;
@@ -1982,7 +1982,7 @@
19821982
outputFiles = (
19831983
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
19841984
);
1985-
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
1985+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
19861986
};
19871987
729287D70F71E2C9006D9489 /* PBXBuildRule */ = {
19881988
isa = PBXBuildRule;
@@ -1993,7 +1993,7 @@
19931993
outputFiles = (
19941994
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
19951995
);
1996-
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
1996+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
19971997
};
19981998
729287D80F71E2E1006D9489 /* PBXBuildRule */ = {
19991999
isa = PBXBuildRule;
@@ -2015,7 +2015,7 @@
20152015
outputFiles = (
20162016
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
20172017
);
2018-
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
2018+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
20192019
};
20202020
729287DC0F71E3D8006D9489 /* PBXBuildRule */ = {
20212021
isa = PBXBuildRule;
@@ -2037,7 +2037,7 @@
20372037
outputFiles = (
20382038
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
20392039
);
2040-
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
2040+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
20412041
};
20422042
729287F30F71E8A2006D9489 /* PBXBuildRule */ = {
20432043
isa = PBXBuildRule;
@@ -2059,7 +2059,7 @@
20592059
outputFiles = (
20602060
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
20612061
);
2062-
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
2062+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
20632063
};
20642064
729287FA0F71EA9A006D9489 /* PBXBuildRule */ = {
20652065
isa = PBXBuildRule;
@@ -2081,7 +2081,7 @@
20812081
outputFiles = (
20822082
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
20832083
);
2084-
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
2084+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
20852085
};
20862086
729288030F71EBB6006D9489 /* PBXBuildRule */ = {
20872087
isa = PBXBuildRule;
@@ -2103,7 +2103,7 @@
21032103
outputFiles = (
21042104
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
21052105
);
2106-
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
2106+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
21072107
};
21082108
7292880E0F71ECEE006D9489 /* PBXBuildRule */ = {
21092109
isa = PBXBuildRule;
@@ -2125,7 +2125,7 @@
21252125
outputFiles = (
21262126
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
21272127
);
2128-
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
2128+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
21292129
};
21302130
729288150F71EDAD006D9489 /* PBXBuildRule */ = {
21312131
isa = PBXBuildRule;
@@ -2147,7 +2147,7 @@
21472147
outputFiles = (
21482148
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
21492149
);
2150-
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
2150+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
21512151
};
21522152
729288250F71F0E6006D9489 /* PBXBuildRule */ = {
21532153
isa = PBXBuildRule;
@@ -2169,7 +2169,7 @@
21692169
outputFiles = (
21702170
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
21712171
);
2172-
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
2172+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
21732173
};
21742174
7292882E0F71F26F006D9489 /* PBXBuildRule */ = {
21752175
isa = PBXBuildRule;
@@ -2191,7 +2191,7 @@
21912191
outputFiles = (
21922192
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
21932193
);
2194-
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
2194+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
21952195
};
21962196
7292883B0F71F3F2006D9489 /* PBXBuildRule */ = {
21972197
isa = PBXBuildRule;
@@ -2213,7 +2213,7 @@
22132213
outputFiles = (
22142214
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
22152215
);
2216-
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
2216+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
22172217
};
22182218
729288440F71F4F0006D9489 /* PBXBuildRule */ = {
22192219
isa = PBXBuildRule;
@@ -2235,7 +2235,7 @@
22352235
outputFiles = (
22362236
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
22372237
);
2238-
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
2238+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
22392239
};
22402240
729288570F71F618006D9489 /* PBXBuildRule */ = {
22412241
isa = PBXBuildRule;
@@ -2257,7 +2257,7 @@
22572257
outputFiles = (
22582258
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
22592259
);
2260-
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
2260+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
22612261
};
22622262
7292885E0F71F6A6006D9489 /* PBXBuildRule */ = {
22632263
isa = PBXBuildRule;
@@ -2279,7 +2279,7 @@
22792279
outputFiles = (
22802280
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
22812281
);
2282-
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
2282+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
22832283
};
22842284
729288660F71F736006D9489 /* PBXBuildRule */ = {
22852285
isa = PBXBuildRule;
@@ -2301,7 +2301,7 @@
23012301
outputFiles = (
23022302
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
23032303
);
2304-
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
2304+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
23052305
};
23062306
7292886D0F71F7B5006D9489 /* PBXBuildRule */ = {
23072307
isa = PBXBuildRule;
@@ -2323,7 +2323,7 @@
23232323
outputFiles = (
23242324
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
23252325
);
2326-
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
2326+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
23272327
};
23282328
729288790F71FC3F006D9489 /* PBXBuildRule */ = {
23292329
isa = PBXBuildRule;
@@ -2334,7 +2334,7 @@
23342334
outputFiles = (
23352335
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
23362336
);
2337-
script = "$QTMOC -nw $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
2337+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
23382338
};
23392339
72B236B211570743007B4803 /* PBXBuildRule */ = {
23402340
isa = PBXBuildRule;
@@ -2356,7 +2356,7 @@
23562356
outputFiles = (
23572357
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
23582358
);
2359-
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
2359+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
23602360
};
23612361
72DB68DF1021D08400ED5F3A /* PBXBuildRule */ = {
23622362
isa = PBXBuildRule;
@@ -2367,7 +2367,7 @@
23672367
outputFiles = (
23682368
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
23692369
);
2370-
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
2370+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
23712371
};
23722372
72F70B2C11849076001369AD /* PBXBuildRule */ = {
23732373
isa = PBXBuildRule;
@@ -2378,7 +2378,7 @@
23782378
outputFiles = (
23792379
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
23802380
);
2381-
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
2381+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
23822382
};
23832383
72FB0B500FFD680F0052360B /* PBXBuildRule */ = {
23842384
isa = PBXBuildRule;
@@ -2400,7 +2400,7 @@
24002400
outputFiles = (
24012401
"$(DERIVED_FILES_DIR)/moc_$(INPUT_FILE_BASE).cpp",
24022402
);
2403-
script = "$QTMOC $QT_CXXFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
2403+
script = "$QTMOC -I$QGIS_HEADER_SEARCH_BASE $OTHER_CFLAGS -o \"$DERIVED_FILES_DIR/moc_$INPUT_FILE_BASE.cpp\" \"$INPUT_FILE_PATH\"";
24042404
};
24052405
/* End PBXBuildRule section */
24062406

@@ -3653,7 +3653,7 @@
36533653
7209E5E90F39E57A003DC336 /* qgis.ico */ = {isa = PBXFileReference; lastKnownFileType = image.ico; name = qgis.ico; path = ../../src/app/qgis.ico; sourceTree = SOURCE_ROOT; };
36543654
7209E5EA0F39E57A003DC336 /* qgis_win32.rc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgis_win32.rc; path = ../../src/app/qgis_win32.rc; sourceTree = SOURCE_ROOT; };
36553655
7209E5EB0F39E57A003DC336 /* qgisapp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgisapp.cpp; path = ../../src/app/qgisapp.cpp; sourceTree = SOURCE_ROOT; };
3656-
7209E5EC0F39E57A003DC336 /* qgisapp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgisapp.h; path = ../../src/app/qgisapp.h; sourceTree = SOURCE_ROOT; };
3656+
7209E5EC0F39E57A003DC336 /* qgisapp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgisapp.h; path = ../../src/app/qgisapp.h; sourceTree = SOURCE_ROOT; wrapsLines = 1; };
36573657
7209E5ED0F39E57A003DC336 /* qgisappinterface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgisappinterface.cpp; path = ../../src/app/qgisappinterface.cpp; sourceTree = SOURCE_ROOT; };
36583658
7209E5EE0F39E57A003DC336 /* qgisappinterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgisappinterface.h; path = ../../src/app/qgisappinterface.h; sourceTree = SOURCE_ROOT; };
36593659
7209E5EF0F39E57A003DC336 /* qgsabout.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsabout.cpp; path = ../../src/app/qgsabout.cpp; sourceTree = SOURCE_ROOT; };
@@ -19987,7 +19987,7 @@
1998719987
buildSettings = {
1998819988
COPY_PHASE_STRIP = YES;
1998919989
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
19990-
QGIS_VERSION_BUILD = 13566;
19990+
QGIS_VERSION_BUILD = 13595;
1999119991
STRIP_INSTALLED_PRODUCT = YES;
1999219992
};
1999319993
name = Release;

‎mac/xcode/qgis_settings.xcconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,8 @@ QGIS_FW_SUBDIR = ../Frameworks
181181
QGIS_LIB_SUBDIR = lib // qgispython lib MUST be in MacOS/lib
182182
QGIS_DATA_SUBDIR = ../Resources
183183
QGIS_PLUGIN_SUBDIR = ../PlugIns/qgis
184-
HEADER_SEARCH_PATHS = $(SYMROOT)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/include
184+
QGIS_HEADER_SEARCH_BASE = $(SYMROOT)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/include
185+
HEADER_SEARCH_PATHS = $(QGIS_HEADER_SEARCH_BASE)
185186
ALWAYS_SEARCH_USER_PATHS = NO
186187
USE_HEADERMAP = NO // else headers with same name cause confusion
187188

0 commit comments

Comments
 (0)
Please sign in to comment.