Merge remote-tracking branch 'BenLubar/ubuntu-bionic' into develop

2018-03-10 16:57:07 -05:00 · 2018-03-10 16:57:07 -05:00 · d55048dfa1
parent 0ccc89a5fe 7bbfd456d3
commit d55048dfa1
3 changed files with 4 additions and 0 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -189,6 +189,7 @@ IF(UNIX)
  # ensure compatibility with older CPUs
  # enable C++11 features
  add_definitions(-DLINUX_BUILD)
+  add_definitions(-D_GLIBCXX_USE_C99)
  SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -Wall -Wno-unused-variable")
  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -mtune=generic -std=c++0x")
  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -mtune=generic")
--- a/depends/jsoncpp/jsoncpp.cpp
+++ b/depends/jsoncpp/jsoncpp.cpp
@ -3922,8 +3922,10 @@ Value& Path::make(Value& root) const {
 #define isfinite finite
 #else
 #include <cmath>
+#ifndef isfinite // fix isfinite on Ubuntu 18.04
 #define isfinite std::isfinite
 #endif
+#endif

 #if defined(_MSC_VER) && _MSC_VER < 1500 // VC++ 8.0 and below
 #define snprintf _snprintf
--- a/library/MiscUtils.cpp
+++ b/library/MiscUtils.cpp
@ -36,6 +36,7 @@ distribution.
 #include <ctype.h>
 #include <stdarg.h>
 #include <string.h>
+#include <cstdlib>

 #include <sstream>
 #include <map>