simplify cmake files
Merge branch 'master' of github.com:d-tk/dtk

Conflicts:
	CMakeLists.txt