Skip to content

Commit a80eecd

Browse files
author
kyngchaos
committedJun 27, 2010
separate libexec subdir (r13792);
set SVN version dynamically in Info.plist git-svn-id: http://svn.osgeo.org/qgis/trunk@13814 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 1c56cb2 commit a80eecd

File tree

3 files changed

+38
-10
lines changed

3 files changed

+38
-10
lines changed
 

‎mac/xcode/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<key>CFBundleIdentifier</key>
1212
<string>org.qgis.qgis</string>
1313
<key>CFBundleGetInfoString</key>
14-
<string>QGIS ${QGIS_VERSION_MAJOR}.${QGIS_VERSION_MINOR}.${QGIS_VERSION_PATCH}-${QGIS_RELEASE_NAME} (${QGIS_VERSION_BUILD}), © 2002-2010 QGIS Development Team</string>
14+
<string>QGIS ${QGIS_VERSION_MAJOR}.${QGIS_VERSION_MINOR}.${QGIS_VERSION_PATCH}-${QGIS_RELEASE_NAME} (@QGIS_VERSION_BUILD@), © 2002-2010 QGIS Development Team</string>
1515
<key>CFBundleShortVersionString</key>
1616
<string>${QGIS_VERSION_MAJOR}.${QGIS_VERSION_MINOR}.${QGIS_VERSION_PATCH}</string>
1717
<key>CFBundleInfoDictionaryVersion</key>

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

