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.

llvm-svn: 275536
This commit is contained in:
Tobias Grosser 2016-07-15 07:50:36 +00:00
parent 60f63b49f2
commit a56f8f8e58
2 changed files with 6 additions and 7 deletions

View File

@ -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
)

View File

@ -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"