Improve CMakeLists.txt

This commit is contained in:
2018-03-16 14:31:48 +01:00
parent c814d274d4
commit 40a60c02bb
2 changed files with 6 additions and 6 deletions

View File

@@ -7,9 +7,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules")
# Enable modern C++ features
set(CMAKE_CXX_STANDARD 17)
# Enable better warnings
set(COMPILE_OPTIONS "-Wall -Wextra -pedantic")
# Define executable and dependencies
file(GLOB fmri_SRC
"src/*.cpp"
@@ -18,14 +15,17 @@ file(GLOB fmri_SRC
add_executable(fmri ${fmri_SRC})
# Enable better warnings
target_compile_options(fmri PRIVATE "-Wall" "-Wextra" "-pedantic")
# Enable CUDA if available
find_package(CUDA)
if (CUDA_FOUND)
include_directories(${CUDA_INCLUDE_DIRS})
target_link_libraries(fmri ${CUDA_LIBS})
else(CUDA_FOUND)
else()
add_definitions(-DCPU_ONLY)
endif(CUDA_FOUND)
endif()
# Library dependencies

View File

@@ -16,7 +16,7 @@ ActivityAnimation::Color ActivityAnimation::colorBySign(float intensity)
} else {
return {1, 0, 0};
}
};
}
ActivityAnimation::ActivityAnimation(
const std::vector<std::pair<DType, std::pair<std::size_t, std::size_t>>> &interactions, const float *aPositions,