Make it easier to add dependance on build_test option
Merge branch 'cmake_build' of github.com:izissise/PFA into cmake_build

Conflicts:
	CMakeLists.txt