Merge branch 'sm1' into 'develop'

CMake Base += include Heinz

See merge request !525

Base/CMakeLists.txt

@@ -27,6 +27,7 @@ target_include_directories(${lib}
     PUBLIC
     ${CMAKE_SOURCE_DIR}
     SYSTEM PUBLIC # needed for Mac and Win, even if they are implied under Linux
+    ${LibHeinz_INCLUDE_DIR}
     ${GSL_INCLUDE_DIR}
     ${FFTW3_INCLUDE_DIR}
     ${Boost_INCLUDE_DIRS}