diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2017-10-23 19:00:27 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2017-10-24 22:00:46 +0000 |
| commit | e1ef8e5f7555a1608d0cddde6c824c5a897f6e58 (patch) | |
| tree | 9da653772c2ba7d97ac17385597811bd86aa3f06 /ConfigureChecks.cmake | |
| parent | 08a490328387eafb7f9d20293a2a5e97e6cf4268 (diff) | |
Test g_printf() thousands grouping flag at runtime
This tests the runtime environment so avoid hard-coding it during the build.
For now we avoid messing with locales for the test, unless it turns out to
be necessary (ISO C printf behaviour with invalid conversion specifier is
undefined).
Change-Id: I341c2ab5e716973689cf9002f13435404a41369f
Reviewed-on: https://code.wireshark.org/review/24038
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'ConfigureChecks.cmake')
| -rw-r--r-- | ConfigureChecks.cmake | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index c4bd431a1a..99732f9e7d 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -185,41 +185,6 @@ if (NL_FOUND) endif() # -# Check whether GLib's printf supports thousands grouping. (This might -# be different from the system's printf since GLib can optionally use -# its own printf implementation.) -# -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() - set(CMAKE_REQUIRED_INCLUDES ${GLIB2_INCLUDE_DIRS}) - set(CMAKE_REQUIRED_LIBRARIES ${GLIB2_LIBRARIES}) - check_c_source_runs( - "#include <glib.h> - #include <locale.h> - #include <stdio.h> - #include <string.h> - - int - main () - { - gchar *str; - setlocale(LC_ALL, \"en_US.UTF-8\"); - str = g_strdup_printf(\"%'u\", 123456); - return (strcmp (str, \"123,456\") != 0); - }" HAVE_GLIB_PRINTF_GROUPING) - cmake_pop_check_state() -endif() - -# # Editor modelines - http://www.wireshark.org/tools/modelines.html # # Local variables: |