Changes from BVLC PR BVLC#4118

Author: drnikolaev

.gitignore

@@ -93,3 +93,6 @@ LOCK
 LOG*
 CURRENT
 MANIFEST-*
+
+# Third party source code
+3rdparty/cub/

CMakeLists.txt

@@ -65,7 +65,8 @@ configure_file(cmake/Templates/caffe_config.h.in "${PROJECT_BINARY_DIR}/caffe_co
 # ---[ Includes
 set(Caffe_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include)
 set(THIRDPARTY_DIR ${PROJECT_SOURCE_DIR}/3rdparty)
-include_directories(${Caffe_INCLUDE_DIR} ${PROJECT_BINARY_DIR} ${THIRDPARTY_DIR})
+set(THIRDPARTY_DIR_DST ${CMAKE_BINARY_DIR}/3rdparty)
+include_directories(${Caffe_INCLUDE_DIR} ${PROJECT_BINARY_DIR} ${THIRDPARTY_DIR_DST})
 include_directories(BEFORE src) # This is needed for gtest.
 
 # ---[ Subdirectories
@@ -94,5 +95,4 @@ caffe_generate_export_configs()
 
 # ---[ CUB Memory Manager
 set(CUB_VERSION "1.5.2")
-set(THIRDPARTY_DIR ./3rdparty)
 execute_process(COMMAND ${THIRDPARTY_DIR}/getCUB.sh ${CUB_VERSION})

Makefile

@@ -575,7 +575,7 @@ $(STATIC_NAME): $(OBJS) | $(LIB_BUILD_DIR)
 	@ echo AR -o $@
 	$(Q)ar rcs $@ $(OBJS)
 
-$(BUILD_DIR)/%.o: %.cpp | $(ALL_BUILD_DIRS) $(CUB_DIR)
+$(BUILD_DIR)/%.o: %.cpp | $(ALL_BUILD_DIRS)
 	@ echo CXX $<
 	$(Q)$(CXX) $< $(CXXFLAGS) -c -o $@ 2> $@.$(WARNS_EXT) \
 		|| (cat $@.$(WARNS_EXT); exit 1)
@@ -645,7 +645,6 @@ $(PY_PROTO_INIT): | $(PY_PROTO_BUILD_DIR)
 	touch $(PY_PROTO_INIT)
 
 clean:
-	@- $(RM) -rf $(CUB_DIR)
 	@- $(RM) -rf $(ALL_BUILD_DIRS)
 	@- $(RM) -rf $(OTHER_BUILD_DIR)
 	@- $(RM) -rf $(BUILD_DIR_LINK)
@@ -675,6 +674,7 @@ superclean: clean supercleanfiles
 		echo $(SUPERCLEAN_FILES) | tr ' ' '\n'; \
 		$(RM) $(SUPERCLEAN_FILES); \
 	fi
+	@- $(RM) -rf $(CUB_DIR)
 
 $(DIST_ALIASES): $(DISTRIBUTE_DIR)