swt2c / rpms / mrpt

Forked from rpms/mrpt 5 years ago
Clone
Blob Blame History Raw
diff -up ./cmakemodules/script_detect_gcc.cmake.gcc7 ./cmakemodules/script_detect_gcc.cmake
--- ./cmakemodules/script_detect_gcc.cmake.gcc7	2017-03-10 13:02:29.363646443 -0500
+++ ./cmakemodules/script_detect_gcc.cmake	2017-03-10 13:06:51.679689677 -0500
@@ -5,6 +5,13 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
 	execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
 		          OUTPUT_VARIABLE CMAKE_MRPT_GCC_VERSION_FULL
 		          OUTPUT_STRIP_TRAILING_WHITESPACE)
+        string(FIND ${CMAKE_MRPT_GCC_VERSION_FULL} "." MRPT_GCC_HAS_DOT)
+
+        if (${MRPT_GCC_HAS_DOT} EQUAL -1)
+           execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpfullversion
+                          OUTPUT_VARIABLE CMAKE_MRPT_GCC_VERSION_FULL
+                          OUTPUT_STRIP_TRAILING_WHITESPACE)
+        endif()
 
 	# Output in CMAKE_MRPT_GCC_VERSION_FULL: "X.Y"
 	#  Look for the version number