GEODE-9896: Upgrades dependencies.

CMakeLists.txt

@@ -21,6 +21,10 @@ option(USE_CPP_COVERAGE "Enable profiling and coverage report analysis for apach
 option(USE_RAT "Enable Apache Rat checking." OFF)
 option(WITH_IPV6 "Enable IPv6 support." OFF)
 
+if(WIN32)
+  set(USE_WINAPI_VERSION "0x0602" CACHE STRING "Windows API version for _WIN32_WINNT macro.")
+endif()
+
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
 if (USE_PCH)

dependencies/ACE/CMakeLists.txt

@@ -13,9 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-project( ACE VERSION 7.0.3 LANGUAGES NONE )
+project( ACE VERSION 7.0.5 LANGUAGES NONE )
 
-set( SHA256 96998d1e710b6d88416640caeb76915518c8d85d3f10c02079bf0dd4e57cf60a )
+set( SHA256 0b83ea10589bb283326267c4c017b222c7c61f479576b377ddb822d5c1925495 )
 
 if ("SunOS" STREQUAL ${CMAKE_SYSTEM_NAME})
   set( ACE_PLATFORM sunos5_sunc++ )

dependencies/boost/CMakeLists.txt

@@ -13,9 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-project(boost VERSION 1.76.0 LANGUAGES NONE)
+project(boost VERSION 1.78.0 LANGUAGES NONE)
 
-set(SHA256 7bd7ddceec1a1dfdcbdb3e609b60d01739c38390a5f956385a12f3122049f0ca)
+set(SHA256 94ced8b72956591c4775ae2207a9763d3600b30d9d7446562c552f0a14a63be7)
 
 if (WIN32)
   set(BOOTSTRAP_COMMAND bootstrap.bat)
@@ -52,6 +52,8 @@ if ("Darwin" STREQUAL ${CMAKE_SYSTEM_NAME})
   endforeach()
   string(APPEND CMAKE_CXX_FLAGS " ${CMAKE_CXX_SYSROOT_FLAG} ${CMAKE_OSX_SYSROOT}")
   string(APPEND CMAKE_CXX_FLAGS " ${CMAKE_CXX_OSX_DEPLOYMENT_TARGET_FLAG}${CMAKE_OSX_DEPLOYMENT_TARGET}")
+elseif(WIN32)
+  list(APPEND B2_FLAGS define=_WIN32_WINNT=${USE_WINAPI_VERSION})
 endif()
 
 if ("SunOS" STREQUAL ${CMAKE_SYSTEM_NAME})
@@ -64,10 +66,11 @@ elseif(MSVC)
   endif()
   list(APPEND BOOTSTRAP_FLAGS vc${MSVC_TOOLSET_VERSION})
   if (CMAKE_VS_PLATFORM_TOOLSET_VERSION)
-	list(APPEND B2_FLAGS toolset=msvc-${CMAKE_VS_PLATFORM_TOOLSET_VERSION})
+    list(APPEND B2_FLAGS toolset=msvc-${CMAKE_VS_PLATFORM_TOOLSET_VERSION})
   else()
     list(APPEND B2_FLAGS toolset=msvc-${MSVC_TOOLSET_VERSION})
   endif()
+  list(APPEND B2_FLAGS define=BOOST_NO_CXX11_HDR_CODECVT)
   set(CMAKE_STATIC_LIBRARY_PREFIX lib)
 elseif ("Clang" STREQUAL ${CMAKE_CXX_COMPILER_ID})
   list(APPEND BOOTSTRAP_FLAGS --with-toolset=clang)
@@ -99,76 +102,83 @@ ExternalProject_Get_Property(${EXTERN} INSTALL_DIR)
 set(INSTALL_DIR "${INSTALL_DIR}/$<CONFIG>")
 
 function(ADD_BOOST_LIBRARY)
-  set(options)
+  set(options HEADER_ONLY)
   set(oneValueArgs)
-  set(multiValueArgs LIBRARIES DEPENDENCIES)
+  set(multiValueArgs LINK_LIBRARIES DEFINITIONS INCLUDE_DIRECTORIES DEPENDENCIES)
   cmake_parse_arguments(PARSE_ARGV 1 args "${options}" "${oneValueArgs}" "${multiValueArgs}")
 
   set(args_NAME ${ARGV0})
+  set(targetName boost_${args_NAME})
 
-  if (NOT DEFINED args_LIBRARIES)
-    set(args_LIBRARIES ${args_NAME})
+  set(linkLibrary)
+  if (NOT args_HEADER_ONLY)
+    set(linkLibrary "${INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}boost_${args_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}")
   endif()
 
-  set(linkLibraries)
-  foreach(library ${args_LIBRARIES})
-    list(APPEND linkLibraries "${INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}boost_${args_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}")
-  endforeach()
+  add_library(${targetName} INTERFACE)
+
+  target_compile_definitions(${targetName} INTERFACE ${args_DEFINITIONS})
+
+  target_include_directories(${targetName} SYSTEM INTERFACE ${args_INCLUDE_DIRECTORIES})
 
-  add_library(boost_${args_NAME} INTERFACE)
-  target_link_libraries(boost_${args_NAME} INTERFACE
-    ${linkLibraries}
-    ${args_DEPENDENCIES}
+  target_link_libraries(${targetName} INTERFACE
+    ${linkLibrary}
+    ${args_LINK_LIBRARIES}
   )
-  add_library(Boost::${args_NAME} ALIAS boost_${args_NAME})
-endfunction()
 
+  if(DEFINED args_DEPENDENCIES)
+    add_dependencies(${targetName} ${args_DEPENDENCIES})
+  endif()
+
+  add_library(Boost::${args_NAME} ALIAS ${targetName})
+endfunction()
 
-add_library(${PROJECT_NAME} INTERFACE)
-target_include_directories(${PROJECT_NAME} SYSTEM INTERFACE
-  $<BUILD_INTERFACE:${INSTALL_DIR}/include>
-)
-target_compile_definitions(${PROJECT_NAME} INTERFACE
-  BOOST_ALL_NO_LIB
-)
-target_link_libraries(${PROJECT_NAME} INTERFACE
-)
-add_library(Boost::boost ALIAS boost)
-add_dependencies(${PROJECT_NAME} ${EXTERN})
 
 find_package(Threads REQUIRED)
 
-add_boost_library(system DEPENDENCIES Boost::boost)
-add_boost_library(atomic DEPENDENCIES Boost::boost)
-add_boost_library(iostreams DEPENDENCIES Boost::boost)
-add_boost_library(thread DEPENDENCIES Threads::Threads Boost::atomic Boost::boost)
-add_boost_library(filesystem DEPENDENCIES Boost::system Boost::boost)
-add_boost_library(log DEPENDENCIES Boost::thread Boost::filesystem Boost::boost)
-add_boost_library(log_setup DEPENDENCIES Boost::log)
-add_boost_library(chrono DEPENDENCIES Boost::chrono)
-add_boost_library(stacktrace LIBRARIES "" DEPENDENCIES Boost::boost)
-add_boost_library(asio LIBRARIES "" DEPENDENCIES Boost::boost)
-add_boost_library(process LIBRARIES "" DEPENDENCIES Boost::system)
-add_boost_library(regex DEPENDENCIES Boost::boost)
-
-target_compile_definitions(boost_stacktrace INTERFACE
-  BOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED
-)
 
-target_compile_definitions(boost_asio INTERFACE
+add_boost_library(boost HEADER_ONLY
+  INCLUDE_DIRECTORIES
+    $<BUILD_INTERFACE:${INSTALL_DIR}/include>
+  DEFINITIONS
+    BOOST_ALL_NO_LIB
+    $<$<PLATFORM_ID:Windows>:_WIN32_WINNT=${USE_WINAPI_VERSION}>
+  DEPENDENCIES
+    ${EXTERN}
+)
+add_boost_library(system LINK_LIBRARIES Boost::boost)
+add_boost_library(atomic LINK_LIBRARIES Boost::boost)
+add_boost_library(iostreams LINK_LIBRARIES Boost::boost)
+add_boost_library(thread LINK_LIBRARIES Threads::Threads Boost::atomic Boost::boost)
+add_boost_library(filesystem LINK_LIBRARIES Boost::system Boost::boost)
+add_boost_library(log 
+  LINK_LIBRARIES
+    Boost::thread
+    Boost::filesystem
+    Boost::boost
+  DEFINITIONS
+    $<$<CXX_COMPILER_ID:MSVC>:BOOST_NO_CXX11_HDR_CODECVT>
+)
+add_boost_library(log_setup LINK_LIBRARIES Boost::log)
+add_boost_library(chrono LINK_LIBRARIES Boost::chrono)
+add_boost_library(stacktrace HEADER_ONLY 
+  LINK_LIBRARIES
+    Boost::boost
+  DEFINITIONS
+    BOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED
+)
+add_boost_library(asio HEADER_ONLY
+  LINK_LIBRARIES
+    Boost::boost
+  DEFINITIONS
     BOOST_ASIO_HAS_MOVE
 )
-
-if(WIN32)
-  target_compile_definitions(boost INTERFACE
-    # Required for Boost.WinAPI
-    _WIN32_WINNT=0x06020000
-  )
-endif()
+add_boost_library(process HEADER_ONLY LINK_LIBRARIES Boost::system)
+add_boost_library(regex LINK_LIBRARIES Boost::boost)
 
 if(MSVC)
   target_compile_options(boost_process INTERFACE
-  	/wd4267
+    /wd4267
     /wd4244
-	)
+  )
 endif()

dependencies/sqlite/CMakeLists.txt

@@ -13,9 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-project( sqlite VERSION 3360000 LANGUAGES NONE )
+project( sqlite VERSION 3370000 LANGUAGES NONE )
 
-set( SHA256 999826fe4c871f18919fdb8ed7ec9dd8217180854dd1fe21eea96aed36186729 )
+set( SHA256 a443aaf5cf345613492efa679ef1c9cc31ba109dcdf37ee377f61ab500d042fe )
 
 
 set( EXTERN ${PROJECT_NAME}-extern )

tests/cpp/fwklib/CMakeLists.txt

@@ -17,6 +17,7 @@ project(framework LANGUAGES CXX)
 
 add_library(framework STATIC
   GsRandom.cpp
+  GsRandom.hpp
 )
 
 set_target_properties(framework PROPERTIES

tests/cpp/fwklib/GsRandom.hpp

@@ -1,8 +1,3 @@
-#pragma once
-
-#ifndef GEODE_FWKLIB_GSRANDOM_H_
-#define GEODE_FWKLIB_GSRANDOM_H_
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -20,6 +15,11 @@
  * limitations under the License.
  */
 
+#pragma once
+
+#ifndef GEODE_FWKLIB_GSRANDOM_H_
+#define GEODE_FWKLIB_GSRANDOM_H_
+
 #include <random>
 #include <string>