Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
GRASS 6/7 build fixes:
* fix build on windows * fix grass build on precise (using cmake <2.8.8, ie. without INCLUDE_DIRECTORIES target property) * support desktop & browser shortcut for GRASS 6/7 in OSGeo4W nightly build
- Loading branch information
Showing
27 changed files
with
261 additions
and
185 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
@echo off | ||
call "%~dp0\o4w_env.bat" | ||
path %OSGEO4W_ROOT%\apps\@package@\bin;%OSGEO4W_ROOT%\apps\grass\grass-@grassversion@\lib;%PATH% | ||
path %OSGEO4W_ROOT%\apps\@package@\bin;%PATH% | ||
set QGIS_PREFIX_PATH=%OSGEO4W_ROOT:\=/%/apps/@package@ | ||
set QT_PLUGIN_PATH=%OSGEO4W_ROOT%\apps\@package@\qtplugins;%OSGEO4W_ROOT%\apps\qt4\plugins | ||
start "Qt Designer with QGIS custom widgets" /B "%OSGEO4W_ROOT%"\bin\designer.exe %* |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,15 @@ | ||
del "%OSGEO4W_STARTMENU%\QGIS Desktop @version@ (Nightly).lnk" | ||
del "%OSGEO4W_STARTMENU%\QGIS Browser @version@ (Nightly).lnk" | ||
for %%g in (@grassversions@) do ( | ||
del "%OSGEO4W_STARTMENU%\QGIS Desktop @version@ with GRASS %%g (Nightly).lnk" | ||
del "%OSGEO4W_STARTMENU%\QGIS Browser @version@ with GRASS %%g (Nightly).lnk" | ||
del "%ALLUSERSPROFILE%\Desktop\QGIS Desktop @version@ with GRASS %%g (Nightly).lnk" | ||
del "%ALLUSERSPROFILE%\Desktop\QGIS Browser @version@ with GRASS %%g (Nightly).lnk" | ||
del "%OSGEO4W_ROOT%"\bin\@package@-g%%g.bat | ||
del "%OSGEO4W_ROOT%"\bin\@package@-browser-g%%g.bat | ||
) | ||
|
||
del "%OSGEO4W_STARTMENU%\Qt Designer with QGIS @version@ custom widgets (Nightly).lnk" | ||
del "%ALLUSERSPROFILE%\Desktop\QGIS Desktop @version@ (Nightly).lnk" | ||
del "%ALLUSERSPROFILE%\Desktop\QGIS Browser @version@ (Nightly).lnk" | ||
del "%ALLUSERSPROFILE%\Desktop\Qt Designer with QGIS @version@ custom widgets (Nightly).lnk" | ||
del "%OSGEO4W_ROOT%"\bin\@package@.bat | ||
del "%OSGEO4W_ROOT%"\bin\@package@-browser.bat | ||
|
||
del "%OSGEO4W_ROOT%"\bin\designer-@package@.bat | ||
del "%OSGEO4W_ROOT%"\apps\@package@\python\qgis\qgisconfig.py | ||
del "%OSGEO4W_ROOT%"\apps\@package@\bin\qgis.reg |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
INCLUDE_DIRECTORIES(${GRASS_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) | ||
ADD_GRASSPLUGIN(6) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
INCLUDE_DIRECTORIES(${GRASS_INCLUDE_DIR7} ${CMAKE_CURRENT_BINARY_DIR}) | ||
ADD_GRASSPLUGIN(7) |
Oops, something went wrong.