Merge pull request #12925 from alalek:fix_cmake_conditions

author Alexander Alekhin <alexander.a.alekhin@gmail.com>

Thu, 25 Oct 2018 11:52:39 +0000 (11:52 +0000)

committer Alexander Alekhin <alexander.a.alekhin@gmail.com>

Thu, 25 Oct 2018 11:52:39 +0000 (11:52 +0000)
author Alexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 25 Oct 2018 11:52:39 +0000 (11:52 +0000)
committer Alexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 25 Oct 2018 11:52:39 +0000 (11:52 +0000)
diff --cc CMakeLists.txt
Simple merge
diff --cc cmake/OpenCVCompilerOptimizations.cmake
Simple merge
diff --cc cmake/OpenCVFindIPP.cmake
Simple merge
author	Alexander Alekhin <alexander.a.alekhin@gmail.com>
	Thu, 25 Oct 2018 11:52:39 +0000 (11:52 +0000)
committer	Alexander Alekhin <alexander.a.alekhin@gmail.com>
	Thu, 25 Oct 2018 11:52:39 +0000 (11:52 +0000)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
cmake/OpenCVCompilerOptimizations.cmake	patch \|	diff1 \|	diff2 \|	blob \| history
cmake/OpenCVFindIPP.cmake	patch \|	diff1 \|	diff2 \|	blob \| history