Merge pull request #109 from open-source-parsers/double-string-double

Double string double
1.1.0 <- 1.0.0
2025-10-15 23:20:05 +02:00 · 2015-01-06 12:54:39 -06:00 · 2015-01-06 12:46:17 -06:00 · 2015-01-06 12:40:36 -06:00 · 2015-01-06 12:14:48 -06:00 · 2015-01-06 12:11:12 -06:00
8 changed files with 44 additions and 24 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,15 +17,17 @@ IF(NOT WIN32)
    ENDIF(NOT CMAKE_BUILD_TYPE)
 ENDIF(NOT WIN32)

+SET(LIB_SUFFIX "" CACHE STRING "Optional arch-dependent suffix for the library installation directory")
+
 SET(RUNTIME_INSTALL_DIR bin
    CACHE PATH "Install dir for executables and dlls")
-SET(ARCHIVE_INSTALL_DIR lib
+SET(ARCHIVE_INSTALL_DIR lib${LIB_SUFFIX}
    CACHE PATH "Install dir for static libraries")
-SET(LIBRARY_INSTALL_DIR lib
+SET(LIBRARY_INSTALL_DIR lib${LIB_SUFFIX}
    CACHE PATH "Install dir for shared libraries")
 SET(INCLUDE_INSTALL_DIR include
    CACHE PATH "Install dir for headers")
-SET(PACKAGE_INSTALL_DIR lib/cmake
+SET(PACKAGE_INSTALL_DIR lib${LIB_SUFFIX}/cmake
    CACHE PATH "Install dir for cmake package config files")
 MARK_AS_ADVANCED( RUNTIME_INSTALL_DIR ARCHIVE_INSTALL_DIR INCLUDE_INSTALL_DIR PACKAGE_INSTALL_DIR )

@@ -101,7 +103,7 @@ IF(JSONCPP_WITH_PKGCONFIG_SUPPORT)
 		"pkg-config/jsoncpp.pc"
 		@ONLY)
 	INSTALL(FILES "${CMAKE_BINARY_DIR}/pkg-config/jsoncpp.pc"
-		DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
+		DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig")
 ENDIF(JSONCPP_WITH_PKGCONFIG_SUPPORT)

 IF(JSONCPP_WITH_CMAKE_PACKAGE)
--- a/include/json/version.h
+++ b/include/json/version.h
@@ -4,9 +4,9 @@
 #ifndef JSON_VERSION_H_INCLUDED
 # define JSON_VERSION_H_INCLUDED

-# define JSONCPP_VERSION_STRING "1.0.0"
+# define JSONCPP_VERSION_STRING "1.1.0"
 # define JSONCPP_VERSION_MAJOR 1
-# define JSONCPP_VERSION_MINOR 0
+# define JSONCPP_VERSION_MINOR 1
 # define JSONCPP_VERSION_PATCH 0
 # define JSONCPP_VERSION_QUALIFIER
 # define JSONCPP_VERSION_HEXA ((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) | (JSONCPP_VERSION_PATCH << 8))
--- a/pkg-config/jsoncpp.pc.in
+++ b/pkg-config/jsoncpp.pc.in
@@ -1,6 +1,6 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=${exec_prefix}/@LIBRARY_INSTALL_DIR@
 includedir=${prefix}/@INCLUDE_INSTALL_DIR@

 Name: jsoncpp
--- a/src/lib_json/CMakeLists.txt
+++ b/src/lib_json/CMakeLists.txt
@@ -1,4 +1,8 @@
 OPTION(JSONCPP_LIB_BUILD_SHARED "Build jsoncpp_lib as a shared library." OFF)
+IF(BUILD_SHARED_LIBS)
+  SET(JSONCPP_LIB_BUILD_SHARED ON)
+ENDIF(BUILD_SHARED_LIBS)
+
 IF(JSONCPP_LIB_BUILD_SHARED)
  SET(JSONCPP_LIB_TYPE SHARED)
  ADD_DEFINITIONS( -DJSON_DLL_BUILD )
@@ -6,9 +10,15 @@ ELSE(JSONCPP_LIB_BUILD_SHARED)
  SET(JSONCPP_LIB_TYPE STATIC)
 ENDIF(JSONCPP_LIB_BUILD_SHARED)

-
 if( CMAKE_COMPILER_IS_GNUCXX )
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=strict-aliasing")
+  #Get compiler version.
+  execute_process( COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
+                   OUTPUT_VARIABLE GNUCXX_VERSION )
+ 
+  #-Werror=* was introduced -after- GCC 4.1.2
+  if( GNUCXX_VERSION VERSION_GREATER 4.1.2 )
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=strict-aliasing")
+  endif()
 endif( CMAKE_COMPILER_IS_GNUCXX )

 SET( JSONCPP_INCLUDE_DIR ../../include )
@@ -39,12 +49,15 @@ ADD_LIBRARY( jsoncpp_lib ${JSONCPP_LIB_TYPE}
 SET_TARGET_PROPERTIES( jsoncpp_lib PROPERTIES OUTPUT_NAME jsoncpp )
 SET_TARGET_PROPERTIES( jsoncpp_lib PROPERTIES VERSION ${JSONCPP_VERSION} SOVERSION ${JSONCPP_VERSION_MAJOR} )

+IF(NOT CMAKE_VERSION VERSION_LESS 2.8.11)
+    TARGET_INCLUDE_DIRECTORIES( jsoncpp_lib PUBLIC
+                                $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>
+                                $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/${JSONCPP_INCLUDE_DIR}>
+                                )
+ENDIF(NOT CMAKE_VERSION VERSION_LESS 2.8.11)
+
 # Install instructions for this target
 IF(JSONCPP_WITH_CMAKE_PACKAGE)
-    TARGET_INCLUDE_DIRECTORIES( jsoncpp_lib
-                                PUBLIC $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>
-                                       $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/${JSON_INCLUDE_DIR}>
-                                )
    SET(INSTALL_EXPORT EXPORT jsoncpp)
 ELSE(JSONCPP_WITH_CMAKE_PACKAGE)
    SET(INSTALL_EXPORT)
--- a/src/lib_json/json_writer.cpp
+++ b/src/lib_json/json_writer.cpp
@@ -26,6 +26,11 @@
 #pragma warning(disable : 4996)
 #endif

+#if defined(__sun) && defined(__SVR4) //Solaris
+#include <ieeefp.h>
+#define isfinite finite
+#endif
+
 namespace Json {

 static bool containsControlCharacter(const char* str) {
@@ -82,13 +87,13 @@ std::string valueToString(double value) {
                                                      // visual studio 2005 to
                                                      // avoid warning.
 #if defined(WINCE)
-  len = _snprintf(buffer, sizeof(buffer), "%.16g", value);
+  len = _snprintf(buffer, sizeof(buffer), "%.17g", value);
 #else
-  len = sprintf_s(buffer, sizeof(buffer), "%.16g", value);
+  len = sprintf_s(buffer, sizeof(buffer), "%.17g", value);
 #endif
 #else
  if (isfinite(value)) {
-    len = snprintf(buffer, sizeof(buffer), "%.16g", value);
+    len = snprintf(buffer, sizeof(buffer), "%.17g", value);
  } else {
    // IEEE standard states that NaN values will not compare to themselves
    if (value != value) {
--- a/src/test_lib_json/main.cpp
+++ b/src/test_lib_json/main.cpp
@@ -926,7 +926,7 @@ JSONTEST_FIXTURE(ValueTest, integers) {
  JSONTEST_ASSERT_EQUAL(float(uint64ToDouble(Json::UInt64(1) << 63)),
                        val.asFloat());
  JSONTEST_ASSERT_EQUAL(true, val.asBool());
-  JSONTEST_ASSERT_STRING_EQUAL("9.223372036854776e+18",
+  JSONTEST_ASSERT_STRING_EQUAL("9.2233720368547758e+18",
                               normalizeFloatingPointStr(val.asString()));

  // int64 min
@@ -974,7 +974,7 @@ JSONTEST_FIXTURE(ValueTest, integers) {
  JSONTEST_ASSERT_EQUAL(-9223372036854775808.0, val.asDouble());
  JSONTEST_ASSERT_EQUAL(-9223372036854775808.0, val.asFloat());
  JSONTEST_ASSERT_EQUAL(true, val.asBool());
-  JSONTEST_ASSERT_STRING_EQUAL("-9.223372036854776e+18",
+  JSONTEST_ASSERT_STRING_EQUAL("-9.2233720368547758e+18",
                               normalizeFloatingPointStr(val.asString()));

  // 10^19
@@ -1065,7 +1065,7 @@ JSONTEST_FIXTURE(ValueTest, integers) {
  JSONTEST_ASSERT_EQUAL(18446744073709551616.0, val.asDouble());
  JSONTEST_ASSERT_EQUAL(18446744073709551616.0, val.asFloat());
  JSONTEST_ASSERT_EQUAL(true, val.asBool());
-  JSONTEST_ASSERT_STRING_EQUAL("1.844674407370955e+19",
+  JSONTEST_ASSERT_STRING_EQUAL("1.8446744073709552e+19",
                               normalizeFloatingPointStr(val.asString()));
 #endif
 }
@@ -1217,7 +1217,7 @@ JSONTEST_FIXTURE(ValueTest, nonIntegers) {
                        normalizeFloatingPointStr(val.asString()));

  val = Json::Value(1.2345678901234);
-  JSONTEST_ASSERT_STRING_EQUAL("1.2345678901234",
+  JSONTEST_ASSERT_STRING_EQUAL("1.2345678901234001",
                               normalizeFloatingPointStr(val.asString()));

  // A 16-digit floating point number.
--- a/test/runjsontests.py
+++ b/test/runjsontests.py
@@ -1,8 +1,8 @@
 from __future__ import print_function
+from glob import glob
 import sys
 import os
-import os.path
-from glob import glob
+import pipes
 import optparse

 VALGRIND_CMD = 'valgrind --tool=memcheck --leak-check=yes --undef-value-errors=yes '
@@ -56,7 +56,7 @@ def runAllTests( jsontest_executable_path, input_dir = None,
        options = is_json_checker_test and '--json-checker' or ''
        pipe = os.popen( "%s%s %s %s" % (
            valgrind_path, jsontest_executable_path, options,
-            input_path) )
+            pipes.quote(input_path)))
        process_output = pipe.read()
        status = pipe.close()
        if is_json_checker_test:
--- a/2
+++ b/2
@@ -1 +1 @@
-1.0.0
+1.1.0
Author	SHA1	Message	Date
Christopher Dunn	6eaf150dc7	Merge pull request #109 from open-source-parsers/double-string-double Double string double	2015-01-06 12:54:39 -06:00
Christopher Dunn	8b489f891a	1.1.0 <- 1.0.0	2015-01-06 12:46:17 -06:00
Christopher Dunn	65cee6ea16	fix double->string->double round-trip (bump minor ver.) See #98. http://stackoverflow.com/questions/747470/what-is-the-meaning-of-numeric-limitsdoubledigits10/16941784#16941784	2015-01-06 12:40:36 -06:00
Christopher Dunn	dfc5f879c1	Merge pull request #108 from open-source-parsers/quote-spaces quote cmdline arg	2015-01-06 12:14:48 -06:00
Christopher Dunn	1a4dc3a888	quote cmdline arg See #99.	2015-01-06 12:11:12 -06:00
Christopher Dunn	0f6884f771	Merge pull request #106 from Gachapen/fix_cmake_install Fix cmake_package install being broken because of wrong include path.	2015-01-06 11:50:13 -06:00
Magnus Bjerke Vik	748328a0d1	Fix cmake_package install being broken because of wrong include path. The TARGET_INCLUDE_DIRECTORIES from inside the IF(JSONCPP_WITH_CMAKE_PACKAGE) block was removed, since it only needs to be set once. In addition the CMAKE_VERSION check was simplified.	2015-01-06 09:51:44 +01:00
Christopher Dunn	f44278cd4e	Merge pull request #101 from dominicpezzuto/master Fix build issues related to Solaris and older GCC	2015-01-03 14:45:41 -06:00
dominicpezzuto	d2b6992f3e	Fix build issues related to Solaris and older GCC Fixed two build issues: - JsonCPP currently doesn’t compile for Solaris due to platform differences with ‘isfinite’ function. Fixed by adding proper include and define for Solaris. - JsonCPP currently doesn’t compile for GCC version 4.1.2 and earlier due to use of ‘-Werror=*’ compile flag, which was introduced in a later version. Fixed by adding version check to only add this flag on supported versions of GCC.	2014-12-27 16:45:40 -05:00
dominicpezzuto	54764dd85b	Fix build issues related to Solaris and older GCC Fixed two build issues: - JsonCPP currently doesn’t compile for Solaris due to platform differences with ‘isfinite’ function. Fixed by adding proper include and define for Solaris. - JsonCPP currently doesn’t compile for GCC version 4.1.2 and earlier due to use of ‘-Werror=*’ compile flag, which was introduced in a later version. Fixed by adding version check to only add this flag on supported versions of GCC.	2014-12-27 16:44:26 -05:00
Christopher Dunn	8dd32e1e2e	Merge pull request #94 from Gachapen/cmake_target_include CMake: Add include directory to jsoncpp_lib target Well-researched. Passes Travis CI.	2014-12-24 01:30:13 -06:00
Magnus Bjerke Vik	3fd7f8b470	CMake: Only add include directory to jsoncpp_lib target if CMake version supports the command.	2014-12-16 08:58:52 +01:00
Magnus Bjerke Vik	e99e6d9cc6	CMake: Add include directory to jsoncpp_lib target so that it can be easier used with other projects.	2014-12-03 15:42:41 +01:00
Christopher Dunn	9ca1aaab14	Merge pull request #93 from akien-mga/master Small packaging improvements	2014-12-02 00:40:08 -06:00
Rémi Verschelde	27639ce578	Add support for BUILD_SHARED_LIBS argument BUILD_SHARED_LIBS is a standard CMake argument that serves the purpose of the custom JSONCPP_LIB_BUILD_SHARED. For now we force JSONCPP_LIB_BUILD_SHARED to true if BUILD_SHARED_LIBS was defined. Workaround for #51.	2014-12-01 23:47:21 +01:00
Rémi Verschelde	f8a3a599ac	Adapt libdir for 64bit RPM-based distros RPM-based distros such as Fedora or Mageia put 64bit libraries in /usr/lib64 while 32bit libraries go to /usr/lib. This is usually taken into account in CMake projects using a LIB_SUFFIX parameter that can be set to "" or "64".	2014-12-01 23:44:08 +01:00
@@ -1 +1 @@
 .0.0
 .1.0