Merge pull request #2395 from atrantan/master

Fix target_link_libraries() issue when HPX Cuda is enabled
STEllAR-GROUP · Nov 17, 2016 · 1eb5324 · 1eb5324
2 parents ed55f66 + 9b258e6
commit 1eb5324
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/hpx/compute/cuda/allocator.hpp b/hpx/compute/cuda/allocator.hpp
@@ -184,7 +184,7 @@ namespace hpx { namespace compute { namespace cuda
                         ::new (p + idx) T (std::forward<Args>(args)...);
                     }
                 },
-                p, count, std::forward<Args>(args)...);
+                p.device_ptr(), count, std::forward<Args>(args)...);
             target_.synchronize();
         }
 
@@ -199,7 +199,7 @@ namespace hpx { namespace compute { namespace cuda
                 {
                     ::new (p) T (std::forward<Args>(args)...);
                 },
-                p, std::forward<Args>(args)...);
+                p.device_ptr(), std::forward<Args>(args)...);
             target_.synchronize();
         }
 
@@ -220,7 +220,7 @@ namespace hpx { namespace compute { namespace cuda
                         (p + idx)->~T();
                     }
                 },
-                p, count);
+                p.device_ptr(), count);
             target_.synchronize();
         }
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -218,15 +218,25 @@ else()
     FOLDER "Core")
 endif()
 
-target_link_libraries(hpx
-  PUBLIC ${HPX_LIBRARIES})
-if(HPX_ADDITIONAL_RUNTIME_DEPENDENCIES)
+if(NOT HPX_WITH_CUDA)  # Cuda needs plain target_link_libraries() signature
   target_link_libraries(hpx
-    PUBLIC ${HPX_ADDITIONAL_RUNTIME_DEPENDENCIES})
-endif()
-if(HPX_ADDITIONAL_PRIVATE_RUNTIME_DEPENDENCIES)
-  target_link_libraries(hpx
-    PRIVATE ${HPX_ADDITIONAL_PRIVATE_RUNTIME_DEPENDENCIES})
+    PUBLIC ${HPX_LIBRARIES})
+  if(HPX_ADDITIONAL_RUNTIME_DEPENDENCIES)
+    target_link_libraries(hpx
+      PUBLIC ${HPX_ADDITIONAL_RUNTIME_DEPENDENCIES})
+  endif()
+  if(HPX_ADDITIONAL_PRIVATE_RUNTIME_DEPENDENCIES)
+    target_link_libraries(hpx
+      PRIVATE ${HPX_ADDITIONAL_PRIVATE_RUNTIME_DEPENDENCIES})
+  endif()
+else()
+  target_link_libraries(hpx ${HPX_LIBRARIES})
+  if(HPX_ADDITIONAL_RUNTIME_DEPENDENCIES)
+    target_link_libraries(hpx ${HPX_ADDITIONAL_RUNTIME_DEPENDENCIES})
+  endif()
+  if(HPX_ADDITIONAL_PRIVATE_RUNTIME_DEPENDENCIES)
+    target_link_libraries(hpx ${HPX_ADDITIONAL_PRIVATE_RUNTIME_DEPENDENCIES})
+  endif()
 endif()
 
 if(HPX_WITH_APEX)