Changes provided by Patricia to fix the ability to locate some external packages with CMake