Merge pull request opencv#8176 from alalek:cmake_cleanup_msvc_checks

alalek · alalek · commit 156d736e75db · 2017-02-13T10:59:31.000Z
diff --git a/3rdparty/libtiff/CMakeLists.txt b/3rdparty/libtiff/CMakeLists.txt
@@ -11,11 +11,13 @@ check_include_file(assert.h HAVE_ASSERT_H)
 check_include_file(fcntl.h HAVE_FCNTL_H)
 check_include_file(io.h HAVE_IO_H)
 check_function_exists(jbg_newlen HAVE_JBG_NEWLEN)
-check_function_exists(mmap HAVE_MMAP)
 check_include_file(search.h HAVE_SEARCH_H)
 check_include_file(string.h HAVE_STRING_H)
 check_include_file(sys/types.h HAVE_SYS_TYPES_H)
-check_include_file(unistd.h HAVE_UNISTD_H)
+if(NOT MSVC)
+  check_include_file(unistd.h HAVE_UNISTD_H)
+  check_function_exists(mmap HAVE_MMAP)
+endif()
 
 if(WIN32 AND NOT WINRT)
   set(USE_WIN32_FILEIO 1)
diff --git a/3rdparty/zlib/CMakeLists.txt b/3rdparty/zlib/CMakeLists.txt
@@ -21,7 +21,9 @@ endif()
 #
 # Check for unistd.h
 #
-check_include_file(unistd.h Z_HAVE_UNISTD_H)
+if(NOT MSVC)
+  check_include_file(unistd.h Z_HAVE_UNISTD_H)
+endif()
 
 if(MSVC)
   add_definitions(-D_CRT_SECURE_NO_DEPRECATE)

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,9 @@ endif()`
`21`	`21`	`#`
`22`	`22`	`# Check for unistd.h`
`23`	`23`	`#`
`24`		`-check_include_file(unistd.h Z_HAVE_UNISTD_H)`
	`24`	`+if(NOT MSVC)`
	`25`	`+ check_include_file(unistd.h Z_HAVE_UNISTD_H)`
	`26`	`+endif()`
`25`	`27`
`26`	`28`	`if(MSVC)`
`27`	`29`	`add_definitions(-D_CRT_SECURE_NO_DEPRECATE)`