MOre module find updfates.
Merge pull request #365 from joakim-hove/osx-cmake

MOre module find updfates.