Skip to content

Commit 12d3745

Browse files
compile CUDA targets via LANGUAGES definition
1 parent f9de3f1 commit 12d3745

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

CMakeLists.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
cmake_minimum_required(VERSION 3.10)
2-
project(gSLICr)
3-
4-
set(CMAKE_CXX_STANDARD 11)
2+
project(gSLICr LANGUAGES CXX CUDA)
53

64
IF(MSVC_IDE)
75
set(OpenCV_STATIC OFF)
@@ -16,10 +14,9 @@ if(APPLE)
1614
set(CUDA_HOST_COMPILER /usr/bin/clang)
1715
endif(APPLE)
1816

19-
find_package(CUDA REQUIRED)
2017
find_package(OpenCV REQUIRED)
2118

22-
include_directories(${CUDA_INCLUDE_DIRS})
19+
include_directories(${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES})
2320
include_directories(${OpenCV_INCLUDE_DIRS})
2421
add_subdirectory(ORUtils)
2522

@@ -40,10 +37,13 @@ gSLICr_Lib/gSLICr.h
4037
list(APPEND "-ftree-vectorize")
4138
SOURCE_GROUP(engines FILES ${GSLICR_LIB})
4239

43-
cuda_add_library(gSLICr_lib
44-
${GSLICR_LIB}
45-
NVTimer.h)
40+
add_library(gSLICr_lib ${GSLICR_LIB} NVTimer.h)
4641
target_link_libraries(gSLICr_lib ${CUDA_LIBRARY})
42+
target_compile_features(gSLICr_lib PUBLIC cxx_std_11)
43+
set_target_properties(gSLICr_lib
44+
PROPERTIES CUDA_SEPARABLE_COMPILATION ON
45+
POSITION_INDEPENDENT_CODE ON
46+
)
4747

4848
add_executable(demo demo.cpp)
4949
target_link_libraries(demo gSLICr_lib ${OpenCV_LIBS})

ORUtils/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ SOURCE_GROUP("" FILES ${ORUTILS_HEADERS})
3838
add_library(ORUtils ${ORUTILS_OBJECTS})
3939

4040
IF(WITH_CUDA)
41-
# include_directories(${CUDA_INCLUDE_DIRS})
41+
# include_directories(${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES})
4242
# cuda_add_library(ITMLib
4343
# ${ITMLIB_CPU_OBJECTS}
4444
# ${ITMLIB_CUDA_OBJECTS}

0 commit comments

Comments
 (0)