cmake_policy fix
config.h fix

only inlcude C++ header if compiling C++ code
Merge branch 'master' into unit_test