bert/research-project
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve CMakeLists.txt

Browse Source
This commit is contained in:
Bert Peters
2018-03-16 14:31:48 +01:00
parent c814d274d4
commit 40a60c02bb
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

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

2
src/ActivityAnimation.cpp
View File

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