From 64799368da26440c014ecfcf435f7ca3a44d8d15 Mon Sep 17 00:00:00 2001
From: DannyArends
Date: Thu, 1 Mar 2018 15:55:10 +0100
Subject: Trying to fix the -isystem/ failure of travis

---
 Makefile | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 235d1b6..e7fe655 100644
--- a/Makefile
+++ b/Makefile
@@ -68,15 +68,15 @@ TRAVIS_CI              =                  # used by TRAVIS for testing
 
 GSL_INCLUDE_PATH =
 ifeq ($(SYS), WIN)
-  GSL_INCLUDE_PATH = -isystemc:/MinGW/include -LC:/MinGW/lib
-  EIGEN_INCLUDE_PATH = -isystem../eigen-git-mirror
-  OPENBLAS_INCLUDE_PATH = -isystem../OpenBLAS-v0.2.19-Win64-int32/include -L../OpenBLAS-v0.2.19-Win64-int32/lib
+  GSL_INCLUDE_PATH = -isystem/c:/MinGW/include -LC:/MinGW/lib
+  EIGEN_INCLUDE_PATH = ../eigen-git-mirror
+  OPENBLAS_INCLUDE_PATH = ../OpenBLAS-v0.2.19-Win64-int32/include -L../OpenBLAS-v0.2.19-Win64-int32/lib
 else
-  OPENBLAS_INCLUDE_PATH = -isystem//usr/local/opt/openblas/include
+  OPENBLAS_INCLUDE_PATH = /usr/local/opt/openblas/include
   ifeq ($(SYS), MAC)
-  EIGEN_INCLUDE_PATH = -isystem//usr/local/include/eigen3
+  EIGEN_INCLUDE_PATH = /usr/local/include/eigen3
   else
-  EIGEN_INCLUDE_PATH = -isystem//usr/include/eigen3
+  EIGEN_INCLUDE_PATH = /usr/include/eigen3
   endif
 endif
 
@@ -97,13 +97,13 @@ endif
 
 ifeq ($(CPP), clang++)
   # macOS Homebrew settings (as used on Travis-CI)
-  GCC_FLAGS=-O3 -std=c++11 -stdlib=libc++ $(OPENBLAS_INCLUDE_PATH) $(EIGEN_INCLUDE_PATH) -Wl,-L/usr/local/opt/openblas/lib
+  GCC_FLAGS=-O3 -std=c++11 -stdlib=libc++ -isystem/$(OPENBLAS_INCLUDE_PATH) -isystem/$(EIGEN_INCLUDE_PATH) -Wl,-L/usr/local/opt/openblas/lib
 endif
 
 ifdef WITH_OPENBLAS
   OPENBLAS=1
   # WITH_LAPACK =  # OPENBLAS usually includes LAPACK
-  CPPFLAGS += -DOPENBLAS $(OPENBLAS_INCLUDE_PATH)
+  CPPFLAGS += -DOPENBLAS -isystem/$(OPENBLAS_INCLUDE_PATH)
   ifdef OPENBLAS_LEGACY
     # Legacy version (mostly for Travis-CI)
     CPPFLAGS += -DOPENBLAS_LEGACY
@@ -111,10 +111,10 @@ ifdef WITH_OPENBLAS
 endif
 
 ifdef DEBUG
-  CPPFLAGS += -g $(GCC_FLAGS) $(GSL_INCLUDE_PATH) $(EIGEN_INCLUDE_PATH) -Icontrib/catch-1.9.7 -Isrc
+  CPPFLAGS += -g $(GCC_FLAGS) $(GSL_INCLUDE_PATH) -isystem/$(EIGEN_INCLUDE_PATH) -Icontrib/catch-1.9.7 -Isrc
 else
   # release mode
-  CPPFLAGS += -DNDEBUG $(GCC_FLAGS) $(GSL_INCLUDE_PATH) $(EIGEN_INCLUDE_PATH) -Icontrib/catch-1.9.7 -Isrc
+  CPPFLAGS += -DNDEBUG $(GCC_FLAGS) $(GSL_INCLUDE_PATH) -isystem/$(EIGEN_INCLUDE_PATH) -Icontrib/catch-1.9.7 -Isrc
 endif
 
 ifeq ($(SYS), WIN)
-- 
cgit 1.4.1