Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix target_link_libraries() issue when HPX Cuda is enabled #2395

Merged
merged 3 commits into from Nov 17, 2016
Merged

Fix target_link_libraries() issue when HPX Cuda is enabled #2395

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e43777
Fix target_link_libraries() issue when HPX Cuda is enabled
Nov 16, 2016
d6f71d0
Fix indentations in CMakeLists
Nov 16, 2016
9b258e6
Help clang by providing raw pointer to the device lambda
Nov 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 19 additions & 9 deletions src/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -218,15 +218,25 @@ else()
FOLDER "Core")
endif()

target_link_libraries(hpx
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})
if(NOT HPX_WITH_CUDA) # Cuda needs plain target_link_libraries() signature
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you fix the indentation for the if()/end(), please?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix done in d6f71d0

target_link_libraries(hpx
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)
Expand Down