diff --git a/CMakeLists.txt b/CMakeLists.txt
index e821a0e738ff19bd8fcb48574d004dfc8073c7dc..ef4f842daf1e0c264f47dfd0771b576a545eb391 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,13 +42,13 @@ OPTION( ScalFMM_USE_BLAS "Set to ON to build ScaFMM with BLAS" OFF )
 OPTION( ScalFMM_USE_TRACE "Set to ON to print trace or use itac trace" OFF )
 OPTION( ScalFMM_BUILD_TESTS "Set to ON to build fonctionnalities Tests" OFF )
 OPTION( ScalFMM_BUILD_UTESTS "Set to ON to build UTests" OFF )
-OPTION( ScalFMM_BUILD_DEBUG          "Set to ON to build in Debug"              OFF )
-OPTION( ScalFMM_USE_MEM_STATS        "Set to ON to profile memory"              OFF )
-OPTION( ScalFMM_USE_DOUBLE_PRECISION "Set to ON to compile in double precision" ON  )
-OPTION( ScalFMM_ATTACHE_SOURCE       "Set to ON to compile with -g"             OFF )
-OPTION( ScalFMM_USE_ADDONS           "Set to ON to compile add ons"             OFF )
-OPTION( ScalFMM_USE_SSE              "Set to ON to compile with sse support"    ON  )
-
+OPTION( ScalFMM_BUILD_DEBUG          "Set to ON to build in Debug"                 OFF )
+OPTION( ScalFMM_USE_LOG              "Set to ON to print output debug information" OFF )
+OPTION( ScalFMM_USE_MEM_STATS        "Set to ON to profile memory"                 OFF )
+OPTION( ScalFMM_USE_DOUBLE_PRECISION "Set to ON to compile in double precision"    ON  )
+OPTION( ScalFMM_ATTACHE_SOURCE       "Set to ON to compile with -g"                OFF )
+OPTION( ScalFMM_USE_ADDONS           "Set to ON to compile add ons"                OFF )
+OPTION( ScalFMM_USE_SSE              "Set to ON to compile with sse support"       ON  )
 # Set scalfmm to default libraries
 SET(SCALFMM_LIBRARIES "")
 
@@ -62,7 +62,7 @@ endif()
 
 # Debug
 MESSAGE( STATUS "ScalFMM_BUILD_DEBUG          = ${ScalFMM_BUILD_DEBUG}" )
-if( ScalfMM_BUILD_DEBUG )
+if( ScalFMM_BUILD_DEBUG )
   SET(CMAKE_BUILD_TYPE Debug)
   ADD_DEFINITIONS(-O0)
 
diff --git a/ScalFMMConfig.cmake.in b/ScalFMMConfig.cmake.in
index 5de036b29f89c76a95cafef056d3a59d8668859a..8233e8b22e878f9d2ac07071614f340cc60100f9 100644
--- a/ScalFMMConfig.cmake.in
+++ b/ScalFMMConfig.cmake.in
@@ -33,7 +33,7 @@ SET(ScalFMM_USE_MEM_STATS        "@ScalFMM_USE_MEM_STATS@")
 SET(ScalFMM_USE_SSE              "@ScalFMM_USE_SSE@")
 SET(ScalFMM_FLAGS                "@ScaLFMM_FLAGS_OPTI@")
 SET(ScalFMM_USE_ADDONS           "@ScalFMM_USE_ADDONS@")
-#SET(ScalFMM_FLAGS   "@@")
+SET(ScalFMM_USE_LOG              "@ScalFMM_USE_LOG@")
 #SET(ScalFMM_FLAGS   "@@")
 #SET(ScalFMM_FLAGS   "@@")
 #
diff --git a/Src/ScalFmmConfig.h.cmake b/Src/ScalFmmConfig.h.cmake
index a3997cde0f0a7e418143a751c03ebe843964fab1..0cdeca23f158cb2db3d7933c0b769d536d4ea0f0 100755
--- a/Src/ScalFmmConfig.h.cmake
+++ b/Src/ScalFmmConfig.h.cmake
@@ -10,6 +10,12 @@
 // ===================================================================================
 #ifndef SSCALFMMCONFIG_H
 #define SSCALFMMCONFIG_H
+///////////////////////////////////////////////////////
+// Debug
+///////////////////////////////////////////////////////
+
+// Uncomment the next line to use debug mode
+#cmakedefine ScalFMM_USE_LOG
 
 ///////////////////////////////////////////////////////
 // Blas
diff --git a/Src/Utils/FDebug.hpp b/Src/Utils/FDebug.hpp
index dc6bb8f2fa880239e816f2fc5659f0b790324f8d..eb48844941095a9fa5fed4e7b8de6b129d9e9334 100755
--- a/Src/Utils/FDebug.hpp
+++ b/Src/Utils/FDebug.hpp
@@ -15,12 +15,13 @@
 // ===================================================================================
 #ifndef FDEBUG_HPP
 #define FDEBUG_HPP
+#include <iostream>
 
 
 #include "FGlobal.hpp"
 #include "FNoCopyable.hpp"
 
-#ifndef SCALFMM_USE_DEBUG
+#ifndef ScalFMM_USE_LOG
 
 #define FDEBUG( X )
 
diff --git a/Src/Utils/FGlobal.hpp b/Src/Utils/FGlobal.hpp
index c36524c25b334a72a2f729bb0cf058e91b046506..31146b8647985680356fba83ec86618502ab452d 100755
--- a/Src/Utils/FGlobal.hpp
+++ b/Src/Utils/FGlobal.hpp
@@ -40,12 +40,6 @@
     #define POSIX
 #endif
 
-///////////////////////////////////////////////////////
-// Debug
-///////////////////////////////////////////////////////
-
-// Uncomment the next line to use debug mode
-#define SCALFMM_USE_DEBUG
 
 ///////////////////////////////////////////////////////
 // Types