diff options
| -rw-r--r-- | polly/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | polly/cmake/FindCUDA.cmake | 23 | ||||
| -rw-r--r-- | polly/include/polly/Config/config.h.cmake | 2 | ||||
| -rw-r--r-- | polly/tools/CMakeLists.txt | 4 |
4 files changed, 6 insertions, 29 deletions
diff --git a/polly/CMakeLists.txt b/polly/CMakeLists.txt index a748c223378..be075c5fcb4 100644 --- a/polly/CMakeLists.txt +++ b/polly/CMakeLists.txt @@ -163,10 +163,10 @@ endif(POLLY_ENABLE_GPGPU_CODEGEN) # Support GPGPU code generation if the library is available. -if (CUDALIB_FOUND) +if (CUDA_FOUND) add_definitions(-DHAS_LIBCUDART) - INCLUDE_DIRECTORIES( ${CUDALIB_INCLUDE_DIR} ) -endif(CUDALIB_FOUND) + INCLUDE_DIRECTORIES( ${CUDA_INCLUDE_DIRS} ) +endif(CUDA_FOUND) if (OpenCL_FOUND) add_definitions(-DHAS_LIBOPENCL) INCLUDE_DIRECTORIES( ${OpenCL_INCLUDE_DIR} ) diff --git a/polly/cmake/FindCUDA.cmake b/polly/cmake/FindCUDA.cmake deleted file mode 100644 index 37592f9efc5..00000000000 --- a/polly/cmake/FindCUDA.cmake +++ /dev/null @@ -1,23 +0,0 @@ -IF (NOT CUDA_HEADER_PREFIX) - SET(CUDA_HEADER_PREFIX "/usr/local/cuda/include") -ENDIF (NOT CUDA_HEADER_PREFIX) - -FIND_PATH(CUDALIB_INCLUDE_DIR - NAMES cuda.h - PATHS ${CUDA_HEADER_PREFIX}) - -FIND_LIBRARY(CUDALIB_LIBRARY NAMES cuda) - -IF (CUDALIB_INCLUDE_DIR) - SET(CUDALIB_FOUND TRUE) -ENDIF (CUDALIB_INCLUDE_DIR) - -IF (CUDALIB_FOUND) - IF (NOT CUDA_FIND_QUIETLY) - MESSAGE(STATUS "Found CUDA: ${CUDALIB_INCLUDE_DIR}") - ENDIF (NOT CUDA_FIND_QUIETLY) -ELSE (CUDALIB_FOUND) - IF (CUDA_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find CUDA") - ENDIF (CUDA_FIND_REQUIRED) -ENDIF (CUDALIB_FOUND) diff --git a/polly/include/polly/Config/config.h.cmake b/polly/include/polly/Config/config.h.cmake index 4abf8b9af5d..728eedd9d55 100644 --- a/polly/include/polly/Config/config.h.cmake +++ b/polly/include/polly/Config/config.h.cmake @@ -13,7 +13,7 @@ #ifndef POLLY_CONFIG_H #define POLLY_CONFIG_H -#cmakedefine CUDALIB_FOUND +#cmakedefine CUDA_FOUND #cmakedefine GPU_CODEGEN #endif diff --git a/polly/tools/CMakeLists.txt b/polly/tools/CMakeLists.txt index 8e5ce59cb90..7c89ed54942 100644 --- a/polly/tools/CMakeLists.txt +++ b/polly/tools/CMakeLists.txt @@ -1,5 +1,5 @@ -if (CUDALIB_FOUND OR OpenCL_FOUND) +if (CUDA_FOUND OR OpenCL_FOUND) add_subdirectory(GPURuntime) -endif (CUDALIB_FOUND OR OpenCL_FOUND) +endif (CUDA_FOUND OR OpenCL_FOUND) set(LLVM_COMMON_DEPENDS ${LLVM_COMMON_DEPENDS} PARENT_SCOPE) |
