Skip to content

Commit fcb7fcc

Browse files
cyrus wins
1 parent c255e8c commit fcb7fcc

2 files changed

Lines changed: 5 additions & 12 deletions

File tree

src/config/conduit_setup_targets.cmake

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,6 @@ set_property(TARGET conduit::conduit
7676
PROPERTY INTERFACE_LINK_LIBRARIES
7777
conduit conduit_relay conduit_blueprint)
7878

79-
add_library(conduit::conduit_execution INTERFACE IMPORTED)
80-
set_property(TARGET conduit::conduit_execution
81-
PROPERTY INTERFACE_LINK_LIBRARIES
82-
conduit_execution)
83-
8479

8580
if(CONDUIT_PYTHON_ENABLED)
8681
# create convenience target that exposes the header file for the
@@ -142,7 +137,7 @@ if(NOT Conduit_FIND_QUIETLY)
142137
message(STATUS " CONDUIT_RELAY_MPI_ENABLED = ${CONDUIT_RELAY_MPI_ENABLED}")
143138
message(STATUS " CONDUIT_USE_CMAKE_MPI_TARGETS = ${CONDUIT_USE_CMAKE_MPI_TARGETS}")
144139

145-
set(_print_targets "conduit::conduit conduit::conduit_execution")
140+
set(_print_targets "conduit::conduit")
146141

147142
if(CONDUIT_PYTHON_ENABLED)
148143
set(_print_targets "${_print_targets} conduit::conduit_python")
@@ -155,4 +150,3 @@ if(NOT Conduit_FIND_QUIETLY)
155150
message(STATUS "Conduit imported targets: ${_print_targets}")
156151
unset(_print_targets)
157152
endif()
158-

src/libs/conduit/CMakeLists.txt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,10 @@ if(UMPIRE_FOUND)
172172
list(APPEND conduit_thirdparty_libs umpire)
173173
endif()
174174

175+
if(CUDA_FOUND)
176+
list(APPEND conduit_thirdparty_libs blt::cuda_runtime)
177+
endif()
178+
175179
if(HIP_FOUND)
176180
list(APPEND conduit_thirdparty_libs blt::hip_runtime)
177181
endif()
@@ -203,11 +207,6 @@ target_include_directories(conduit
203207
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
204208
$<$<BOOL:TOTALVIEW_FOUND>:${TOTALVIEW_INCLUDE_DIRECTORIES}>)
205209

206-
add_library(conduit_execution INTERFACE)
207-
add_library(conduit::conduit_execution ALIAS conduit_execution)
208-
target_link_libraries(conduit_execution INTERFACE conduit)
209-
install(TARGETS conduit_execution EXPORT conduit)
210-
211210

212211
#################################
213212
# Fortran related target options

0 commit comments

Comments
 (0)