Solve some path inconsistencies in external/CMakeLists.txt
Merge branch 'master' into release