Merge pull request #23300 from tchaikov/wip-cmake-cleanup

author Kefu Chai <tchaikov@gmail.com>

Thu, 2 Aug 2018 02:14:09 +0000 (10:14 +0800)

committer GitHub <noreply@github.com>

Thu, 2 Aug 2018 02:14:09 +0000 (10:14 +0800)
author Kefu Chai <tchaikov@gmail.com>
Thu, 2 Aug 2018 02:14:09 +0000 (10:14 +0800)
committer GitHub <noreply@github.com>
Thu, 2 Aug 2018 02:14:09 +0000 (10:14 +0800)
diff --cc CMakeLists.txt
Simple merge
diff --cc src/CMakeLists.txt
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Thu, 2 Aug 2018 02:14:09 +0000 (10:14 +0800)
committer	GitHub <noreply@github.com>
	Thu, 2 Aug 2018 02:14:09 +0000 (10:14 +0800)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history