From f7892faa806878179f507a853b1af49d21a9d723 Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Mon, 24 Apr 2017 14:08:30 -0700 Subject: [PATCH] CMake: remove artisanal wxWidgets version check --- CMakeLists.txt | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 342119b24b..f323520589 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -789,28 +789,12 @@ if(NOT ANDROID) endif() if(NOT DISABLE_WX) - find_package(wxWidgets COMPONENTS core aui adv) + find_package(wxWidgets 3.1.0 COMPONENTS core aui adv) if(_ARCH_32) add_definitions(-DwxSIZE_T_IS_UINT) endif() - if(wxWidgets_FOUND) - EXECUTE_PROCESS(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} - COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}" - ${wxWidgets_CONFIG_OPTIONS} --version - OUTPUT_VARIABLE wxWidgets_VERSION - OUTPUT_STRIP_TRAILING_WHITESPACE - ERROR_QUIET - ) - message(STATUS "Found wxWidgets version ${wxWidgets_VERSION}") - set(wxMIN_VERSION "3.1.0") - if(${wxWidgets_VERSION} VERSION_LESS ${wxMIN_VERSION}) - message(STATUS "At least ${wxMIN_VERSION} is required; ignoring found version") - unset(wxWidgets_FOUND) - endif() - endif() - if(UNIX AND NOT APPLE AND NOT HAIKU) # There is a bug in the FindGTK module in cmake version 2.8.2 that # does not find gdk-pixbuf-2.0. On the other hand some 2.8.3