Skip to content

Commit

Permalink
cleanup cmake / force >= wxWidgets 3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
abma committed Mar 30, 2016
1 parent 16236a2 commit 85ac127
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
10 changes: 3 additions & 7 deletions CMakeLists.txt
Expand Up @@ -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()

Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Expand Up @@ -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.
Expand Down

0 comments on commit 85ac127

Please sign in to comment.