From 5a5956052b04141f9c4d672233dbfd4111b7f658 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Wed, 25 Jun 2014 19:22:52 +0200 Subject: [PATCH] There's a better way to check for GCC 4.9 --- CMakeLists.txt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2e2587608..79ba78697 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,16 +5,13 @@ set( CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules" ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" ) if( CMAKE_COMPILER_IS_GNUCXX ) - execute_process( COMMAND ${CMAKE_C_COMPILER} -dumpversion - OUTPUT_VARIABLE GCC_VERSION ) - string( REGEX REPLACE "(\r?\n)+$" "" GCC_VERSION "${GCC_VERSION}" ) - if( GCC_VERSION VERSION_GREATER 4.9 OR GCC_VERSION VERSION_EQUAL 4.9 ) - message( STATUS "Found GNU g++ ${GCC_VERSION}, enabling colorized error messages." ) + if( CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.9 OR + CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 4.9 ) + message( STATUS "Found GNU g++ ${CMAKE_CXX_COMPILER_VERSION}, enabling colorized error messages." ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=always" ) endif() endif() - cmake_policy( SET CMP0023 OLD ) find_package( Qt5 5.3.0 CONFIG REQUIRED Core Gui Widgets LinguistTools )