Merge branch 'release-2.140.136'

[feisty_meow.git] / scripts / clam / cpp / get_version.sh

diff --git a/scripts/clam/cpp/get_version.sh b/scripts/clam/cpp/get_version.sh
index 50b9c70b1910a28d0b25cda2bf71d4824abe5c43..4d4941e36fe643c273f7c426fd938f2c733c7be2 100644 (file)
--- a/scripts/clam/cpp/get_version.sh
+++ b/scripts/clam/cpp/get_version.sh
@@ -2,7 +2,8 @@
 COMPILER=$1
 COMPILER_ROOT_DIR=$2
 if [ "$COMPILER" = "GNU_LINUX" \
-    -o "$COMPILER" = "GNU_DARWIN" ]; then
+    -o "$COMPILER" = "GNU_DARWIN" \
+    -o "$COMPILER" = "GNU_WINDOWS" ]; then
   # compiler version report for the gnu compiler on linux and darwin.
 
   # older code is needed for some versions of gcc / suse.
@@ -22,15 +23,6 @@ if [ "$COMPILER" = "GNU_LINUX" \
 elif [ "$COMPILER" = "GNU_ARM_LINUX" ]; then
   # compiler version report for the gnu compiler on the arm processor.
   gcc -### 2>&1 | grep "gcc version" | sed -e 's/^gcc version \([0-9.][0-9.]*\) .*$/\1/' 
-elif [ "$COMPILER" = "VISUAL_CPP" ]; then
-  # compiler version report for ms visual studio.
-  ver_raw=`$COMPILER_ROOT_DIR/bin/cl 2>&1 | head -1 | sed -e 's/.*Version \([0-9][0-9]*\)\..*$/\1/'`
-  if [ "$ver_raw" = "12" ]; then echo 6;
-  elif [ "$ver_raw" = "13" ]; then echo 7;
-  elif [ "$ver_raw" = "14" ]; then echo 8;
-  elif [ "$ver_raw" = "15" ]; then echo 9;
-  elif [ "$ver_raw" = "16" ]; then echo 10;
-  fi
 else
   echo "0"
 fi