From c3197a5906a799eb4e3cfacd4c4c900f36beebfe Mon Sep 17 00:00:00 2001 From: Maciej Suminski Date: Sat, 17 Feb 2018 13:24:30 +0100 Subject: [PATCH] CMakeLists: detect gtk3 using wx-config --- CMakeLists.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5cb5b9a206..6c9b4211f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -508,8 +508,14 @@ find_package( wxWidgets 3.0.0 COMPONENTS gl aui adv html core net base xml stc R # Include wxWidgets macros. include( ${wxWidgets_USE_FILE} ) -string( FIND "${wxWidgets_LIBRARIES}" "gtk3" GTK3_DETECTED ) -if( NOT ${GTK3_DETECTED} EQUAL -1 ) +# Check the toolkit used to build wxWidgets +execute_process( COMMAND ${wxWidgets_CONFIG_EXECUTABLE} --query-toolkit + RESULT_VARIABLE wxWidgets_TOOLKIT_RESULT + OUTPUT_VARIABLE wxWidgets_TOOLKIT_FOUND + OUTPUT_STRIP_TRAILING_WHITESPACE +) + +if( wxWidgets_TOOLKIT_FOUND STREQUAL "gtk3" ) message( WARNING "\nwxWidgets library has been built against GTK3, it causes a lot of problems in KiCad" ) add_definitions( -DUSE_WX_GRAPHICS_CONTEXT ) add_definitions( -DWXGTK3 )