Changed to match updated CMake functions.
Merge remote-tracking branch 'origin/protoc_update' into next

Conflicts:
	CMakeLists.txt