[polly] r275536 - GPGPU: Shorten ppcg include paths to avoid conflict with cuda.h

[Tobias Grosser via llvm-commits]

Author: grosser
Date: Fri Jul 15 02:50:36 2016
New Revision: 275536

URL: http://llvm.org/viewvc/llvm-project?rev=275536&view=rev
Log:
GPGPU: Shorten ppcg include paths to avoid conflict with cuda.h

Instead of directly linking to ppcg's main source directory, we link to the
parent director. This allows us to access ppcg's include files with
'ppcg/cuda.h' and avoids a conflict with NVIDIA's cuda.h header.

Also drop an include directory that is currently not used.

Modified:
    polly/trunk/CMakeLists.txt
    polly/trunk/lib/CodeGen/PPCGCodeGeneration.cpp

Modified: polly/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/CMakeLists.txt?rev=275536&r1=275535&r2=275536&view=diff
==============================================================================
--- polly/trunk/CMakeLists.txt (original)
+++ polly/trunk/CMakeLists.txt Fri Jul 15 02:50:36 2016
@@ -138,8 +138,7 @@ include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}/lib/External/isl/include
   ${CMAKE_CURRENT_SOURCE_DIR}/lib/External/isl/include
   ${CMAKE_CURRENT_SOURCE_DIR}/lib/External/pet/include
-  ${CMAKE_CURRENT_BINARY_DIR}/lib/External/ppcg
-  ${CMAKE_CURRENT_SOURCE_DIR}/lib/External/ppcg
+  ${CMAKE_CURRENT_SOURCE_DIR}/lib/External
   ${CMAKE_CURRENT_BINARY_DIR}/include
   )
 

Modified: polly/trunk/lib/CodeGen/PPCGCodeGeneration.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/PPCGCodeGeneration.cpp?rev=275536&r1=275535&r2=275536&view=diff
==============================================================================
--- polly/trunk/lib/CodeGen/PPCGCodeGeneration.cpp (original)
+++ polly/trunk/lib/CodeGen/PPCGCodeGeneration.cpp Fri Jul 15 02:50:36 2016
@@ -26,11 +26,11 @@
 #include "isl/union_map.h"
 
 extern "C" {
-#include "cuda.h"
-#include "gpu.h"
-#include "gpu_print.h"
-#include "ppcg.h"
-#include "schedule.h"
+#include "ppcg/cuda.h"
+#include "ppcg/gpu.h"
+#include "ppcg/gpu_print.h"
+#include "ppcg/ppcg.h"
+#include "ppcg/schedule.h"
 }
 
 #include "llvm/Support/Debug.h"