Skip to content

update CMake 3.8 support for CUDA 9, makes CUDA C++ an intrinsically … #1

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

Open
erwincoumans wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update CMake 3.8 support for CUDA 9, makes CUDA C++ an intrinsically … #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 10 additions & 7 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
cmake_minimum_required(VERSION 3.0)

project(cis565_rasterizer)
project(cis565_rasterizer LANGUAGES CXX CUDA)


set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})

Expand Down Expand Up @@ -48,9 +49,9 @@ set(CUDA_PROPAGATE_HOST_FLAGS OFF)
set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
list(APPEND CUDA_NVCC_FLAGS_DEBUG -O0 -g -G)
list(APPEND CUDA_NVCC_FLAGS_RELWITHDEBINFO -O2 -g -lineinfo)
list(APPEND CUDA_NVCC_FLAGS_RELEASE -O3 -DNDEBUG)
#list(APPEND CUDA_NVCC_FLAGS_DEBUG -O0 -g -G)
#list(APPEND CUDA_NVCC_FLAGS_RELWITHDEBINFO -O2 -g -lineinfo)
#list(APPEND CUDA_NVCC_FLAGS_RELEASE -O3 -DNDEBUG)
if (WIN32)
set(CUDA_PROPAGATE_HOST_FLAGS ON)
set(CMAKE_CXX_FLAGS "/MD /EHsc /D _CRT_SECURE_NO_WARNINGS")
Expand All @@ -76,20 +77,22 @@ if (WIN32)
endif()

# CUDA linker options
find_package(Threads REQUIRED)
find_package(CUDA 8.0 REQUIRED)
#find_package(Threads REQUIRED)
#find_package(CUDA 8.0 REQUIRED)
set(CUDA_ATTACH_VS_BUILD_RULE_TO_CUDA_FILE ON)
set(CUDA_SEPARABLE_COMPILATION ON)

#add_subdirectory(stream_compaction) # TODO: uncomment if using your own stream compaction
add_subdirectory(src)
add_subdirectory(util)

cuda_add_executable(${CMAKE_PROJECT_NAME}
add_executable(${CMAKE_PROJECT_NAME}
"src/main.hpp"
"src/main.cpp"
)

target_compile_features(${CMAKE_PROJECT_NAME} PUBLIC cxx_std_11)

target_link_libraries(${CMAKE_PROJECT_NAME}
src
util
Expand Down
3 changes: 1 addition & 2 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ set(SOURCE_FILES
"rasterizeTools.h"
)

cuda_add_library(src
add_library(src
${SOURCE_FILES}
OPTIONS -arch=sm_20
)
3 changes: 1 addition & 2 deletions util/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ set(SOURCE_FILES
"tiny_gltf_loader.h"
)

cuda_add_library(util
add_library(util
${SOURCE_FILES}
OPTIONS -arch=sm_52
)