From 0a2efa30f152811dca994a5768e8d7a866a4da33 Mon Sep 17 00:00:00 2001
From: Zhaoyang Lv <lvzhaoyang1990@gmail.com>
Date: Thu, 13 Nov 2014 20:59:45 -0500
Subject: [PATCH] solve 'redefine MKL warning'

---
 gtsam/3rdparty/gtsam_eigen_includes.h.in | 16 ++++++++++++----
 package_scripts/toolbox_package_unix.sh  |  2 +-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/gtsam/3rdparty/gtsam_eigen_includes.h.in b/gtsam/3rdparty/gtsam_eigen_includes.h.in
index fa5a51c70..fa09b4aaa 100644
--- a/gtsam/3rdparty/gtsam_eigen_includes.h.in
+++ b/gtsam/3rdparty/gtsam_eigen_includes.h.in
@@ -17,13 +17,21 @@
 
 #pragma once
 
-#ifndef MKL_BLAS
-#define MKL_BLAS MKL_DOMAIN_BLAS
-#endif
-
 #cmakedefine EIGEN_USE_MKL_ALL // This is also defined in config.h
 #include <@GTSAM_EIGEN_INCLUDE_PREFIX@Eigen/Dense>
 #include <@GTSAM_EIGEN_INCLUDE_PREFIX@Eigen/QR>
 #include <@GTSAM_EIGEN_INCLUDE_PREFIX@Eigen/LU>
 #include <@GTSAM_EIGEN_INCLUDE_PREFIX@Eigen/SVD>
 #include <@GTSAM_EIGEN_INCLUDE_PREFIX@Eigen/Geometry>
+
+#ifdef MKL_DOMAIN_BLAS
+#define EIGEN_MKL_DOMAIN_BLAS MKL_DOMAIN_BLAS
+#else
+#define EIGEN_MKL_DOMAIN_BLAS MKL_BLAS
+#endif
+
+#ifndef MKL_BLAS
+#define MKL_BLAS MKL_DOMAIN_BLAS
+#endif
+
+
diff --git a/package_scripts/toolbox_package_unix.sh b/package_scripts/toolbox_package_unix.sh
index 844987324..182533672 100755
--- a/package_scripts/toolbox_package_unix.sh
+++ b/package_scripts/toolbox_package_unix.sh
@@ -61,4 +61,4 @@ if [ $? -ne 0 ]; then
 fi
 
 # Create package
-tar czf gtsam-toolbox-3.0.0-$platform.tgz -C stage/gtsam_toolbox toolbox
+tar czf gtsam-toolbox-3.2.0-$platform.tgz -C stage/gtsam_toolbox toolbox