diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1288cd3c62ec95a1c7652ff38074b8332830ea5d..14d59a7fdebd00fc3e45c50ef493677c669d595a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,7 +43,7 @@ set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
 set(CMAKE_CXX_FLAGS_RELEASE "-O3 -g") # -O2 would not trade speed for size, neither O2/3 use fast-math 
 
 # clang produces a lot of unecessary warnings without this:
-add_compile_options("$<$<CXX_COMPILER_ID:Clang>:-Wno-nonportable-include-path>") 
+add_compile_options("$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>:-Wno-nonportable-include-path>")
 
 # unit testing coverage, does not work yet
 #include (CodeCoverage)
@@ -61,6 +61,10 @@ add_compile_options("$<$<CXX_COMPILER_ID:Clang>:-Wno-nonportable-include-path>")
 
 # dependencies
 find_package (Boost 1.60 REQUIRED)
+if (Boost_FOUND)
+  include_directories(${Boost_INCLUDE_DIRS})
+endif (Boost_FOUND)
+
 find_package (Eigen3 REQUIRED)
 #find_package (HDF5) # not yet needed