Lines changed: 36 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@
9595
7256F1B70F411C4B0022BE1F /* PBXTargetDependency */,
9696
7256F1BB0F411C4B0022BE1F /* PBXTargetDependency */,
9797
7256F1B50F411C4B0022BE1F /* PBXTargetDependency */,
98+
72F3DAB711D70A6F00FFA738 /* PBXTargetDependency */,
9899
7256F1BD0F411C4B0022BE1F /* PBXTargetDependency */,
99100
7256F1B90F411C4B0022BE1F /* PBXTargetDependency */,
100101
);
@@ -2922,6 +2923,13 @@
29222923
remoteGlobalIDString = 72A07D880F3BDF9C004FC2A4;
29232924
remoteInfo = postgresprovider;
29242925
};
2926+
72F3DAB611D70A6F00FFA738 /* PBXContainerItemProxy */ = {
2927+
isa = PBXContainerItemProxy;
2928+
containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
2929+
proxyType = 1;
2930+
remoteGlobalIDString = 72463E3E1122FEF200BE5F17 /* qgis.g.browser */;
2931+
remoteInfo = qgis.g.browser;
2932+
};
29252933
72FB0B6C0FFD6B8F0052360B /* PBXContainerItemProxy */ = {
29262934
isa = PBXContainerItemProxy;
29272935
containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
@@ -14841,6 +14849,7 @@
1484114849
8D0C4E8C0486CD37000505A6 /* Resources */,
1484214850
8D0C4E8F0486CD37000505A6 /* Sources */,
1484314851
8D0C4E910486CD37000505A6 /* Frameworks */,
14852+
72F3DABA11D70D4900FFA738 /* Script - svnver plist */,
1484414853
72EBCB3F0F49E8430016BA3C /* Copy - doc */,
1484514854
7256F2D60F4146A70022BE1F /* Copy - doc-images */,
1484614855
7256F3180F4149300022BE1F /* Copy - images-icons */,
@@ -15008,7 +15017,7 @@
1500815017
);
1500915018
runOnlyForDeploymentPostprocessing = 0;
1501015019
shellPath = /bin/sh;
15011-
shellScript = "mkdir -p \"$CONFIGURATION_BUILD_DIR/include\"\n\n# check if the files are generated, clean if need to regenerate\n\nif [ ! -f \"$CONFIGURATION_BUILD_DIR/include/qgsconfig.h\" ] || [ ../../cmake_templates/qgsconfig.h.in -nt \"$CONFIGURATION_BUILD_DIR/include/qgsconfig.h\" ] ; then\necho \"Generating qgsconfig.h...\"\nsed -e \"s,\\${CPACK_PACKAGE_VERSION_MAJOR},$QGIS_VERSION_MAJOR,g\" \\\n\t-e \"s,\\${CPACK_PACKAGE_VERSION_MINOR},$QGIS_VERSION_MINOR,g\" \\\n\t-e \"s,\\${CPACK_PACKAGE_VERSION_PATCH},$QGIS_VERSION_PATCH,g\" \\\n\t-e \"s,\\${RELEASE_NAME},$QGIS_RELEASE_NAME,g\" \\\n\t-e \"s,\\${QGIS_VERSION_INT},$QGIS_VERSION_INT,g\" \\\n\t-e \"s,\\${QGIS_PLUGIN_SUBDIR},$QGIS_PLUGIN_SUBDIR,g\" \\\n\t-e \"s,\\${QGIS_DATA_SUBDIR},$QGIS_DATA_SUBDIR,g\" \\\n\t-e \"s,#cmakedefine,#define,g\" \\\n\t../../cmake_templates/qgsconfig.h.in > \"$CONFIGURATION_BUILD_DIR/include/qgsconfig.h\"\nfi\n\nif [ ! -f \"$CONFIGURATION_BUILD_DIR/include/qgssvnversion.h\" ] ; then\necho \"Generating qgssvnversion.h...\"\nsvnv=`which svnversion`\nif [ \"$svnv\" ] ; then\n\tsvnver=`svnversion $SRCROOT`\nelse\n\tsvnver=\"unknown\"\nfi\necho \"#define QGSSVNVERSION \\\"$svnver\\\"\" > \"$CONFIGURATION_BUILD_DIR/include/qgssvnversion.h\"\nfi\n\nexit 0";
15020+
shellScript = "mkdir -p \"$CONFIGURATION_BUILD_DIR/include\"\n\n# check if the files are generated, clean if need to regenerate\n\nif [ ! -f \"$CONFIGURATION_BUILD_DIR/include/qgsconfig.h\" ] || [ ../../cmake_templates/qgsconfig.h.in -nt \"$CONFIGURATION_BUILD_DIR/include/qgsconfig.h\" ] ; then\necho \"Generating qgsconfig.h...\"\nsed -e \"s,\\${CPACK_PACKAGE_VERSION_MAJOR},$QGIS_VERSION_MAJOR,g\" \\\n\t-e \"s,\\${CPACK_PACKAGE_VERSION_MINOR},$QGIS_VERSION_MINOR,g\" \\\n\t-e \"s,\\${CPACK_PACKAGE_VERSION_PATCH},$QGIS_VERSION_PATCH,g\" \\\n\t-e \"s,\\${RELEASE_NAME},$QGIS_RELEASE_NAME,g\" \\\n\t-e \"s,\\${QGIS_VERSION_INT},$QGIS_VERSION_INT,g\" \\\n\t-e \"s,\\${QGIS_PLUGIN_SUBDIR},$QGIS_PLUGIN_SUBDIR,g\" \\\n\t-e \"s,\\${QGIS_DATA_SUBDIR},$QGIS_DATA_SUBDIR,g\" \\\n\t-e \"s,\\${QGIS_LIBEXEC_SUBDIR},$QGIS_LIBEXEC_SUBDIR,g\" \\\n\t-e \"s,#cmakedefine,#define,g\" \\\n\t../../cmake_templates/qgsconfig.h.in > \"$CONFIGURATION_BUILD_DIR/include/qgsconfig.h\"\nfi\n\nif [ ! -f \"$CONFIGURATION_BUILD_DIR/include/qgssvnversion.h\" ] ; then\necho \"Generating qgssvnversion.h...\"\nsvnv=`which svnversion`\nif [ \"$svnv\" ] ; then\n\tsvnver=`svnversion $SRCROOT`\nelse\n\tsvnver=\"unknown\"\nfi\necho \"#define QGSSVNVERSION \\\"$svnver\\\"\" > \"$CONFIGURATION_BUILD_DIR/include/qgssvnversion.h\"\nfi\n\nexit 0";
1501215021
showEnvVarsInLog = 0;
1501315022
};
1501415023
7223B7830F96A96500D905B4 /* Script - ui */ = {
@@ -15506,6 +15515,21 @@
1550615515
shellScript = "# Note: assumes default Qt binary framework install\n\nAPPDIRC=\"$QGIS_BUILD_PATH\" # app contents\nAPPDIR=\"$APPDIRC/MacOS\"\nFWDIR=\"$APPDIR/$QGIS_FW_SUBDIR\"\nLIBDIR=\"$APPDIR/$QGIS_LIB_SUBDIR\"\nQGISPYDIR=\"$APPDIR/$QGIS_DATA_SUBDIR/python\"\n\n# qt arches\nQARCHS=\"\"\nfor a in $ARCHS\ndo\n\tQARCHS=\"$QARCHS -arch $a\"\ndone\n\n# copy Qt frameworks\necho \"Copying Qt frameworks...\"\nmkdir -p \"$FWDIR\"\nfor q in $QTLISTQG\ndo\n\tif [ ! -d \"$FWDIR/$q.framework\" ] && [ -d \"$QT_PREFIX_FW/$q.framework\" ] ; then\n\t\t# reconstruct framework to avoid excessive copying, then deleting\n\t\t# especially when debug variants are present\n\t\tmkdir -p \"$FWDIR/$q.framework/Versions/$QT_FWVER\"\n\t\tln -sfh $QT_FWVER \"$FWDIR/$q.framework/Versions/Current\"\n\t\tditto -X $QARCHS \"$QT_PREFIX_FW/$q.framework/$q\" \"$FWDIR/$q.framework/Versions/$QT_FWVER/$q\"\n\t\tln -sf Versions/Current/$q \"$FWDIR/$q.framework/$q\"\n\t\tif [ -d \"$QT_PREFIX_FW/$q.framework/Versions/$QT_FWVER/Resources\" ] ; then\n\t\t\tcp -Rfp \"$QT_PREFIX_FW/$q.framework/Versions/$QT_FWVER/Resources\" \"$FWDIR/$q.framework/Versions/$QT_FWVER\"\n\t\t\tln -sfh Versions/Current/Resources \"$FWDIR/$q.framework/Resources\"\n\t\tfi\n\t\t# debug variants\n\t\tqd=$q\"_debug\"\n\t\tif [ \"$CONFIGURATION\" = \"Debug\" ] && [ -f \"$QT_PREFIX_FW/$q.framework/Versions/$QT_FWVER/$qd\" ] ; then\n\t\t\tditto -X $QARCHS \"$QT_PREFIX_FW/$q.framework/Versions/$QT_FWVER/$qd\" \"$FWDIR/$q.framework/Versions/$QT_FWVER/$qd\"\n\t\t\tln -sf Versions/Current/$qd \"$FWDIR/$q.framework/$qd\"\n\t\t\tif [ -d \"$QT_PREFIX_FW/$q.framework/$qd.dSYM\" ] ; then\n\t\t\t\tditto -X $QARCHS \"$QT_PREFIX_FW/$q.framework/$qd.dSYM\" \"$FWDIR/$q.framework\"\n\t\t\tfi\n\t\tfi\n\tfi\ndone\n\n# copy Qt plugins\nmkdir -p \"$APPDIRC/PlugIns/imageformats\"\nif [ ! -f \"$APPDIRC/PlugIns/imageformats/libqjpeg.dylib\" ] ; then\n\tditto -X $QARCHS \"$QT_PLUGINS_DIR/imageformats/libqjpeg.dylib\" \"$APPDIRC/PlugIns/imageformats/libqjpeg.dylib\"\nfi\nmkdir -p \"$APPDIRC/PlugIns/codecs\"\nfor c in cn jp kr tw\ndo\n\tif [ ! -f \"$APPDIRC/PlugIns/codecs/libq$c\"\"codecs.dylib\" ] ; then\n\t\tditto -X $QARCHS \"$QT_PLUGINS_DIR/codecs/libq$c\"\"codecs.dylib\" \"$APPDIRC/PlugIns/codecs/libq$c\"\"codecs.dylib\"\n\tfi\ndone\n\n# Qwt\n\necho \"Copying Qwt and updating library paths...\"\nQWTROOT=\"$QWT_PREFIX/lib\"\nif [ -f \"$QWTROOT/libqwt.dylib\" ] ; then\n\tditto -X $QARCHS \"$QWTROOT/libqwt.dylib\" \"$QGIS_BUILD_PATH/MacOS/$QGIS_LIB_SUBDIR/libqwt.dylib\"\n\tqlib=`otool -L \"$QWTROOT/libqwt.dylib\" | grep -E -m 1 \"libqwt.+ \" | cut -d \\( -f 1 | sed -E -e 's/^[[:space:]]//' -e 's/[[:space:]]$//'`\n\tQWT_CHG=\"-change $qlib @executable_path/$QGIS_LIB_SUBDIR/libqwt.dylib\"\n\techo \"install_name_tool $QWT_CHG \\\"$APPDIR/Qgis\\\"\"\n\tinstall_name_tool $QWT_CHG \"$APPDIR/Qgis\"\nfi\n\n# PyQt path based on PYTHON_FORM\n\nif [ \"$PYSITE\" ] ; then\n\techo \"Copying PyQt library paths...\"\n\tmkdir -p \"$QGISPYDIR/PyQt$QT_FWVER\"\n\tif [ ! -f \"$QGISPYDIR/sip.so\" ] ; then\n\t\tditto -X $QARCHS \"$PYSITE/sip.so\" \"$QGISPYDIR/\"\n\t\tcp -fp \"$PYSITE/sipconfig.py\" \"$QGISPYDIR/\"\n\tfi\n\tfor q in $PYQTLIST\n\tdo\n\t\tif [ ! -f \"$QGISPYDIR/PyQt$QT_FWVER/$q.so\" ] ; then\n\t\t\tditto -X $QARCHS \"$PYSITE/PyQt$QT_FWVER/$q.so\" \"$QGISPYDIR/PyQt$QT_FWVER/$q.so\"\n\t\tfi\n\tdone\n\tcp -fp \"$PYSITE/PyQt$QT_FWVER/\"*.py \"$QGISPYDIR/PyQt$QT_FWVER/\"\n\t# PyQwt\n\tif [ -d \"$PYSITE/PyQt$QT_FWVER/Qwt5\" ] ; then\n\t\techo \"Copying PyQwt and updating library paths...\"\n\t\tmkdir -p \"$QGISPYDIR/PyQt$QT_FWVER/Qwt5\"\n\t\tditto -X $QARCHS \"$PYSITE/PyQt$QT_FWVER/Qwt5/_iqt.so\" \"$QGISPYDIR/PyQt$QT_FWVER/Qwt5/\"\n\t\tditto -X $QARCHS \"$PYSITE/PyQt$QT_FWVER/Qwt5/Qwt.so\" \"$QGISPYDIR/PyQt$QT_FWVER/Qwt5/\"\n\t\tcp -fp \"$PYSITE/PyQt$QT_FWVER/Qwt5/\"*.py \"$QGISPYDIR/PyQt$QT_FWVER/Qwt5/\"\n\t\tcp -Rfp \"$PYSITE/PyQt$QT_FWVER/uic\" \"$QGISPYDIR/PyQt$QT_FWVER\"\n\t\techo \"install_name_tool $QWT_CHG \\\"$QGISPYDIR/PyQt$QT_FWVER/Qwt5/_iqwt.so\\\"\"\n\t\tinstall_name_tool $QWT_CHG \"$QGISPYDIR/PyQt$QT_FWVER/Qwt5/_iqt.so\"\n\t\techo \"install_name_tool $QWT_CHG \\\"$QGISPYDIR/PyQt$QT_FWVER/Qwt5/Qwt.so\\\"\"\n\t\tinstall_name_tool $QWT_CHG \"$QGISPYDIR/PyQt$QT_FWVER/Qwt5/Qwt.so\"\n\tfi\nfi\n\n# just in case no plugins were compiled\nmkdir -p \"$APPDIR/$QGIS_PLUGIN_SUBDIR\"\n# list plugins & libs\ncd \"$APPDIR/$QGIS_PLUGIN_SUBDIR\"\npluglist=`ls`\ncd \"$APPDIR/$QGIS_LIB_SUBDIR\"\nqgliblist=`ls libqgis*.dylib`\nif [ \"$PYSITE\" ] ; then\n\tcd \"$QGISPYDIR/qgis\"\n\tqgpylist=`ls *.so`\nfi\n\n# main Qt framework loop\n\necho \"Updating Qt library paths...\"\n\ncd \"$APPDIR\"\n\nfor q in $QTLISTQG\ndo\n\tif [ -d \"$QT_PREFIX_FW/$q.framework\" ] ; then\n\t\tqq=`otool -L \"$QT_PREFIX_FW/$q.framework/$q\" | grep -E -m 1 \"$q.framework.*\\(\" | cut -d \\( -f 1 | sed -E -e 's/^[[:space:]]//' -e 's/[[:space:]]$//'`\n\t\tq_chg=\"-change $qq @executable_path/$QGIS_FW_SUBDIR/$q.framework/$q\"\n\t\t# app\n\t\techo \"install_name_tool $q_chg \\\"$APPDIR/Qgis\\\"\"\n\t\tinstall_name_tool $q_chg \"$APPDIR/Qgis\"\n\t\t# qgis_help qt linking done with symlinks\n\t\techo \"install_name_tool $q_chg \\\"$APPDIR/$QGIS_BIN_SUBDIR/qgis_help.app/Contents/MacOS/qgis_help\\\"\"\n\t\tinstall_name_tool $q_chg \"$APPDIR/$QGIS_BIN_SUBDIR/qgis_help.app/Contents/MacOS/qgis_help\"\n\t\t# libs\n\t\tfor ql in $qgliblist\n\t\tdo\n\t\t\techo \"install_name_tool $q_chg \\\"$APPDIR/$QGIS_LIB_SUBDIR/$ql\\\"\"\n\t\t\tinstall_name_tool $q_chg \"$APPDIR/$QGIS_LIB_SUBDIR/$ql\"\n\t\tdone\n\t\t# plugins\n\t\tfor qp in $pluglist\n\t\tdo\n\t\t\techo \"install_name_tool $q_chg \\\"$APPDIR/$QGIS_PLUGIN_SUBDIR/$qp\\\"\"\n\t\t\tinstall_name_tool $q_chg \"$APPDIR/$QGIS_PLUGIN_SUBDIR/$qp\"\n\t\tdone\n\t\t# qt fw\n\t\tfor qf in $QTLISTQG\n\t\tdo\n\t\t\tif [ -d \"$APPDIR/$QGIS_FW_SUBDIR/$qf.framework\" ] ; then\n\t\t\t\techo \"install_name_tool $q_chg \\\"$APPDIR/$QGIS_FW_SUBDIR/$qf.framework/Versions/$QT_FWVER/$qf\\\"\"\n\t\t\t\tinstall_name_tool $q_chg \"$APPDIR/$QGIS_FW_SUBDIR/$qf.framework/Versions/$QT_FWVER/$qf\"\n\t\t\tfi\n\t\tdone\n\t\t# qt plugs\n\t\techo \"install_name_tool $q_chg \\\"$APPDIRC/PlugIns/imageformats/libqjpeg.dylib\\\"\"\n\t\tinstall_name_tool $q_chg \"$APPDIRC/PlugIns/imageformats/libqjpeg.dylib\"\n\t\tfor c in cn jp kr tw\n\t\tdo\n\t\t\techo \"install_name_tool $q_chg \\\"$APPDIRC/PlugIns/codecs/libq$c\\\"\\\"codecs.dylib\\\"\"\n\t\t\tinstall_name_tool $q_chg \"$APPDIRC/PlugIns/codecs/libq$c\"\"codecs.dylib\"\n\t\tdone\n\t\t# Qwt\n\t\tif [ -f \"$QWTROOT/libqwt.dylib\" ] ; then\n\t\t\techo \"install_name_tool $q_chg \\\"$QGIS_BUILD_PATH/MacOS/$QGIS_LIB_SUBDIR/libqwt.dylib\\\"\"\n\t\t\tinstall_name_tool $q_chg \"$QGIS_BUILD_PATH/MacOS/$QGIS_LIB_SUBDIR/libqwt.dylib\"\n\t\tfi\n\t\t# PyQt\n\t\tif [ \"$PYSITE\" ] ; then\n\t\t\tfor pq in $PYQTLIST\n\t\t\tdo\n\t\t\t\techo \"install_name_tool $q_chg \\\"$QGISPYDIR/PyQt$QT_FWVER/$pq.so\\\"\"\n\t\t\t\tinstall_name_tool $q_chg \"$QGISPYDIR/PyQt$QT_FWVER/$pq.so\"\n\t\t\tdone\n\t\t\tfor pg in $qgpylist\n\t\t\tdo\n\t\t\t\techo \"install_name_tool $q_chg \\\"$QGISPYDIR/qgis/$pg\\\"\"\n\t\t\t\tinstall_name_tool $q_chg \"$QGISPYDIR/qgis/$pg\"\n\t\t\tdone\n\t\t\tif [ -d \"$QGISPYDIR/PyQt$QT_FWVER/Qwt5\" ] ; then\n\t\t\t\tfor pw in _iqt Qwt\n\t\t\t\tdo\n\t\t\t\t\techo \"install_name_tool $q_chg \\\"$QGISPYDIR/PyQt$QT_FWVER/Qwt5/$pw.so\\\"\"\n\t\t\t\t\tinstall_name_tool $q_chg \"$QGISPYDIR/PyQt$QT_FWVER/Qwt5/$pw.so\"\n\t\t\t\tdone\n\t\t\tfi\n\t\tfi\n\tfi\ndone\n";
1550715516
showEnvVarsInLog = 0;
1550815517
};
15518+
72F3DABA11D70D4900FFA738 /* Script - svnver plist */ = {
15519+
isa = PBXShellScriptBuildPhase;
15520+
buildActionMask = 2147483647;
15521+
files = (
15522+
);
15523+
inputPaths = (
15524+
);
15525+
name = "Script - svnver plist";
15526+
outputPaths = (
15527+
);
15528+
runOnlyForDeploymentPostprocessing = 0;
15529+
shellPath = /bin/sh;
15530+
shellScript = "# manually set SVN version in info.plist so it matches config headers\n\nsvnv=`which svnversion`\nif [ \"$svnv\" ] ; then\n\tsvnver=`svnversion $SRCROOT`\nelse\n\tsvnver=\"unknown\"\nfi\n\nsed -i '' -e \"s,\\@QGIS_VERSION_BUILD@,$svnver,g\" \\\n\t\"$CONFIGURATION_BUILD_DIR/Qgis.app/Contents/Info.plist\"\n";
15531+
showEnvVarsInLog = 0;
15532+
};
1550915533
72FB0B4B0FFD680F0052360B /* Script - ui */ = {
1551015534
isa = PBXShellScriptBuildPhase;
1551115535
buildActionMask = 2147483647;
@@ -16957,6 +16981,11 @@
1695716981
target = 72A07D880F3BDF9C004FC2A4 /* postgresprovider */;
1695816982
targetProxy = 72F07FE90F5112D8008D3148 /* PBXContainerItemProxy */;
1695916983
};
16984+
72F3DAB711D70A6F00FFA738 /* PBXTargetDependency */ = {
16985+
isa = PBXTargetDependency;
16986+
target = 72463E3E1122FEF200BE5F17 /* qgis.g.browser */;
16987+
targetProxy = 72F3DAB611D70A6F00FFA738 /* PBXContainerItemProxy */;
16988+
};
1696016989
72FB0B6D0FFD6B8F0052360B /* PBXTargetDependency */ = {
1696116990
isa = PBXTargetDependency;
1696216991
target = 72FB0B4A0FFD680F0052360B /* evisplugin */;
@@ -17379,7 +17408,7 @@
1737917408
72463E431122FEF200BE5F17 /* Debug */ = {
1738017409
isa = XCBuildConfiguration;
1738117410
buildSettings = {
17382-
CONFIGURATION_BUILD_DIR = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_DATA_SUBDIR)/grass/bin";
17411+
CONFIGURATION_BUILD_DIR = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIBEXEC_SUBDIR)/grass/bin";
1738317412
GCC_OPTIMIZATION_LEVEL = 0;
1738417413
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
1738517414
HEADER_SEARCH_PATHS = (
@@ -17402,7 +17431,7 @@
1740217431
72463E441122FEF200BE5F17 /* Release */ = {
1740317432
isa = XCBuildConfiguration;
1740417433
buildSettings = {
17405-
CONFIGURATION_BUILD_DIR = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_DATA_SUBDIR)/grass/bin";
17434+
CONFIGURATION_BUILD_DIR = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIBEXEC_SUBDIR)/grass/bin";
1740617435
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
1740717436
HEADER_SEARCH_PATHS = (
1740817437
"$(inherited)",
@@ -20272,7 +20301,7 @@
2027220301
72FEE3AF111D353300D28C1A /* Debug */ = {
2027320302
isa = XCBuildConfiguration;
2027420303
buildSettings = {
20275-
CONFIGURATION_BUILD_DIR = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_DATA_SUBDIR)/grass/modules";
20304+
CONFIGURATION_BUILD_DIR = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIBEXEC_SUBDIR)/grass/modules";
2027620305
GCC_OPTIMIZATION_LEVEL = 0;
2027720306
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
2027820307
HEADER_SEARCH_PATHS = (
@@ -20301,7 +20330,7 @@
2030120330
72FEE3B0111D353300D28C1A /* Release */ = {
2030220331
isa = XCBuildConfiguration;
2030320332
buildSettings = {
20304-
CONFIGURATION_BUILD_DIR = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_DATA_SUBDIR)/grass/modules";
20333+
CONFIGURATION_BUILD_DIR = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIBEXEC_SUBDIR)/grass/modules";
2030520334
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
2030620335
HEADER_SEARCH_PATHS = (
2030720336
"$(inherited)",
@@ -20329,7 +20358,7 @@
2032920358
72FEE3C6111D378800D28C1A /* Debug */ = {
2033020359
isa = XCBuildConfiguration;
2033120360
buildSettings = {
20332-
CONFIGURATION_BUILD_DIR = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_DATA_SUBDIR)/grass/modules";
20361+
CONFIGURATION_BUILD_DIR = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIBEXEC_SUBDIR)/grass/modules";
2033320362
GCC_OPTIMIZATION_LEVEL = 0;
2033420363
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
2033520364
HEADER_SEARCH_PATHS = (
@@ -20359,7 +20388,7 @@
2035920388
72FEE3C7111D378800D28C1A /* Release */ = {
2036020389
isa = XCBuildConfiguration;
2036120390
buildSettings = {
20362-
CONFIGURATION_BUILD_DIR = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_DATA_SUBDIR)/grass/modules";
20391+
CONFIGURATION_BUILD_DIR = "$(QGIS_BUILD_PATH)/MacOS/$(QGIS_LIBEXEC_SUBDIR)/grass/modules";
2036320392
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
2036420393
HEADER_SEARCH_PATHS = (
2036520394
"$(inherited)",
@@ -20519,7 +20548,6 @@
2051920548
COPY_PHASE_STRIP = NO;
2052020549
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
2052120550
GCC_OPTIMIZATION_LEVEL = 0;
20522-
QGIS_VERSION_BUILD = 13812;
2052320551
STRIP_INSTALLED_PRODUCT = NO;
2052420552
};
2052520553
name = Debug;
@@ -20530,7 +20558,6 @@
2053020558
buildSettings = {
2053120559
COPY_PHASE_STRIP = YES;
2053220560
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
20533-
QGIS_VERSION_BUILD = 13812;
2053420561
STRIP_INSTALLED_PRODUCT = YES;
2053520562
};
2053620563
name = Release;

‎mac/xcode/qgis_settings.xcconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ QGIS_FW_SUBDIR = ../Frameworks
182182
QGIS_LIB_SUBDIR = lib // qgispython lib MUST be in MacOS/lib
183183
QGIS_DATA_SUBDIR = ../Resources
184184
QGIS_PLUGIN_SUBDIR = ../PlugIns/qgis
185+
QGIS_LIBEXEC_SUBDIR = lib/gqis
185186
QGIS_HEADER_SEARCH_BASE = $(SYMROOT)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/include
186187
HEADER_SEARCH_PATHS = $(QGIS_HEADER_SEARCH_BASE)
187188
ALWAYS_SEARCH_USER_PATHS = NO

0 commit comments

Comments
 (0)
Please sign in to comment.