|
95 | 95 | 7256F1B70F411C4B0022BE1F /* PBXTargetDependency */,
|
96 | 96 | 7256F1BB0F411C4B0022BE1F /* PBXTargetDependency */,
|
97 | 97 | 7256F1B50F411C4B0022BE1F /* PBXTargetDependency */,
|
| 98 | + 72F3DAB711D70A6F00FFA738 /* PBXTargetDependency */, |
98 | 99 | 7256F1BD0F411C4B0022BE1F /* PBXTargetDependency */,
|
99 | 100 | 7256F1B90F411C4B0022BE1F /* PBXTargetDependency */,
|
100 | 101 | );
|
|
2922 | 2923 | remoteGlobalIDString = 72A07D880F3BDF9C004FC2A4;
|
2923 | 2924 | remoteInfo = postgresprovider;
|
2924 | 2925 | };
|
| 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 | + }; |
2925 | 2933 | 72FB0B6C0FFD6B8F0052360B /* PBXContainerItemProxy */ = {
|
2926 | 2934 | isa = PBXContainerItemProxy;
|
2927 | 2935 | containerPortal = 20286C28FDCF999611CA2CEA /* Project object */;
|
|
14841 | 14849 | 8D0C4E8C0486CD37000505A6 /* Resources */,
|
14842 | 14850 | 8D0C4E8F0486CD37000505A6 /* Sources */,
|
14843 | 14851 | 8D0C4E910486CD37000505A6 /* Frameworks */,
|
| 14852 | + 72F3DABA11D70D4900FFA738 /* Script - svnver plist */, |
14844 | 14853 | 72EBCB3F0F49E8430016BA3C /* Copy - doc */,
|
14845 | 14854 | 7256F2D60F4146A70022BE1F /* Copy - doc-images */,
|
14846 | 14855 | 7256F3180F4149300022BE1F /* Copy - images-icons */,
|
|
15008 | 15017 | );
|
15009 | 15018 | runOnlyForDeploymentPostprocessing = 0;
|
15010 | 15019 | 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"; |
15012 | 15021 | showEnvVarsInLog = 0;
|
15013 | 15022 | };
|
15014 | 15023 | 7223B7830F96A96500D905B4 /* Script - ui */ = {
|
|
15506 | 15515 | 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";
|
15507 | 15516 | showEnvVarsInLog = 0;
|
15508 | 15517 | };
|
| 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 | + }; |
15509 | 15533 | 72FB0B4B0FFD680F0052360B /* Script - ui */ = {
|
15510 | 15534 | isa = PBXShellScriptBuildPhase;
|
15511 | 15535 | buildActionMask = 2147483647;
|
|
16957 | 16981 | target = 72A07D880F3BDF9C004FC2A4 /* postgresprovider */;
|
16958 | 16982 | targetProxy = 72F07FE90F5112D8008D3148 /* PBXContainerItemProxy */;
|
16959 | 16983 | };
|
| 16984 | + 72F3DAB711D70A6F00FFA738 /* PBXTargetDependency */ = { |
| 16985 | + isa = PBXTargetDependency; |
| 16986 | + target = 72463E3E1122FEF200BE5F17 /* qgis.g.browser */; |
| 16987 | + targetProxy = 72F3DAB611D70A6F00FFA738 /* PBXContainerItemProxy */; |
| 16988 | + }; |
16960 | 16989 | 72FB0B6D0FFD6B8F0052360B /* PBXTargetDependency */ = {
|
16961 | 16990 | isa = PBXTargetDependency;
|
16962 | 16991 | target = 72FB0B4A0FFD680F0052360B /* evisplugin */;
|
|
17379 | 17408 | 72463E431122FEF200BE5F17 /* Debug */ = {
|
17380 | 17409 | isa = XCBuildConfiguration;
|
17381 | 17410 | 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"; |
17383 | 17412 | GCC_OPTIMIZATION_LEVEL = 0;
|
17384 | 17413 | GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
|
17385 | 17414 | HEADER_SEARCH_PATHS = (
|
|
17402 | 17431 | 72463E441122FEF200BE5F17 /* Release */ = {
|
17403 | 17432 | isa = XCBuildConfiguration;
|
17404 | 17433 | 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"; |
17406 | 17435 | GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
|
17407 | 17436 | HEADER_SEARCH_PATHS = (
|
17408 | 17437 | "$(inherited)",
|
|
20272 | 20301 | 72FEE3AF111D353300D28C1A /* Debug */ = {
|
20273 | 20302 | isa = XCBuildConfiguration;
|
20274 | 20303 | 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"; |
20276 | 20305 | GCC_OPTIMIZATION_LEVEL = 0;
|
20277 | 20306 | GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
|
20278 | 20307 | HEADER_SEARCH_PATHS = (
|
|
20301 | 20330 | 72FEE3B0111D353300D28C1A /* Release */ = {
|
20302 | 20331 | isa = XCBuildConfiguration;
|
20303 | 20332 | 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"; |
20305 | 20334 | GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
|
20306 | 20335 | HEADER_SEARCH_PATHS = (
|
20307 | 20336 | "$(inherited)",
|
|
20329 | 20358 | 72FEE3C6111D378800D28C1A /* Debug */ = {
|
20330 | 20359 | isa = XCBuildConfiguration;
|
20331 | 20360 | 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"; |
20333 | 20362 | GCC_OPTIMIZATION_LEVEL = 0;
|
20334 | 20363 | GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
|
20335 | 20364 | HEADER_SEARCH_PATHS = (
|
|
20359 | 20388 | 72FEE3C7111D378800D28C1A /* Release */ = {
|
20360 | 20389 | isa = XCBuildConfiguration;
|
20361 | 20390 | 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"; |
20363 | 20392 | GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
|
20364 | 20393 | HEADER_SEARCH_PATHS = (
|
20365 | 20394 | "$(inherited)",
|
|
20519 | 20548 | COPY_PHASE_STRIP = NO;
|
20520 | 20549 | GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
20521 | 20550 | GCC_OPTIMIZATION_LEVEL = 0;
|
20522 |
| - QGIS_VERSION_BUILD = 13812; |
20523 | 20551 | STRIP_INSTALLED_PRODUCT = NO;
|
20524 | 20552 | };
|
20525 | 20553 | name = Debug;
|
|
20530 | 20558 | buildSettings = {
|
20531 | 20559 | COPY_PHASE_STRIP = YES;
|
20532 | 20560 | GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
|
20533 |
| - QGIS_VERSION_BUILD = 13812; |
20534 | 20561 | STRIP_INSTALLED_PRODUCT = YES;
|
20535 | 20562 | };
|
20536 | 20563 | name = Release;
|
|
0 commit comments