From 11ac6c704a5bf4321c250a02e4f79e5ec53082a5 Mon Sep 17 00:00:00 2001
From: Matthias <matthias.hochsteger@tuwien.ac.at>
Date: Wed, 21 Oct 2015 08:50:39 -0700
Subject: [PATCH] fixes for Intel Compiler on Windows

---
 CMakeLists.txt                  | 6 ++++++
 libsrc/general/gzstream.h       | 4 ++--
 libsrc/meshing/meshtype.hpp     | 2 +-
 libsrc/visualization/mvdraw.hpp | 6 +++---
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c1a5a01..7722afc2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -188,6 +188,12 @@ if (USE_PYTHON)
     endif(NOT Boost_LIBRARIES)
 
     add_definitions(-DNG_PYTHON)
+
+    if(WIN32 AND ${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
+        # fix problems with boosts config/auto_link.hpp
+        add_definitions(-DBOOST_LIB_TOOLSET="iw")
+    endif()
+
     include_directories(${PYTHON_INCLUDE_DIRS})
     include_directories(${Boost_INCLUDE_DIRS})
     set(PYTHON_LIBS "${PYTHON_LIBRARIES};${Boost_LIBRARIES}")
diff --git a/libsrc/general/gzstream.h b/libsrc/general/gzstream.h
index 162f2969..74854a80 100644
--- a/libsrc/general/gzstream.h
+++ b/libsrc/general/gzstream.h
@@ -76,8 +76,8 @@ protected:
     gzstreambuf buf;
 public:
     gzstreambase() { init(&buf); }
-    gzstreambase( const char* name, int open_mode);
-    ~gzstreambase();
+    DLL_HEADER gzstreambase( const char* name, int open_mode);
+    DLL_HEADER ~gzstreambase();
     void open( const char* name, int open_mode);
     void close();
     gzstreambuf* rdbuf() { return &buf; }
diff --git a/libsrc/meshing/meshtype.hpp b/libsrc/meshing/meshtype.hpp
index 86a16cb4..458cbec6 100644
--- a/libsrc/meshing/meshtype.hpp
+++ b/libsrc/meshing/meshtype.hpp
@@ -586,7 +586,7 @@ namespace netgen
     flagstruct flags;
 
     ///
-    Element ();
+    DLL_HEADER Element ();
     ///
     Element (int anp);
     ///
diff --git a/libsrc/visualization/mvdraw.hpp b/libsrc/visualization/mvdraw.hpp
index 18be182f..a1977572 100644
--- a/libsrc/visualization/mvdraw.hpp
+++ b/libsrc/visualization/mvdraw.hpp
@@ -24,12 +24,12 @@ namespace netgen
     int changeval;
     static DLL_HEADER GLdouble backcolor;
 
-    static int selface;
+    static int DLL_HEADER selface;
     static int selelement;
-    static int selpoint;
+    static int DLL_HEADER selpoint;
     static int selpoint2;
     static int locpi;
-    static int seledge;
+    static int DLL_HEADER seledge;
 
     static int selecttimestamp;