From 58007f1eaf5eb8409f7affc09bba8a8a79ba4705 Mon Sep 17 00:00:00 2001
From: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date: Mon, 7 Jan 2019 11:54:28 +0100
Subject: [PATCH 1/2] Fix cmake error

---
 libsrc/general/CMakeLists.txt | 4 ----
 libsrc/gprim/CMakeLists.txt   | 3 ---
 libsrc/linalg/CMakeLists.txt  | 4 ----
 3 files changed, 11 deletions(-)

diff --git a/libsrc/general/CMakeLists.txt b/libsrc/general/CMakeLists.txt
index f1c39183..f5c16e82 100644
--- a/libsrc/general/CMakeLists.txt
+++ b/libsrc/general/CMakeLists.txt
@@ -6,10 +6,6 @@ add_library(gen OBJECT
         mpi_interface.cpp gzstream.cpp
         )
 
-if(NOT WIN32)
-  target_link_libraries(gen ngcore)
-endif(NOT WIN32)
-
 set_target_properties( gen PROPERTIES POSITION_INDEPENDENT_CODE ON )
 
 install(FILES
diff --git a/libsrc/gprim/CMakeLists.txt b/libsrc/gprim/CMakeLists.txt
index ac4b8f11..3957476a 100644
--- a/libsrc/gprim/CMakeLists.txt
+++ b/libsrc/gprim/CMakeLists.txt
@@ -3,9 +3,6 @@ add_library(gprim OBJECT
         adtree.cpp geom2d.cpp geom3d.cpp geomfuncs.cpp 
         geomtest3d.cpp transform3d.cpp spline.cpp splinegeometry.cpp
         )
-if(NOT WIN32)
-  target_link_libraries(gprim ngcore)
-endif(NOT WIN32)
 
 set_target_properties( gprim PROPERTIES POSITION_INDEPENDENT_CODE ON )
 
diff --git a/libsrc/linalg/CMakeLists.txt b/libsrc/linalg/CMakeLists.txt
index 9f35d751..a5a5a4f2 100644
--- a/libsrc/linalg/CMakeLists.txt
+++ b/libsrc/linalg/CMakeLists.txt
@@ -4,10 +4,6 @@ add_library( la OBJECT
 
 set_target_properties(la PROPERTIES POSITION_INDEPENDENT_CODE ON )
 
-if(NOT WIN32)
-  target_link_libraries(la ngcore)
-endif(NOT WIN32)
-
 install(FILES
   densemat.hpp linalg.hpp opti.hpp
   polynomial.hpp vector.hpp

From 90de81f96e6d0eaee601f8c4431434d0ee118ab6 Mon Sep 17 00:00:00 2001
From: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date: Mon, 7 Jan 2019 13:18:27 +0100
Subject: [PATCH 2/2] Fix wrong header include on Windows

---
 libsrc/core/utils.hpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libsrc/core/utils.hpp b/libsrc/core/utils.hpp
index 2c88629d..c8dc1e9e 100644
--- a/libsrc/core/utils.hpp
+++ b/libsrc/core/utils.hpp
@@ -4,7 +4,12 @@
 #include <chrono>
 #include <sstream>
 #include <string>
+
+#ifdef WIN32
+#include <intrin.h>   // for __rdtsc()  CPU time step counter
+#else
 #include <x86intrin.h>   // for __rdtsc()  CPU time step counter
+#endif // WIN32
 
 #include "ngcore_api.hpp"       // for NGCORE_API