diff --git a/CMakeLists.txt b/CMakeLists.txt
index b82757c2ef91e5e1e3c1688cbe2359dbf3c48897..3d41c4f58421aab7ff9971c7177bf538a03e3afa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,14 +22,13 @@ if(N_CORES GREATER 1)
 endif()
 message("Build will be performed on ${N_CORES} cores.")
 
-#TODO rewrite to use add_compile_definitions
 #TODO use just locally, where needed
 if(WIN32)
-    add_compile_options("/D BOOST_ALL_NO_LIB")
-    add_compile_options("/D NOMINMAX")
+    add_compile_definitions(BOOST_ALL_NO_LIB NOMINMAX)
 else()
-	add_compile_options(-DBOOST_TEST_DYN_LINK -DARMA_DONT_USE_WRAPPER)
+	add_compile_definitions(BOOST_TEST_DYN_LINK)
 endif()
+add_compile_definitions(ARMA_DONT_USE_WRAPPER)
 
 #------------#
 # Build type #