(cherry picked from commit f52495c66b1b219f82729221e8023a86b28d54bf)
* clean up our custom CMakeList.txt (cherry picked from commit 93d1028d75ee4847ebcaa075f56a4d9e7632c33a)