summaryrefslogtreecommitdiff
path: root/ConfigureChecks.cmake
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2015-01-04 20:06:55 -0800
committerGuy Harris <guy@alum.mit.edu>2015-01-05 04:07:37 +0000
commit087723adb064f23e32849c3d2c0f851717ee8b28 (patch)
tree3082b3c3e3fb26cdd642520ef94834e6c73b7d33 /ConfigureChecks.cmake
parentfc39b9b151c94054d73e1aa8cdc4bb610045d661 (diff)
downloadwireshark-087723adb064f23e32849c3d2c0f851717ee8b28.tar.gz
Suppress the check for ' as a formatting character on Windows.
Change-Id: I006359faeeeb5d01ecdb57878c599c5e8a93a77f Reviewed-on: https://code.wireshark.org/review/6319 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ConfigureChecks.cmake')
-rw-r--r--ConfigureChecks.cmake6
1 files changed, 5 insertions, 1 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index d24f55213a..228da5758c 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -153,10 +153,14 @@ endif()
# be different from the system's printf since GLib can optionally use
# its own printf implementation.)
#
-if (CMAKE_CROSSCOMPILING)
+if (CMAKE_CROSSCOMPILING OR WIN32)
#
# Play it safe when cross-compiling.
#
+ # XXX - compiling and trying to run the test below appears
+ # to loop infinitely on Windows, and the locale is wrong in
+ # any case, so we don't do this on Window for now.
+ #
set(HAVE_GLIB_PRINTF_GROUPING FALSE)
else()
cmake_push_check_state()