Merge branch 'master' into spell_warr_surge_of_adrenaline

Author: Shauren

cmake/macros/AutoCollect.cmake

@@ -16,13 +16,17 @@
 #   ${CMAKE_CURRENT_SOURCE_DIR}
 #   EXCLUDE
 #   ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders
-#   ${CMAKE_CURRENT_SOURCE_DIR}/Platform)
+#   ${CMAKE_CURRENT_SOURCE_DIR}/Platform
+#   HEADER_VISIBILITY PRIVATE) # default is PUBLIC, this controls whether other targets that have this target as dependency will be able to access its headers
 #
 function(CollectAndAddSourceFiles target_name current_dir)
-  cmake_parse_arguments(PARSE_ARGV 2 arg "" "BASE_DIR" "EXCLUDE")
+  cmake_parse_arguments(PARSE_ARGV 2 arg "" "BASE_DIR;HEADER_VISIBILITY" "EXCLUDE")
   if(NOT arg_BASE_DIR)
     set(arg_BASE_DIR "${current_dir}")
   endif()
+  if(NOT arg_HEADER_VISIBILITY)
+    set(arg_HEADER_VISIBILITY "PUBLIC")
+  endif()
   list(FIND arg_EXCLUDE "${current_dir}" IS_EXCLUDED)
   if(IS_EXCLUDED EQUAL -1)
     cmake_path(RELATIVE_PATH current_dir BASE_DIRECTORY "${arg_BASE_DIR}" OUTPUT_VARIABLE fileset_name)
@@ -41,12 +45,12 @@ function(CollectAndAddSourceFiles target_name current_dir)
       ${current_dir}/*.hpp)
 
     target_sources(${target_name} PRIVATE ${private_source_files})
-    target_sources(${target_name} PUBLIC FILE_SET "headers_${fileset_name}" TYPE HEADERS BASE_DIRS ${current_dir} FILES ${public_header_files})
+    target_sources(${target_name} ${arg_HEADER_VISIBILITY} FILE_SET "headers_${fileset_name}" TYPE HEADERS BASE_DIRS ${current_dir} FILES ${public_header_files})
 
     file(GLOB SUB_DIRECTORIES ${current_dir}/*)
     foreach(SUB_DIRECTORY ${SUB_DIRECTORIES})
       if(IS_DIRECTORY ${SUB_DIRECTORY})
-        CollectAndAddSourceFiles("${target_name}" "${SUB_DIRECTORY}" BASE_DIR ${arg_BASE_DIR} EXCLUDE ${arg_EXCLUDE})
+        CollectAndAddSourceFiles("${target_name}" "${SUB_DIRECTORY}" BASE_DIR ${arg_BASE_DIR} HEADER_VISIBILITY ${arg_HEADER_VISIBILITY} EXCLUDE ${arg_EXCLUDE})
       endif()
     endforeach()
   endif()

dep/CMakeLists.txt

@@ -20,7 +20,9 @@ if(SERVERS OR TOOLS)
   add_subdirectory(utf8cpp)
   add_subdirectory(valgrind)
   add_subdirectory(openssl)
-  add_subdirectory(jemalloc)
+  if(CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT NOJEM)
+    add_subdirectory(jemalloc)
+  endif()
   add_subdirectory(argon2)
   add_subdirectory(openssl_ed25519)
   add_subdirectory(short_alloc)

dep/PackageList.txt

@@ -17,8 +17,8 @@ G3D (a commercial-grade C++ 3D engine available as Open Source (BSD License)
   Version: 9.0-Release r4036
 
 jemalloc (a general-purpose scalable concurrent malloc-implementation)
-  http://www.canonware.com/jemalloc/
-  Version: 5.2.1
+  https://github.com/jemalloc/jemalloc
+  Version: 5.3.0
 
 libreadline (command line editing library)
   https://cnswww.cns.cwru.edu/php/chet/readline/rltop.html