Merge pull request #1635 from alalek:cmake_fix_export_java