Merge pull request #4609 from intelfx/BVLC-work-buildsystem

[cmake] Improvements to the build system

diff --cc CMakeLists.txt
Simple merge

diff --cc cmake/ConfigGen.cmake
Simple merge

diff --cc cmake/Cuda.cmake
Simple merge

diff --cc cmake/Dependencies.cmake
index ba28a12,290c161..02c8152
--- 1/cmake/Dependencies.cmake
--- 2/cmake/Dependencies.cmake
+++ b/cmake/Dependencies.cmake
@@@ -63,17 -82,9 +82,16 @@@ if(NOT HAVE_CUDA
      message(WARNING "-- CUDA is not detected by cmake. Building without it...")
    endif()
  
-   # TODO: remove this not cross platform define in future. Use caffe_config.h instead.
-   add_definitions(-DCPU_ONLY)
+   list(APPEND Caffe_DEFINITIONS PUBLIC -DCPU_ONLY)
  endif()
  
 +if(USE_NCCL)
 +  find_package(NCCL REQUIRED)
 +  include_directories(SYSTEM ${NCCL_INCLUDE_DIR})
 +  list(APPEND Caffe_LINKER_LIBS ${NCCL_LIBRARIES})
 +  add_definitions(-DUSE_NCCL)
 +endif()
 +
  # ---[ OpenCV
  if(USE_OPENCV)
    find_package(OpenCV QUIET COMPONENTS core highgui imgproc imgcodecs)

diff --cc src/caffe/net.cpp
Simple merge