Skip to content

Commit f762be9

Browse files
author
=
committed
Made gpu modules work.
1 parent a509c75 commit f762be9

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

cmake/pcl_find_cuda.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ if(CUDA_FOUND)
4747
message(STATUS "CMAKE_CUDA_ARCHITECTURES: ${CMAKE_CUDA_ARCHITECTURES}")
4848

4949
#Add empty project as its not required with newer CMake
50-
add_library(pcl_cuda INTERFACE)
50+
PCL_ADD_LIBRARY(pcl_cuda COMPONENT ekstern_cuda)
5151
else()
5252
# Generate SASS
5353
set(CMAKE_CUDA_ARCHITECTURES ${CUDA_ARCH_BIN})
@@ -56,7 +56,7 @@ if(CUDA_FOUND)
5656
set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -gencode arch=compute_${ver},code=compute_${ver}")
5757
message(STATUS "CMAKE_CUDA_FLAGS: ${CMAKE_CUDA_FLAGS}")
5858

59-
add_library(pcl_cuda INTERFACE)
59+
PCL_ADD_LIBRARY(pcl_cuda COMPONENT ekstern_cuda)
6060
target_include_directories(pcl_cuda INTERFACE ${CUDA_TOOLKIT_INCLUDE})
6161

6262
endif ()

cmake/pcl_targets.cmake

+8
Original file line numberDiff line numberDiff line change
@@ -290,9 +290,17 @@ function(PCL_CUDA_ADD_LIBRARY _name)
290290
set_target_properties(${_name} PROPERTIES FOLDER "Libraries")
291291

292292
install(TARGETS ${_name}
293+
EXPORT ${_name}Targets
293294
RUNTIME DESTINATION ${BIN_INSTALL_DIR} COMPONENT pcl_${ARGS_COMPONENT}
294295
LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT pcl_${ARGS_COMPONENT}
295296
ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT pcl_${ARGS_COMPONENT})
297+
298+
install(
299+
EXPORT ${_name}Targets
300+
NAMESPACE pcl::
301+
FILE ${_name}.cmake
302+
DESTINATION ${LIB_INSTALL_DIR}/cmake
303+
)
296304
endfunction()
297305

298306
###############################################################################

cuda/io/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ set(incs
3737
set(LIB_NAME "pcl_${SUBSYS_NAME}")
3838
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
3939
PCL_CUDA_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs})
40-
target_link_libraries(${LIB_NAME} pcl_common)
40+
target_link_libraries(${LIB_NAME} pcl_common pcl_io)
4141

4242
PCL_MAKE_PKGCONFIG(${LIB_NAME} COMPONENT ${SUBSYS_NAME} DESC ${SUBSYS_DESC} PCL_DEPS ${SUBSYS_DEPS} EXT_DEPS ${SUBSYS_EXT_DEPS})
4343

0 commit comments

Comments
 (0)