Merge pull request #18938 from tchaikov/wip-cmake

author Kefu Chai <tchaikov@gmail.com>

Wed, 29 Nov 2017 07:38:16 +0000 (15:38 +0800)

committer GitHub <noreply@github.com>

Wed, 29 Nov 2017 07:38:16 +0000 (15:38 +0800)
author Kefu Chai <tchaikov@gmail.com>
Wed, 29 Nov 2017 07:38:16 +0000 (15:38 +0800)
committer GitHub <noreply@github.com>
Wed, 29 Nov 2017 07:38:16 +0000 (15:38 +0800)
diff --cc CMakeLists.txt
Simple merge
diff --cc src/CMakeLists.txt
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Wed, 29 Nov 2017 07:38:16 +0000 (15:38 +0800)
committer	GitHub <noreply@github.com>
	Wed, 29 Nov 2017 07:38:16 +0000 (15:38 +0800)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history