Set some values for Windows manually where autodetection

does not yet work.

svn path=/trunk/; revision=52406

diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 9537a0c727fe32dbf27d9429d8f6f02f1f822890..784518adc8ff0e6336af10bb556856a816391e84 100644 (file)
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -21,6 +21,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 
+include(CMakePushCheckState)
+
 #check system for includes
 include(CheckIncludeFile)
 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("netinet/in.h"        HAVE_NETINET_IN_H)
 check_include_file("netdb.h"             HAVE_NETDB_H)
-# XXX: We need to set the path to Wpdpack in order to find Ntddndis.h
-check_include_file("Ntddndis.h"          HAVE_NTDDNDIS_H)
+# We need to set the path to Wpdpack in order to find 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("pwd.h"               HAVE_PWD_H)
 check_include_file("stdarg.h"            HAVE_STDARG_H)
@@ -62,11 +67,10 @@ check_include_file("winsock2.h"          HAVE_WINSOCK2_H)
 
 #Functions
 include(CheckFunctionExists)
-include(CMakePushCheckState)
 check_function_exists("chown"            HAVE_CHOWN)
 
 cmake_push_check_state()
-set(CMAKE_REQUIRED_LIBRARIES ¼{CMAKE_DL_LIBS})
+set(CMAKE_REQUIRED_LIBRARIES %{CMAKE_DL_LIBS})
 check_function_exists("dladdr"           HAVE_DLADDR)
 cmake_pop_check_state()
 

diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in
index d9a36cccdee4635614c4e2cef54dadb88a512418..e9a9b193036e3f3d34969e4c8333b77f0614bcb8 100644 (file)
--- a/cmakeconfig.h.in
+++ b/cmakeconfig.h.in
@@ -406,5 +406,16 @@
 #define _U_ ${C_UNUSED}
 
 #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