merged

dlib/dnn/test_for_cuda/CMakeLists.txt

-
-cmake_minimum_required(VERSION 2.8.4)
-project(cuda_test)
-
-find_package(CUDA 7.5 REQUIRED)
-set(CUDA_HOST_COMPILATION_CPP ON)
-list(APPEND CUDA_NVCC_FLAGS "-arch=sm_30;-std=c++11;-D__STRICT_ANSI__")
-
-cuda_add_library(cuda_test STATIC cuda_test.cu )
+
+cmake_minimum_required(VERSION 2.8.4)
+project(cuda_test)
+
+include_directories(..)
+add_definitions(-DDLIB_USE_CUDA)
+
+find_package(CUDA 7.5 REQUIRED)
+set(CUDA_HOST_COMPILATION_CPP ON)
+list(APPEND CUDA_NVCC_FLAGS "-arch=sm_30;-std=c++11;-D__STRICT_ANSI__")
+
+cuda_add_library(cuda_test STATIC cuda_test.cu )

dlib/dnn/test_for_cuda/cuda_test.cu

 // Copyright (C) 2015  Davis E. King (davis@dlib.net)
 // License: Boost Software License   See LICENSE.txt for the full license.
 
-#include <cuda_runtime.h>
+#include "cuda_utils.h"
+#include "cuda_dlib.h"
 
 
 // ------------------------------------------------------------------------------------