Fixed CMakeLists.txt files to prevent CMake 3.0.0 warnings about deprecated LOCATION target property.
Small whitespace cleanup in CMakelLists.txt.

--HG--
branch : 3.2
extra : source : d559fd3c733a619af02a4cbedbbd08dab1c08f99