Fix by John to get gmock and gmock_main to build