diff options
| author | Anatoly Baksheev <no@email> | 2015-02-01 17:45:31 +0300 |
|---|---|---|
| committer | Evan Shelhamer <shelhamer@imaginarynumber.net> | 2015-02-16 20:48:41 -0800 |
| commit | aea5dd674adbccf9927869f5e9ba9e2dfc2cbf21 (patch) | |
| tree | 119681b184cd92799a2b5aa223e0d64cf8f8e413 /cmake/Cuda.cmake | |
| parent | c0ae656c0e80e721fec89b63e2cdc390e440d625 (diff) | |
| download | caffeonacl-aea5dd674adbccf9927869f5e9ba9e2dfc2cbf21.tar.gz caffeonacl-aea5dd674adbccf9927869f5e9ba9e2dfc2cbf21.tar.bz2 caffeonacl-aea5dd674adbccf9927869f5e9ba9e2dfc2cbf21.zip | |
cmake 2.8.7. support
Diffstat (limited to 'cmake/Cuda.cmake')
| -rw-r--r-- | cmake/Cuda.cmake | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/cmake/Cuda.cmake b/cmake/Cuda.cmake index 42a94e5a..07fa1378 100644 --- a/cmake/Cuda.cmake +++ b/cmake/Cuda.cmake @@ -194,6 +194,7 @@ endfunction() ################################################################################################ find_package(CUDA 5.5 QUIET) +find_cuda_helper_libs(curand) # cmake 2.8.7 compartibility which doesn't search for curand if(NOT CUDA_FOUND) return() @@ -241,3 +242,13 @@ endif() mark_as_advanced(CUDA_BUILD_CUBIN CUDA_BUILD_EMULATION CUDA_VERBOSE_BUILD) mark_as_advanced(CUDA_SDK_ROOT_DIR CUDA_SEPARABLE_COMPILATION) +# Handle clang/libc++ issue +if(APPLE) + caffe_detect_darwin_version(OSX_VERSION) + + # OSX 10.9 and higher uses clang/libc++ by default which is incompartible with old CUDA toolkits + if(OSX_VERSION VERSION_GREATER 10.8) + # enabled by default if and only if CUDA version is less than 7.0 + caffe_option(USE_libstdcpp "Use libstdc++ instead of libc++" (CUDA_VERSION VERSION_LESS 7.0)) + endif() +endif() |