[CMake] headers and recompile part II

[Duncan Mac-Vicar Prett]

Adding

SET (CMAKE_INCLUDE_DIRECTORIES_BEFORE ON)

before

INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR} 
${CMAKE_CURRENT_BINARY_DIR} )

seems to do the trick, and fixes the dependencies later.

Still looks like a hack ;-)

Duncan