diff --git a/CMakeLists.txt b/CMakeLists.txt index fa3db4375a..a65ff01be2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,14 +24,10 @@ endif() # check for minimal gcc version set(MIN_GCC_VER "4.7") if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - if(NOT ${CMAKE_CXX_COMPILER_VERSION} STREQUAL "") - if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "${MIN_GCC_VER}") - message(FATAL_ERROR "gcc >=${MIN_GCC_VER} required") - else() - message(STATUS "gcc ${CMAKE_CXX_COMPILER_VERSION} detected") - endif() + if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "${MIN_GCC_VER}") + message(FATAL_ERROR "gcc >=${MIN_GCC_VER} required") else() - message(WARNING "cmake version <2.8.10 found, couldn't check for gcc ${MIN_GCC_VER}") + message(STATUS "gcc ${CMAKE_CXX_COMPILER_VERSION} detected") endif() endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a4c9d6dcbb..7ca5e97ba5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -56,7 +56,7 @@ execute_process(COMMAND ${wxWidgets_CONFIG_EXECUTABLE} "--version-full" OUTPUT_VARIABLE WX_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) -set(WX_VERSION_MIN "2.9") +set(WX_VERSION_MIN "3.0") if("${WX_VERSION}" VERSION_LESS "${WX_VERSION_MIN}") set(WX_VERSION_DEFAULT "${WX_VERSION}") # Append version selector to find the right one in a multi-slot install if the default is lower than required.