Syncing fork

Author: GustavoAngulo

CMakeLists.txt

@@ -50,7 +50,7 @@ else()
     message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++1Y support. Please use a different C++ compiler.")
 endif()
 
-# Create a new pre-processor macro __PELOTONFILE__ that has a truncated 
+# Create a new pre-processor macro __PELOTONFILE__ that has a truncated
 # path to reduce the size of the debug log messages.
 # Source: http://stackoverflow.com/a/16658858
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__PELOTONFILE__='\"$(subst ${CMAKE_SOURCE_DIR}/,,$(abspath $<))\"'")
@@ -62,7 +62,7 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fcolor-diagnostics")
 endif()
 
-if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND 
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND
   (CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 4.9 OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.9))
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fdiagnostics-color=auto")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=auto")
@@ -79,10 +79,38 @@ if(UNIX OR APPLE)
     endif()
 endif()
 
+# There is a problem with building on g++5.4 on Ubuntu 17.10 where
+# the compiler will not support a bunch of stuff in std for some reason.
+# For example, it would say that 'to_string' is not part of 'std'.
+# These flags fix these problems. I don't know whether g++5.5 has the same
+# problem, so I am only making this fix target all variants of 5.4.
+#
+# More Info: https://stackoverflow.com/a/38034394
+#            https://github.com/opencv/opencv/issues/10032#issuecomment-342347482
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND
+  (CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 5.4 OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 5.4) AND
+  (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.5))
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GLIBCXX_USE_C99=1 -D_GLIBCXX_USE_C99_MATH=1")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_USE_C99=1 -D_GLIBCXX_USE_C99_MATH=1")
+endif()
+
 # ---[ Warnings
 peloton_warnings_disable(CMAKE_CXX_FLAGS -Wno-strict-aliasing -Wno-implicit-fallthrough)
 
-# Turn on sanitizers if necessary.
+# ---[ Check if we should use the GNU Gold linker
+set(USE_GOLD true CACHE BOOL "Use the GNU Gold linker if available")
+if (USE_GOLD)
+    execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=gold -Wl,--version ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
+    if ("${LD_VERSION}" MATCHES "GNU gold")
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold -Wl,--disable-new-dtags")
+        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold -Wl,--disable-new-dtags")
+    else ()
+        message(WARNING "GNU gold linker isn't available, using the default system linker.")
+        set(USE_LD_GOLD OFF)
+    endif ()
+endif()
+
+# ---[ Turn on sanitizers if necessary.
 if(USE_SANITIZER)
     if (USE_SANITIZER STREQUAL "Address")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
@@ -102,9 +130,6 @@ if(USE_SANITIZER)
             set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize-address-use-after-scope")
         endif()
     endif()
-    if (CMAKE_COMPILER_IS_GNUCC)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fuse-ld=gold")
-    endif()
 endif()
 
 # -- [ Coverage

cmake/Targets.cmake

@@ -88,6 +88,9 @@ function(peloton_pickup_peloton_sources root)
   # jsoncpp
   file(GLOB_RECURSE jsoncpp_srcs ${root}/third_party/jsoncpp/*.cpp)
 
+  # ART
+  file(GLOB_RECURSE art_srcs ${root}/third_party/adaptive_radix_tree/*.cpp)
+
   # date
   file(GLOB_RECURSE jsoncpp_srcs ${root}/third_party/date/*.cpp)
   set(date_hdrs ${root}/third_party/date/)
@@ -99,7 +102,7 @@ function(peloton_pickup_peloton_sources root)
 
   # add proto to make them editable in IDEs too
   file(GLOB_RECURSE proto_files ${root}/src/peloton/*.proto)
-  list(APPEND srcs ${proto_files} ${murmur_srcs} ${libcount_srcs} ${libcds_srcs} ${jsoncpp_srcs})
+  list(APPEND srcs ${proto_files} ${murmur_srcs} ${libcount_srcs} ${art_srcs} ${jsoncpp_srcs})
 
   # propogate to parent scope
   set(srcs ${srcs} PARENT_SCOPE)