From: sgorbuno <sgorbuno@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Tue, 10 Jul 2012 17:08:37 +0000 (+0000)
Subject: Vc sources now use completely namespaced includes to work around messed up MacOS X
X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=7c616f255c4b841149df41e1db14f6d7b6e70b63

Vc sources now use completely namespaced includes to work around messed up MacOS X
---

diff --git a/Vc/CMakeLists.txt b/Vc/CMakeLists.txt
index 668b809fe0e..483f66a4b51 100644
--- a/Vc/CMakeLists.txt
+++ b/Vc/CMakeLists.txt
@@ -7,7 +7,7 @@ macro(vc_add_target_property _target _prop _value)
    endif(NOT _oldprop)
 endmacro()
 
-include_directories("${Vc_INCLUDE_DIR}" "${Vc_INCLUDE_DIR}/Vc")
+include_directories("${Vc_INCLUDE_DIR}")
 
 if(USE_AVX)
    add_library(Vc STATIC src/vector.cpp src/cpuid.cpp src/support.cpp src/avx/sorthelper.cpp)
diff --git a/Vc/src/avx/sorthelper.cpp b/Vc/src/avx/sorthelper.cpp
index 1cf7c73356c..219f10ddafa 100644
--- a/Vc/src/avx/sorthelper.cpp
+++ b/Vc/src/avx/sorthelper.cpp
@@ -17,10 +17,10 @@
 
 */
 
-#include <avx/intrinsics.h>
-#include <avx/casts.h>
-#include <avx/sorthelper.h>
-#include <avx/macros.h>
+#include <Vc/avx/intrinsics.h>
+#include <Vc/avx/casts.h>
+#include <Vc/avx/sorthelper.h>
+#include <Vc/avx/macros.h>
 
 namespace Vc
 {
diff --git a/Vc/src/support.cpp b/Vc/src/support.cpp
index 8b3ccea0ecc..c9aa20cc1f0 100644
--- a/Vc/src/support.cpp
+++ b/Vc/src/support.cpp
@@ -19,7 +19,7 @@
 
 #include <Vc/global.h>
 #include <Vc/cpuid.h>
-#include "common/support.h"
+#include "Vc/common/support.h"
 
 #ifdef VC_MSVC
 #include <intrin.h>
diff --git a/Vc/src/vector.cpp b/Vc/src/vector.cpp
index 44eb28c484e..aa6a1673af5 100644
--- a/Vc/src/vector.cpp
+++ b/Vc/src/vector.cpp
@@ -25,9 +25,9 @@
 # endif
 #endif
 
-#include "common/const.h"
-#include "avx/const_data.h"
-#include "sse/const_data.h"
+#include "Vc/common/const.h"
+#include "Vc/avx/const_data.h"
+#include "Vc/sse/const_data.h"
 #include <Vc/version.h>
 
 #include <cstdio>