From 40a60c02bbf093cce35c1ac8e1e4bcd9ae62dc47 Mon Sep 17 00:00:00 2001
From: Bert Peters <bert@bertptrs.nl>
Date: Fri, 16 Mar 2018 14:31:48 +0100
Subject: [PATCH] Improve CMakeLists.txt

---
 CMakeLists.txt            | 10 +++++-----
 src/ActivityAnimation.cpp |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0f0d7b3..65778c8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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
diff --git a/src/ActivityAnimation.cpp b/src/ActivityAnimation.cpp
index 06cb341..7922ad3 100644
--- a/src/ActivityAnimation.cpp
+++ b/src/ActivityAnimation.cpp
@@ -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,