Modified cmake build files since the consecutive calls to FIND_PACKAGE were replacing variables instead of appending to them as assumed.  There are still missing test files that will be committed to the main project and the python tests fail when serialization is turned off.