aboutsummaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorPetri Lehtinen <petri@digip.org>2024-03-31 22:02:09 +0300
committerGitHub <noreply@github.com>2024-03-31 22:02:09 +0300
commit50953fb1faccced4d80c02c17b076d5b06910f84 (patch)
tree8f894751c1d164c1b4b3b1774a5b740869009925 /cmake
parent8660da0f7c8fab46131747380237d08aa9f8fdb4 (diff)
parentc780171cf3a923e0cfbf4cda9b065570a1762015 (diff)
downloadjansson-50953fb1faccced4d80c02c17b076d5b06910f84.zip
jansson-50953fb1faccced4d80c02c17b076d5b06910f84.tar.gz
jansson-50953fb1faccced4d80c02c17b076d5b06910f84.tar.bz2
Merge pull request #680 from akheron/dtoa
Use `dtoa()` for optimal encoding of reals
Diffstat (limited to 'cmake')
-rw-r--r--cmake/jansson_config.h.cmake7
-rw-r--r--cmake/jansson_private_config.h.cmake9
2 files changed, 13 insertions, 3 deletions
diff --git a/cmake/jansson_config.h.cmake b/cmake/jansson_config.h.cmake
index 542e57b..9fe1b53 100644
--- a/cmake/jansson_config.h.cmake
+++ b/cmake/jansson_config.h.cmake
@@ -21,9 +21,10 @@
#define JANSSON_USING_CMAKE
#endif
-/* Note: when using cmake, JSON_INTEGER_IS_LONG_LONG is not defined nor used,
- * as we will also check for __int64 etc types.
- * (the definition was used in the automake system) */
+/* If your compiler supports the `long long` type and the strtoll()
+ library function, JSON_INTEGER_IS_LONG_LONG is defined to 1,
+ otherwise to 0. */
+#cmakedefine JSON_INTEGER_IS_LONG_LONG 1
/* Bring in the cmake-detected defines */
#cmakedefine HAVE_STDINT_H 1
diff --git a/cmake/jansson_private_config.h.cmake b/cmake/jansson_private_config.h.cmake
index b7c4514..1fb14f4 100644
--- a/cmake/jansson_private_config.h.cmake
+++ b/cmake/jansson_private_config.h.cmake
@@ -21,6 +21,8 @@
#cmakedefine HAVE_LOCALE_H 1
#cmakedefine HAVE_SETLOCALE 1
+#cmakedefine WORDS_BIGENDIAN 1
+
#cmakedefine HAVE_INT32_T 1
#ifndef HAVE_INT32_T
# define int32_t @JSON_INT32@
@@ -50,4 +52,11 @@
#cmakedefine USE_URANDOM 1
#cmakedefine USE_WINDOWS_CRYPTOAPI 1
+#cmakedefine USE_DTOA 1
+#if USE_DTOA
+# define DTOA_ENABLED 1
+#else
+# define DTOA_ENABLED 0
+#endif
+
#define INITIAL_HASHTABLE_ORDER @JANSSON_INITIAL_HASHTABLE_ORDER@