Merge branch 'master' into hugtalbot-patch-1

Author: hugtalbot

Sofa/framework/Type/CMakeLists.txt

@@ -89,13 +89,23 @@ if(NOT Boost_FOUND)
         message(FATAL_ERROR "Boost (${BOOST_MIN_VERSION} or higher) is mandatory.")
     endif()
 endif()
+
 sofa_find_package(Boost QUIET REQUIRED)
 
+option(SOFA_USE_MIMALLOC "Use mimalloc to replace malloc (known to be more efficient, especially with MSVC)" OFF)
+if(SOFA_USE_MIMALLOC)
+    sofa_find_package(mimalloc REQUIRED)
+endif()
+
 add_library(${PROJECT_NAME} SHARED ${HEADER_FILES} ${SOURCE_FILES})
 
 target_link_libraries(${PROJECT_NAME} PUBLIC Sofa.Config)
 target_link_libraries(${PROJECT_NAME} PUBLIC Boost::boost)
 
+if(mimalloc_FOUND)
+    target_link_libraries(${PROJECT_NAME} PUBLIC mimalloc)
+endif()
+
 set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER Sofa.Framework) # IDE folder
 
 sofa_create_package_with_targets(

Sofa/framework/Type/src/sofa/type/config.h.in

@@ -23,6 +23,8 @@
 
 #include <sofa/config.h>
 
+#cmakedefine01 SOFA_TYPE_HAVE_MIMALLOC
+
 #define SOFATYPE_VERSION @PROJECT_VERSION@
 
 #ifdef SOFA_BUILD_SOFA_TYPE

Sofa/framework/Type/src/sofa/type/init.cpp

@@ -23,6 +23,11 @@
 
 #include <iostream>
 
+#if SOFA_TYPE_HAVE_MIMALLOC == 1
+#include <mimalloc.h>
+#endif
+
+
 namespace sofa::type
 {
 
@@ -33,6 +38,9 @@ SOFA_TYPE_API void init()
 {
     if (!s_initialized)
     {
+#if SOFA_TYPE_HAVE_MIMALLOC == 1
+        mi_version();
+#endif
         s_initialized = true;
     }
 }