osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

CMake: Skip more header checks on Windows. 

Prepopulate our header variables at the top of CMakeLists.txt. Add
HAVE_STDINT_H and HAVE_STDDEF_H.

Change-Id: I78cbe9d6dc3775caad5c565de0100863a9dc8054
Reviewed-on: https://code.wireshark.org/review/27587
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2018-05-16 10:58:11 -07:00
parent d0823e3920
commit 1feea92ef3
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -123,6 +123,19 @@ if(WIN32)
# Head off any attempts to use Cygwin's Python.
include(LocatePythonExecutable)
# Prepopulate some ConfigureChecks values. Compilation checks
# on Windows can be slow.
set(HAVE_FCNTL_H TRUE)
set(HAVE_SYS_STAT_H TRUE)
set(HAVE_FLOORL TRUE)
set(HAVE_LRINT TRUE)
# It looks like we call check_type_size somewhere, which checks
# for these.
set(HAVE_SYS_TYPES_H TRUE)
set(HAVE_STDINT_H TRUE)
set(HAVE_STDDEF_H TRUE)
endif(WIN32)
include(UseCustomIncludes)

8
ConfigureChecks.cmake
View File

@ -9,14 +9,6 @@
include(CMakePushCheckState)
if(WIN32)
# Prepopulate some values. Compilation checks on Windows can be slow.
set(HAVE_FCNTL_H TRUE)
set(HAVE_SYS_STAT_H TRUE)
set(HAVE_FLOORL TRUE)
set(HAVE_LRINT TRUE)
endif(WIN32)
#check system for includes
include(CheckIncludeFile)
check_include_file("arpa/inet.h" HAVE_ARPA_INET_H)