Bug#19187034: ADD COMPILER VERSION CHECKS TO CMAKE

Post-push fix: Rename CMake variable used to hold result of SunStudio
version check to avoid conflict with variable used in mysql_version.cmake

Author: jhauglid

cmake/os/SunOS.cmake

@@ -34,8 +34,8 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER)
       RESULT_VARIABLE result
     )
     STRING(REGEX MATCH "CC: Sun C\\+\\+ 5\\.([0-9]+)" VERSION_STRING ${stderr})
-    SET(MINOR_VERSION ${CMAKE_MATCH_1})
-    IF(${MINOR_VERSION} LESS 11)
+    SET(CC_MINOR_VERSION ${CMAKE_MATCH_1})
+    IF(${CC_MINOR_VERSION} LESS 11)
       MESSAGE(FATAL_ERROR "SunStudio 12u2 or newer is required!")
     ENDIF()
   ELSE()

configure.cmake

@@ -199,9 +199,9 @@ IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND
   ENDIF()
 
   STRING(REGEX MATCH "CC: Sun C\\+\\+ 5\\.([0-9]+)" VERSION_STRING ${stderr})
-  SET(MINOR_VERSION ${CMAKE_MATCH_1})
+  SET(CC_MINOR_VERSION ${CMAKE_MATCH_1})
 
-  IF(${MINOR_VERSION} EQUAL 13)
+  IF(${CC_MINOR_VERSION} EQUAL 13)
     SET(STLPORT_SUFFIX "lib/compilers/stlport4")
     IF(SIZEOF_VOIDP EQUAL 8 AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc")
       SET(STLPORT_SUFFIX "lib/compilers/stlport4/sparcv9")