Merge pull request #1870 from nmulcahey/cmake

cmake: Use ${CMAKE_COMMAND} instead of `cmake`