Skip to content

Commit 554c976

Browse files
committed
fixed build on linux
1 parent af83e2f commit 554c976

File tree

3 files changed

+34
-44
lines changed

3 files changed

+34
-44
lines changed

CMakeLists.txt

Lines changed: 32 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -22,51 +22,46 @@ set(CMAKE_CXX_STANDARD 11)
2222
set(CMAKE_CXX_STANDARD_REQUIRED ON)
2323
SET(CMAKE_DEBUG_POSTFIX "_d")
2424

25-
find_package(CUDA 9.0 REQUIRED)
26-
2725
set (INCLUDE_HEADERS
28-
include/PointSet.h
29-
include/ActivationTable.h
30-
include/Common.h
31-
include/cuNSearch.h
32-
)
26+
include/PointSet.h
27+
include/ActivationTable.h
28+
include/Common.h
29+
include/cuNSearch.h
30+
)
3331

3432
set (HEADER_FILES
35-
src/Types.h
36-
src/cuNSearchDeviceData.h
37-
src/GridInfo.h
38-
src/NotImplementedException.h
39-
src/PointSetImplementation.h
40-
src/cuNSearchKernels.cuh
41-
src/helper_linearIndex.h
42-
src/helper_mortonCode.h
43-
Utils/cuda_helper.h
44-
Utils/Timing.h
45-
Utils/IDFactory.h
46-
)
33+
src/Types.h
34+
src/cuNSearchDeviceData.h
35+
src/GridInfo.h
36+
src/NotImplementedException.h
37+
src/PointSetImplementation.h
38+
src/cuNSearchKernels.cuh
39+
src/helper_linearIndex.h
40+
src/helper_mortonCode.h
41+
Utils/cuda_helper.h
42+
Utils/Timing.h
43+
Utils/IDFactory.h
44+
)
4745

4846
set (SOURCE_FILES
49-
src/PointSet.cpp
50-
src/PointSetImplementation.cu
51-
src/cuNSearch.cu
52-
src/cuNSearchDeviceData.cu
53-
src/cuNSearchKernels.cu
54-
Utils/cuda_helper.cpp
55-
Utils/Timing.cpp
56-
Utils/IDFactory.cpp
57-
)
58-
59-
include_directories(
60-
"include"
61-
"Utils"
62-
${CUDA_INCLUDE_DIRS}
63-
${CUDA_CUT_INCLUDE_DIR}
64-
)
65-
47+
src/PointSet.cu
48+
src/PointSetImplementation.cu
49+
src/cuNSearch.cu
50+
src/cuNSearchDeviceData.cu
51+
src/cuNSearchKernels.cu
52+
Utils/cuda_helper.cpp
53+
Utils/Timing.cpp
54+
Utils/IDFactory.cpp
55+
)
6656

6757
add_library(cuNSearch STATIC ${INCLUDE_HEADERS} ${HEADER_FILES} ${SOURCE_FILES})
6858

69-
target_link_libraries(cuNSearch ${CUDA_LIBRARIES})
59+
target_include_directories(cuNSearch PUBLIC
60+
"include"
61+
"Utils"
62+
${CUDA_INCLUDE_DIRS}
63+
)
64+
target_link_libraries(cuNSearch PUBLIC ${CUDA_LIBRARIES})
7065
target_compile_definitions(cuNSearch PUBLIC $<$<CONFIG:DEBUG>:DEBUG>)
7166

7267
install(FILES ${INCLUDE_HEADERS}

demo/CMakeLists.txt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
project(Demo LANGUAGES CXX CUDA)
2-
3-
include_directories("../include")
4-
51
add_executable(Demo
62
main.cu
73
)
8-
9-
target_link_libraries(Demo cuNSearch)
10-
target_compile_definitions(Demo PUBLIC $<$<CONFIG:DEBUG>:DEBUG>)
4+
add_dependencies(Demo cuNSearch)
5+
target_link_libraries(Demo PRIVATE cuNSearch)
File renamed without changes.

0 commit comments

Comments
 (0)