Merge pull request #8013 from ricardoquesada/more_cmake_fixes

even more cmake fixes
fix text only button issue
fix text doesn't scale with button issue
change return const value to  value
Merge pull request #8015 from andyque/fixButtonIssue

Fix text only button can't be touched issue