Update CMakeLists.txt
Removed unnecessary global components per ticket #68 and used standard code where applicable.
Removed unnecessary global components per ticket #68 and used standard code where applicable.
Merge pull request #8 from ldilley/master

Elimination of global components