Merge pull request open-source-parsers#101 from dominicpezzuto/master

Fix build issues related to Solaris and older GCC
fremouw · Jan 3, 2015 · f44278c · f44278c
2 parents 8dd32e1 + d2b6992
commit f44278c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/lib_json/CMakeLists.txt b/src/lib_json/CMakeLists.txt
@@ -10,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 )

diff --git 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) {