зеркало из https://github.com/microsoft/caffe.git
Merge pull request #123 from zer0n/master
Fix cuda cmake build (c++11 flag)
This commit is contained in:
Коммит
1a2be8ecf9
|
@ -14,9 +14,6 @@ set(CAFFE_TARGET_VERSION "1.0.0-rc3" CACHE STRING "Caffe logical version")
|
||||||
set(CAFFE_TARGET_SOVERSION "1.0.0-rc3" CACHE STRING "Caffe soname version")
|
set(CAFFE_TARGET_SOVERSION "1.0.0-rc3" CACHE STRING "Caffe soname version")
|
||||||
add_definitions(-DCAFFE_VERSION=${CAFFE_TARGET_VERSION})
|
add_definitions(-DCAFFE_VERSION=${CAFFE_TARGET_VERSION})
|
||||||
|
|
||||||
# ---[ Use C++11
|
|
||||||
set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS} -std=c++11")
|
|
||||||
|
|
||||||
# ---[ Using cmake scripts and modules
|
# ---[ Using cmake scripts and modules
|
||||||
list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
|
list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
|
||||||
|
|
||||||
|
|
|
@ -247,7 +247,7 @@ endif()
|
||||||
|
|
||||||
# setting nvcc arch flags
|
# setting nvcc arch flags
|
||||||
caffe_select_nvcc_arch_flags(NVCC_FLAGS_EXTRA)
|
caffe_select_nvcc_arch_flags(NVCC_FLAGS_EXTRA)
|
||||||
list(APPEND CUDA_NVCC_FLAGS ${NVCC_FLAGS_EXTRA})
|
list(APPEND CUDA_NVCC_FLAGS "-std=c++11" ${NVCC_FLAGS_EXTRA})
|
||||||
message(STATUS "Added CUDA NVCC flags for: ${NVCC_FLAGS_EXTRA_readable}")
|
message(STATUS "Added CUDA NVCC flags for: ${NVCC_FLAGS_EXTRA_readable}")
|
||||||
|
|
||||||
# Boost 1.55 workaround, see https://svn.boost.org/trac/boost/ticket/9392 or
|
# Boost 1.55 workaround, see https://svn.boost.org/trac/boost/ticket/9392 or
|
||||||
|
|
Загрузка…
Ссылка в новой задаче