Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

wxGUI: remove unused wxwidgets compilation configuration option #2593

Merged
merged 3 commits into from
Oct 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/osgeo4w.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
$exe = 'osgeo4w-setup.exe'
$url = 'http://download.osgeo.org/osgeo4w/v2/' + $exe
(New-Object System.Net.WebClient).DownloadFile($url, $exe)
Start-Process ('.\'+$exe) -ArgumentList '-A -g -k -q -s http://download.osgeo.org/osgeo4w/v2/ -P proj-devel,gdal-devel,geos-devel,libtiff-devel,libpng-devel,pdal-devel,netcdf-devel,cairo-devel,fftw,freetype-devel,gdal-ecw,gdal-mrsid,liblas-devel,libxdr,libpq-devel,pdcurses,python3-matplotlib,python3-numpy,python3-ply,python3-pywin32,python3-six,python3-wxpython,regex-devel,wxwidgets-devel,zstd-devel' -Wait
Start-Process ('.\'+$exe) -ArgumentList '-A -g -k -q -s http://download.osgeo.org/osgeo4w/v2/ -P proj-devel,gdal-devel,geos-devel,libtiff-devel,libpng-devel,pdal-devel,netcdf-devel,cairo-devel,fftw,freetype-devel,gdal-ecw,gdal-mrsid,liblas-devel,libxdr,libpq-devel,pdcurses,python3-matplotlib,python3-numpy,python3-ply,python3-pywin32,python3-six,python3-wxpython,regex-devel,zstd-devel' -Wait

- name: Compile GRASS GIS
run: D:\msys64\usr\bin\bash.exe -l (''+(Get-Location)+'\.github\workflows\build_osgeo4w.sh') (Get-Location)
Expand Down
1 change: 0 additions & 1 deletion .travis/linux.install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ sudo apt-get install --no-install-recommends \
libreadline-dev \
libsqlite3-dev \
libtiff-dev \
libwxgtk3.0-gtk3-dev \
libxmu-dev \
libzstd-dev \
python3 \
Expand Down
1 change: 0 additions & 1 deletion .travis/linux.script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ export CC="ccache $CC"
--with-freetype-includes=/usr/include/freetype2/ \
--with-postgres-includes=/usr/include/postgresql/ \
--with-proj-share=/usr/share/proj \
--with-wxwidgets=/usr/bin/wx-config \
--with-python \
--with-cairo

Expand Down
1 change: 0 additions & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
"proj-bin",
"libreadline-dev",
"libsqlite3-dev",
"libwxgtk3.0-gtk3-dev",
"libxmu-dev",
"python3",
"python3-wxgtk4.0",
Expand Down
14 changes: 0 additions & 14 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -888,7 +888,6 @@ with_zstd
with_gdal
with_liblas
with_pdal
with_wxwidgets
with_netcdf
with_geos
with_includes
Expand Down Expand Up @@ -1620,10 +1619,6 @@ Optional Packages:
enable PDAL support (pdal-config with path,
e.g. '--with-pdal=/usr/local/bin/pdal-config',
default: no)
--with-wxwidgets=path/wx-config
enable wxWidgets support (wx-config with path,
e.g. '--with-wxwidgets=/usr/local/bin/wx-config',
default: no)
--with-netcdf=path/nc-config
enable NetCDF support (nc-config with path,
e.g. '--with-nc=/usr/local/bin/nc-config',
Expand Down Expand Up @@ -4458,15 +4453,6 @@ fi



# Check whether --with-wxwidgets was given.
if test "${with_wxwidgets+set}" = set; then :
withval=$with_wxwidgets;
else
with_wxwidgets="no"
fi



# Check whether --with-netcdf was given.
if test "${with_netcdf+set}" = set; then :
withval=$with_netcdf;
Expand Down
6 changes: 0 additions & 6 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -309,12 +309,6 @@ AC_ARG_WITH(pdal,
e.g. '--with-pdal=/usr/local/bin/pdal-config',
default: no)],, with_pdal="no")

AC_ARG_WITH(wxwidgets,
[ --with-wxwidgets[=path/wx-config]
enable wxWidgets support (wx-config with path,
e.g. '--with-wxwidgets=/usr/local/bin/wx-config',
default: no)],, with_wxwidgets="no")

AC_ARG_WITH(netcdf,
[ --with-netcdf[=path/nc-config]
enable NetCDF support (nc-config with path,
Expand Down
2 changes: 0 additions & 2 deletions mswindows/crosscompile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ LDFLAGS="-lcurses" \
./configure \
--with-nls \
--with-readline \
--with-wxwidgets \
--with-freetype-includes=$freetype_include \
--with-bzlib \
--with-postgres \
Expand Down Expand Up @@ -189,7 +188,6 @@ PKG_CONFIG=$mxe_bin-pkg-config \
--host=$arch \
--with-nls \
--with-readline \
--with-wxwidgets \
--with-freetype-includes=$mxe_shared/include/freetype2 \
--with-bzlib \
--with-postgres \
Expand Down
1 change: 0 additions & 1 deletion mswindows/osgeo4w/build_osgeo4w.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ export ARCH=x86_64-w64-mingw32
--with-fftw \
--with-nls \
--with-readline \
--with-wxwidgets \
--with-blas \
--with-lapack-includes=/mingw64/include/lapack \
--with-freetype \
Expand Down
1 change: 0 additions & 1 deletion mswindows/osgeo4w/package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,6 @@ if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
--with-lapack \
--with-lapack-includes=/mingw64/include \
--with-openmp \
--with-wxwidgets \
--with-cairo \
--with-cairo-includes=$OSGEO4W_ROOT_MSYS/include \
--with-cairo-ldflags="-L$PWD/mswindows/osgeo4w/lib -lcairo -lfontconfig" \
Expand Down
1 change: 0 additions & 1 deletion rpm/grass.spec
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,6 @@ CXXFLAGS="-std=c++98 ${CFLAGS}"
--with-regex \
--with-openmp \
--with-gdal=%{_bindir}/gdal-config \
--with-wxwidgets=%{_bindir}/wx-config \
--with-geos=%{_bindir}/geos-config \
%if (0%{?rhel} > 6 || 0%{?fedora})
--with-netcdf=%{_bindir}/nc-config \
Expand Down
1 change: 0 additions & 1 deletion utils/vagrant/compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ if [ ! -f "include/Make/Platform.make" ] ; then
--with-postgres-includes=`pg_config --includedir` \
--with-mysql-includes=`mysql_config --include | sed -e 's/-I//'` \
--with-proj-share=/usr/share/proj \
--with-wxwidgets=/usr/bin/wx-config \
--with-python \
--with-cairo \
--with-liblas
Expand Down