Merge pull request #101 from dominicpezzuto/master

Fix build issues related to Solaris and older GCC
2025-10-15 23:20:05 +02:00 · 2015-01-06 13:08:34 -06:00 · 2015-01-06 13:07:19 -06:00 · 2015-01-06 13:07:19 -06:00
2 changed files with 13 additions and 2 deletions
--- a/src/lib_json/CMakeLists.txt
+++ b/src/lib_json/CMakeLists.txt
@@ -6,9 +6,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 )
--- 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) {