1berry/wireshark
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set some values for Windows manually where autodetection

Browse Source 
does not yet work.

svn path=/trunk/; revision=52406
This commit is contained in:
Jörg Mayer 2013-10-06 16:11:50 +00:00
parent efb42cf8dc
commit db512010b3
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ConfigureChecks.cmake
View File

@ -21,6 +21,8 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# #
include(CMakePushCheckState)
#check system for includes #check system for includes
include(CheckIncludeFile) include(CheckIncludeFile)
check_include_file("arpa/inet.h" HAVE_ARPA_INET_H) check_include_file("arpa/inet.h" HAVE_ARPA_INET_H)
@ -37,8 +39,11 @@ check_include_file("lauxlib.h" HAVE_LAUXLIB_H)
check_include_file("memory.h" HAVE_MEMORY_H) check_include_file("memory.h" HAVE_MEMORY_H)
check_include_file("netinet/in.h" HAVE_NETINET_IN_H) check_include_file("netinet/in.h" HAVE_NETINET_IN_H)
check_include_file("netdb.h" HAVE_NETDB_H) check_include_file("netdb.h" HAVE_NETDB_H)
# XXX: We need to set the path to Wpdpack in order to find Ntddndis.h # We need to set the path to Wpdpack in order to find Ntddndis.h
check_include_file("Ntddndis.h" HAVE_NTDDNDIS_H) #cmake_push_check_state()
#set(CMAKE_REQUIRED_INCLUDES %{PCAP_INCLUDE_DIRS})
#check_include_file("Ntddndis.h" HAVE_NTDDNDIS_H)
#cmake_pop_check_state()
check_include_file("portaudio.h" HAVE_PORTAUDIO_H) check_include_file("portaudio.h" HAVE_PORTAUDIO_H)
check_include_file("pwd.h" HAVE_PWD_H) check_include_file("pwd.h" HAVE_PWD_H)
check_include_file("stdarg.h" HAVE_STDARG_H) check_include_file("stdarg.h" HAVE_STDARG_H)
@ -62,11 +67,10 @@ check_include_file("winsock2.h" HAVE_WINSOCK2_H)
#Functions #Functions
include(CheckFunctionExists) include(CheckFunctionExists)
include(CMakePushCheckState)
check_function_exists("chown" HAVE_CHOWN) check_function_exists("chown" HAVE_CHOWN)
cmake_push_check_state() cmake_push_check_state()
set(CMAKE_REQUIRED_LIBRARIES ¼{CMAKE_DL_LIBS}) set(CMAKE_REQUIRED_LIBRARIES %{CMAKE_DL_LIBS})
check_function_exists("dladdr" HAVE_DLADDR) check_function_exists("dladdr" HAVE_DLADDR)
cmake_pop_check_state() cmake_pop_check_state()

13
cmakeconfig.h.in
View File

@ -406,5 +406,16 @@
#define _U_ ${C_UNUSED} #define _U_ ${C_UNUSED}
#if defined(_WIN32) #if defined(_WIN32)
typedef long ssize_t; # if !defined(QT_VERSION) || !defined(_SSIZE_T_DEFINED)
typedef int ssize_t;
# endif
/* FIXME: Detection doesn't work */
# define HAVE_NTDDNDIS_H 1
# define strncasecmp strnicmp
# ifndef __STDC__
# define __STDC__ 0
# endif
/* Use Unicode in Windows runtime functions. */
# define UNICODE 1
# define _UNICODE 1
#endif #endif