Sync with 96afce5 (#77)

Author: jdumas

cmake/lagrange/lagrange_cpm_cache.cmake

@@ -14,7 +14,8 @@ if(DEFINED ENV{CPM_SOURCE_CACHE})
     set(CPM_SOURCE_CACHE_DEFAULT $ENV{CPM_SOURCE_CACHE})
 else()
     # Set CPM cache folder if unset
-    file(REAL_PATH "~/.cache/CPM" CPM_SOURCE_CACHE_DEFAULT EXPAND_TILDE)
+    file(REAL_PATH "~" HOME_DIR EXPAND_TILDE)
+    cmake_path(APPEND HOME_DIR ".cache/CPM" OUTPUT_VARIABLE CPM_SOURCE_CACHE_DEFAULT)
 endif()
 
 set(CPM_SOURCE_CACHE

cmake/lagrange/lagrange_tbb_sanitizers.cmake

@@ -10,7 +10,11 @@
 # governing permissions and limitations under the License.
 #
 
-# Set TBB_SANITIZE based on the USE_SANITIZER option
+# Set TBB_SANITIZE based on the USE_SANITIZER option. Even though global options are already enabled
+# by our sanitizers.cmake script, setting the TBB_SANITIZE option will let OneTBB disable elements
+# incompatible with TSan, such as ITT notifications and LTO:
+# https://github.com/uxlfoundation/oneTBB/blob/0cd32ab10a84eabf780bb699b17430deb028c0a4/src/tbbmalloc/CMakeLists.txt#L42
+# https://github.com/uxlfoundation/oneTBB/blob/0cd32ab10a84eabf780bb699b17430deb028c0a4/CMakeLists.txt#L254
 set(TBB_SANITIZE "")
 if(USE_SANITIZER)
     if(UNIX)
@@ -29,7 +33,6 @@ if(USE_SANITIZER)
     elseif(MSVC)
         if(USE_SANITIZER MATCHES "([Aa]ddress)")
             set(TBB_SANITIZE "address -fno-omit-frame-pointer")
-        else()
         endif()
     endif()
 endif()

cmake/recipes/external/assimp.cmake

@@ -43,12 +43,14 @@ include(CPM)
 CPMAddPackage(
     NAME assimp
     GITHUB_REPOSITORY assimp/assimp
-    GIT_TAG 2f3e72413f25897c1903e883a94fa5cf4293e26b
+    GIT_TAG v6.0.2
 
     PATCHES
         # Prevent Assimp from meddling with compiler flags in debug mode.
         # See internal lagrange-lib/#1303 for more details.
         # Remember to update this patch when updating Assimp.
+        # This patch also fixes the compilation issue related to contrib/zlib.
+        # See https://github.com/assimp/assimp/issues/6118
         assimp.patch
 )
 

cmake/recipes/external/assimp.patch

@@ -1,12 +1,27 @@
-diff --git i/CMakeLists.txt w/CMakeLists.txt
-index 517a957f4..0f8594369 100644
---- i/CMakeLists.txt
-+++ w/CMakeLists.txt
-@@ -339,7 +339,6 @@ ELSEIF(MSVC)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cd8f515..90b782a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -343,7 +343,6 @@ ELSEIF(MSVC)
    ENDIF()
    # supress warning for double to float conversion if Double precision is activated
    ADD_COMPILE_OPTIONS(/wd4244)
 -  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /D_DEBUG /Zi /Od")
    # Allow user to disable PDBs
    if(ASSIMP_INSTALL_PDB)
      SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi")
+diff --git a/contrib/zlib/zutil.h b/contrib/zlib/zutil.h
+index 0bc7f4e..e93e4bf 100644
+--- a/contrib/zlib/zutil.h
++++ b/contrib/zlib/zutil.h
+@@ -142,10 +142,6 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
+ #  ifndef Z_SOLO
+ #    if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
+ #      include <unix.h> /* for fdopen */
+-#    else
+-#      ifndef fdopen
+-#        define fdopen(fd,mode) NULL /* No fdopen() */
+-#      endif
+ #    endif
+ #  endif
+ #endif

modules/testing/include/lagrange/testing/common.h

@@ -164,7 +164,9 @@ SurfaceMesh<Scalar, Index> load_surface_mesh(const fs::path& relative_path)
 {
     auto full_path = get_data_path(relative_path);
     REQUIRE(lagrange::fs::exists(full_path));
-    return lagrange::io::load_mesh<SurfaceMesh<Scalar, Index>>(full_path);
+    io::LoadOptions options;
+    options.quiet = true;
+    return lagrange::io::load_mesh<SurfaceMesh<Scalar, Index>>(full_path, options);
 }
 
 ///