Skip to content

Consolidate packages and install rules #2456

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

Merged
alliepiper merged 6 commits into from
Sep 25, 2024
Merged

Consolidate packages and install rules #2456

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a876130
Migrate CMake packages to central location.
alliepiper Sep 4, 2024
a855f7d
Remove obsolete infra tests.
alliepiper Sep 16, 2024
ea78008
Migrate install rules to top-level, use `cccl_generate_install_rules`…
alliepiper Sep 16, 2024
bc0ce24
Remove libcudacxx export tests.
alliepiper Sep 17, 2024
fae1f8a
Make std arg for test_thrust.ps1 optional.
alliepiper Sep 17, 2024
c150d17
Ensure that cudax::Thrust target is only created once.
alliepiper Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Ensure that cudax::Thrust target is only created once.
  • Loading branch information
@alliepiper
alliepiper committed Sep 25, 2024
commit c150d17db438e9652ea7c08e2c2b7232ffdf73d6
14 changes: 7 additions & 7 deletions cudax/cmake/cudaxBuildTargetList.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,18 +107,18 @@ function(_cn_init_target_list)
set(cudax_TARGETS "" CACHE INTERNAL "" FORCE)
endfunction()

# Bring in thrust as a dev dependency, only used in tests:
find_package(Thrust ${cudax_VERSION} EXACT CONFIG
NO_DEFAULT_PATH # Only check the explicit path in HINTS:
HINTS "${CCCL_SOURCE_DIR}/lib/cmake/thrust/"
)
thrust_create_target(cudax::Thrust)

function(_cn_add_target_to_target_list target_name dialect prefix)
add_library(${target_name} INTERFACE)

cudax_set_target_properties(${target_name} ${dialect} ${prefix})

# Bring in thrust as a dev dependency, only used in tests:
find_package(Thrust ${cudax_VERSION} EXACT CONFIG
NO_DEFAULT_PATH # Only check the explicit path in HINTS:
HINTS "${CCCL_SOURCE_DIR}/lib/cmake/thrust/"
)
thrust_create_target(cudax::Thrust)

target_link_libraries(${target_name} INTERFACE
cudax::cudax
cudax::Thrust
Expand Down