Reverted renaming of cmake variable, as it caused issues on Linux
p4#: 21356