This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via a17fcb54600b756cf8e62aaee55dffe6073fe413 (commit)
via 777f74f60c58d0276ea3ac68258b2d51c54b2fe0 (commit)
via dd4098e1f862f2ba054014d12757fe637eb3225c (commit)
via bd1bc930142731cefa249d3df0f87e3cb8ff575c (commit)
via 3c0aeb32f79f4255ad28b4263dcab1f2dd755301 (commit)
from edfa7aab959aed803075501633a9a3ae2770f028 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a17fcb54600b756cf8e62aaee55dffe6073fe413
commit a17fcb54600b756cf8e62aaee55dffe6073fe413
Merge: edfa7aa 777f74f
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Jan 15 11:33:37 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Jan 15 11:33:37 2015 -0500
Merge topic 'cdash_upload_file_mode' into next
777f74f6 jsoncpp: Provide 'isfinite' implementation on Solaris
dd4098e1 jsoncpp: Include C headers since we use APIs without std::
bd1bc930 jsoncpp: Build with KWSys Large File Support configuration
3c0aeb32 jsoncpp: Include "config.h" before system headers
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=777f74f60c58d0276ea3ac68258b2d51c54b2fe0
commit 777f74f60c58d0276ea3ac68258b2d51c54b2fe0
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Jan 15 11:32:10 2015 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Jan 15 11:32:10 2015 -0500
jsoncpp: Provide 'isfinite' implementation on Solaris
Solaris provides a 'finite' function in <ieeefp.h>.
diff --git a/Utilities/cmjsoncpp/src/lib_json/json_writer.cpp
b/Utilities/cmjsoncpp/src/lib_json/json_writer.cpp
index 0a42cc4..7f8e6f1 100644
--- a/Utilities/cmjsoncpp/src/lib_json/json_writer.cpp
+++ b/Utilities/cmjsoncpp/src/lib_json/json_writer.cpp
@@ -21,6 +21,12 @@
#define snprintf _snprintf
#endif
+// Solaris
+#if defined(__sun)
+# include <ieeefp.h>
+# define isfinite finite
+#endif
+
// Ancient glibc
#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ < 2
# if !defined(isfinite)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd4098e1f862f2ba054014d12757fe637eb3225c
commit dd4098e1f862f2ba054014d12757fe637eb3225c
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Jan 15 11:16:03 2015 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Jan 15 11:17:22 2015 -0500
jsoncpp: Include C headers since we use APIs without std::
diff --git a/Utilities/cmjsoncpp/src/lib_json/json_reader.cpp
b/Utilities/cmjsoncpp/src/lib_json/json_reader.cpp
index c5111f8..41896a7 100644
--- a/Utilities/cmjsoncpp/src/lib_json/json_reader.cpp
+++ b/Utilities/cmjsoncpp/src/lib_json/json_reader.cpp
@@ -10,9 +10,9 @@
#include "json_tool.h"
#endif // if !defined(JSON_IS_AMALGAMATION)
#include <utility>
-#include <cstdio>
-#include <cassert>
-#include <cstring>
+#include <stdio.h>
+#include <assert.h>
+#include <string.h>
#include <istream>
#if defined(_MSC_VER) && _MSC_VER < 1500 // VC++ 8.0 and below
diff --git a/Utilities/cmjsoncpp/src/lib_json/json_value.cpp
b/Utilities/cmjsoncpp/src/lib_json/json_value.cpp
index aabc957..478afe1 100644
--- a/Utilities/cmjsoncpp/src/lib_json/json_value.cpp
+++ b/Utilities/cmjsoncpp/src/lib_json/json_value.cpp
@@ -14,8 +14,8 @@
#include <math.h>
#include <sstream>
#include <utility>
-#include <cstring>
-#include <cassert>
+#include <string.h>
+#include <assert.h>
#ifdef JSON_USE_CPPTL
#include <cpptl/conststring.h>
#endif
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bd1bc930142731cefa249d3df0f87e3cb8ff575c
commit bd1bc930142731cefa249d3df0f87e3cb8ff575c
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Jan 15 11:08:17 2015 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Jan 15 11:17:18 2015 -0500
jsoncpp: Build with KWSys Large File Support configuration
This ensures use of a compatible C++ stream library on AIX with XL.
diff --git a/Utilities/cmjsoncpp/CMakeLists.txt
b/Utilities/cmjsoncpp/CMakeLists.txt
index 9f29558..1c863f8 100644
--- a/Utilities/cmjsoncpp/CMakeLists.txt
+++ b/Utilities/cmjsoncpp/CMakeLists.txt
@@ -17,6 +17,9 @@ set(JSONCPP_SOURCES
src/lib_json/json_writer.cpp
)
-include_directories(${JsonCpp_SOURCE_DIR}/include)
+include_directories(
+ ${JsonCpp_SOURCE_DIR}/include
+ ${KWSYS_HEADER_ROOT}
+ )
add_library(cmjsoncpp ${JSONCPP_SOURCES})
diff --git a/Utilities/cmjsoncpp/include/json/config.h
b/Utilities/cmjsoncpp/include/json/config.h
index 5c711e3..6847ceb 100644
--- a/Utilities/cmjsoncpp/include/json/config.h
+++ b/Utilities/cmjsoncpp/include/json/config.h
@@ -6,6 +6,9 @@
#ifndef JSON_CONFIG_H_INCLUDED
#define JSON_CONFIG_H_INCLUDED
+// Include KWSys Large File Support configuration.
+#include <cmsys/Configure.h>
+
#if defined(_MSC_VER)
# pragma warning(push,1)
#endif
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3c0aeb32f79f4255ad28b4263dcab1f2dd755301
commit 3c0aeb32f79f4255ad28b4263dcab1f2dd755301
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Jan 15 11:12:07 2015 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Jan 15 11:17:14 2015 -0500
jsoncpp: Include "config.h" before system headers
diff --git a/Utilities/cmjsoncpp/include/json/assertions.h
b/Utilities/cmjsoncpp/include/json/assertions.h
index 5ef7e7b..37a3ff5 100644
--- a/Utilities/cmjsoncpp/include/json/assertions.h
+++ b/Utilities/cmjsoncpp/include/json/assertions.h
@@ -6,12 +6,12 @@
#ifndef CPPTL_JSON_ASSERTIONS_H_INCLUDED
#define CPPTL_JSON_ASSERTIONS_H_INCLUDED
-#include <stdlib.h>
-
#if !defined(JSON_IS_AMALGAMATION)
#include "config.h"
#endif // if !defined(JSON_IS_AMALGAMATION)
+#include <stdlib.h>
+
#if JSON_USE_EXCEPTION
#include <stdexcept>
#define JSON_ASSERT(condition)
\
-----------------------------------------------------------------------
Summary of changes:
Utilities/cmjsoncpp/CMakeLists.txt | 5 ++++-
Utilities/cmjsoncpp/include/json/assertions.h | 4 ++--
Utilities/cmjsoncpp/include/json/config.h | 3 +++
Utilities/cmjsoncpp/src/lib_json/json_reader.cpp | 6 +++---
Utilities/cmjsoncpp/src/lib_json/json_value.cpp | 4 ++--
Utilities/cmjsoncpp/src/lib_json/json_writer.cpp | 6 ++++++
6 files changed, 20 insertions(+), 8 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
