shithub: sox

Info  •  Files  •  Log  •  Branches

use same logic as configure.ac for gcc version check

--- a/src/CMakeLists.txt

+++ b/src/CMakeLists.txt

@@ -5,12 +5,14 @@

 if(CMAKE_COMPILER_IS_GNUCC)

   execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion

     OUTPUT_VARIABLE ver)

-  string(REGEX REPLACE "[^0-9]+" "" ver "${ver}")

-  if(${ver} LESS 430)

+  string(REGEX REPLACE "([0-9]+)\\.([0-9]+).*" "\\1" major "${ver}")

+  string(REGEX REPLACE "([0-9]+)\\.([0-9]+).*" "\\2" minor "${ver}")

+  math(EXPR ver "100 * ${major} + ${minor}")

+  if(${ver} LESS 403)

     add_definitions(-Wconversion)

-  else(${ver} LESS 430)

+  else(${ver} LESS 403)

     add_definitions(-Wtraditional-conversion)

-  endif(${ver} LESS 430)

+  endif(${ver} LESS 403)

   add_definitions(-Werror)

 endif(CMAKE_COMPILER_IS_GNUCC)