From e517160273401f52cc8bfbe58f27056ecfe2d7f4 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Sat, 3 Jul 2021 11:20:20 +0300 Subject: [PATCH] Force GTK+3.0 Name of wxGTK libraries does not have "gtk*" in it in many distros. That detection did not work, and gtk+-2.0 was used as a default variant. --- .../dependencies/wxwidgets.cmake | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake b/cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake index 4b35e8947..724459ceb 100644 --- a/cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake +++ b/cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake @@ -127,18 +127,6 @@ if( ${_OPT}use_wxwidgets STREQUAL "system" OR NOT ${_OPT}conan_enabled ) message(STATUS "Trying to retrieve GTK version from ${toolkit}") - if( "${toolkit}" MATCHES ".*gtk2.*" ) - set( gtk gtk+-2.0 ) - set( glib glib-2.0 ) - elseif( "${toolkit}" MATCHES ".*gtk3.*" ) - set( gtk gtk+-3.0 ) - set( glib glib-2.0 ) - elseif( "${toolkit}" MATCHES ".*gtk4.*" ) - set( gtk gtk+-4.0 ) - set( glib glib-2.0 ) - endif() - - if( NOT TARGET wxBase ) # add_library( wxBase ALIAS wxwidgets::wxwidgets ) make_wxBase(wxwidgets::wxwidgets) @@ -149,15 +137,9 @@ else() endif() if( NOT CMAKE_SYSTEM_NAME MATCHES "Windows|Darwin" ) - - if( NOT DEFINED gtk ) - set( gtk gtk+-2.0 ) - set( glib glib-2.0 ) - endif() - find_package(PkgConfig) - pkg_check_modules( GTK REQUIRED IMPORTED_TARGET GLOBAL ${gtk} ) - pkg_check_modules( GLIB REQUIRED IMPORTED_TARGET GLOBAL ${glib} ) + pkg_check_modules( GTK REQUIRED IMPORTED_TARGET GLOBAL gtk+-3.0 ) + pkg_check_modules( GLIB REQUIRED IMPORTED_TARGET GLOBAL glib-2.0 ) endif()