diff --git a/src/wx/CMakeLists.txt b/src/wx/CMakeLists.txt index 5ba0bfcb..5ad7bda5 100644 --- a/src/wx/CMakeLists.txt +++ b/src/wx/CMakeLists.txt @@ -73,19 +73,21 @@ SET(wxWidgets_USE_UNICODE ON) # adv is for wxAboutBox # xml, html is for xrc # do not include gl at first -set(wxWidgets_USE_LIBS xrc xml html adv net core base gl) +set(wxWidgets_USE_LIBS xrc xml html adv net core base) #list(APPEND wxWidgets_CONFIG_OPTIONS --version=2.8) # check for gtk4 then gtk3 packages first, some dists like arch rename the # wx-config utility for these packages -set(wxWidgets_CONFIG_EXECUTABLE wx-config-gtk4) -find_package(wxWidgets QUIET) -if(NOT wxWidgets_FOUND) - set(wxWidgets_CONFIG_EXECUTABLE wx-config-gtk3) +foreach(gtk_ver 4 3) + set(wxWidgets_CONFIG_EXECUTABLE wx-config-gtk${gtk_ver}) find_package(wxWidgets QUIET) - if(NOT wxWidgets_FOUND) - unset(wxWidgets_CONFIG_EXECUTABLE) + if(wxWidgets_FOUND) + break() endif() +endforeach() + +if(NOT wxWidgets_FOUND) + unset(wxWidgets_CONFIG_EXECUTABLE) endif() # the gl lib may not be available, and if it looks like it is we still have to