Issue #173, follow up to using strtoll to allow this to work on older Windows environ...

Also, add a few missing files to the list of sources to build.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9fa8644384cd3e4525c86c5efc8f2d545b3044eb..89cf4330ae7ae39b49d2ba95a522adf32bf5b5fa 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,13 +3,27 @@
 cmake_minimum_required(VERSION 2.8.7)
 project(json-c)
 
+include(CheckSymbolExists)
+
+check_symbol_exists(strtoll "stdlib.h" HAVE_STRTOLL)
+
+set(cmake_strtoll "strtoll")
+if (NOT HAVE_STRTOLL)
+  # Use _strtoi64 if strtoll is not available.
+  check_symbol_exists(_strtoi64 stdlib.h have_strtoi64)
+  if (have_strtoi64)
+    set(HAVE_STRTOLL 1)
+    set(cmake_strtoll "_strtoi64")
+    # could do the same for strtoull, if needed
+  endif ()
+endif ()
+
+
+
 if(MSVC)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4100 /wd4996 /wd4244 /wd4706 /wd4702 /wd4127 /wd4701")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4100 /wd4996 /wd4244 /wd4706 /wd4702 /wd4127 /wd4701")
-  file(COPY ./config.h.win32 DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/include/)
-  file(RENAME ${CMAKE_CURRENT_BINARY_DIR}/include/config.h.win32 ${CMAKE_CURRENT_BINARY_DIR}/include/config.h)
-  file(COPY ./json_config.h.win32 DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/include/)
-  file(RENAME ${CMAKE_CURRENT_BINARY_DIR}/include/json_config.h.win32 ${CMAKE_CURRENT_BINARY_DIR}/include/json_config.h)
+  set(cmake_create_config 1)
 elseif(MINGW)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -D_GNU_SOURCE=1")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -D_GNU_SOURCE=1")
@@ -20,10 +34,7 @@ elseif(MINGW)
     file(COPY ./config.h DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/include/)
     file(COPY ./json_config.h DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/include/)
   else()
-    file(COPY ./config.h.win32 DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/include/)
-    file(RENAME ${CMAKE_CURRENT_BINARY_DIR}/include/config.h.win32 ${CMAKE_CURRENT_BINARY_DIR}/include/config.h)
-    file(COPY ./json_config.h.win32 DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/include/)
-    file(RENAME ${CMAKE_CURRENT_BINARY_DIR}/include/json_config.h.win32 ${CMAKE_CURRENT_BINARY_DIR}/include/json_config.h)
+    set(cmake_create_config 1)
   endif()
 elseif(UNIX)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
@@ -35,6 +46,13 @@ elseif(UNIX)
   file(COPY ./json_config.h DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/include/)
 endif()
 
+if (cmake_create_config)
+  file(REMOVE ./config.h)  # make sure any stale one is gone
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.win32 ${CMAKE_CURRENT_BINARY_DIR}/include/config.h)
+  file(COPY ./json_config.h.win32 DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/include/)
+  file(RENAME ${CMAKE_CURRENT_BINARY_DIR}/include/json_config.h.win32 ${CMAKE_CURRENT_BINARY_DIR}/include/json_config.h)
+endif ()
+
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
 
 set(JSON_C_PUBLIC_HEADERS
@@ -67,13 +85,15 @@ set(JSON_C_HEADERS
 set(JSON_C_SOURCES
     ./arraylist.c
     ./debug.c
+    ./json_c_version.c
     ./json_object.c
+    ./json_object_iterator.c
     ./json_pointer.c
     ./json_tokener.c
     ./json_util.c
+    ./json_visit.c
     ./linkhash.c
     ./printbuf.c
-    ./strerror_override.c
     ./random_seed.c
     ./strerror_override.c
 )

diff --git a/config.h.win32 b/config.h.win32
index 2a70a9cc0d5e033a4a773239a1668b571f32e26b..3e8b2182ff41b60fe1ea18f7919211768daa48b7 100644 (file)
--- a/config.h.win32
+++ b/config.h.win32
@@ -113,6 +113,9 @@
 #undef HAVE_STRNCASECMP\r
 #endif\r
 \r
+#cmakedefine HAVE_STRTOLL\r
+#cmakedefine strtoll @cmake_strtoll@\r
+\r
 /* Define to 1 if you have the <syslog.h> header file. */\r
 #undef HAVE_SYSLOG_H\r
 \r