Merge pull request #643 from ricnewton/master

Fix cmake file for security tests