diff --git a/CMakeLists.txt b/CMakeLists.txt
index e33b237..17bd9a4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,10 +95,11 @@ IF ( (${CMAKE_C_COMPILER_ID} STREQUAL "GNU" OR ${CMAKE_C_COMPILER_ID} STREQUAL "
     MESSAGE (STATUS "cuda include: ${CUDA_INCLUDE_DIRS}")
     MESSAGE (STATUS "cuda libs: ${CUDA_TOOLKIT_ROOT_DIR}/lib64")
     MESSAGE (STATUS "cuda version: ${CUDA_VERSION}")
+    SET(CUDA_PROPAGATE_HOST_FLAGS OFF)
 
     SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lcudart -lcufft -lcublas -lnvToolsExt -DDKS_CUDA")
     SET (CUDA_NVCC_FLAGS "-arch=sm_35 -DDEBUG -lcufft -lcublas -lcudart -fmad=false")
-    
+    SET (CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS}  -DDEBUG -std=c++11 -D__wsu")    
     SET (CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS} ${OPENCL_KERNELS}")
 
     #if cuda version >= 7.0 add runtime commpilation flags
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 01f33fb..e81e69f 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -53,7 +53,7 @@ ADD_EXECUTABLE(testCollimatorPhysics testCollimatorPhysics.cpp)
 #TARGET_LINK_LIBRARIES(testGather dks)
 #TARGET_LINK_LIBRARIES(testGatherAsync dks)
 #TARGET_LINK_LIBRARIES(testTranspose dks)
-TARGET_LINK_LIBRARIES(testCollimatorPhysics dks)
+TARGET_LINK_LIBRARIES(testCollimatorPhysics dks ${Boost_LIBRARIES})
 #TARGET_LINK_LIBRARIES(testCollimatorPhysicsSoA dks)
 #TARGET_LINK_LIBRARIES(testPush dks)
 #TARGET_LINK_LIBRARIES(testFFTSolverMIC dks)