Update third-party dependencies

Author: zfergus

cmake/recipes/CPM.cmake

@@ -1,4 +1,4 @@
-set(CPM_DOWNLOAD_VERSION 0.38.1)
+set(CPM_DOWNLOAD_VERSION 0.42.0)
 
 if(CPM_SOURCE_CACHE)
   set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")

cmake/recipes/catch2.cmake

@@ -11,4 +11,8 @@ option(CATCH_INSTALL_DOCS "Install documentation alongside library" OFF)
 option(CATCH_INSTALL_EXTRAS "Install extras alongside library" OFF)
 
 include(CPM)
-CPMAddPackage("gh:catchorg/[email protected]")
+CPMAddPackage("gh:catchorg/[email protected]")
+
+# Folder name for IDE
+set_target_properties(Catch2 PROPERTIES FOLDER "ThirdParty/Catch2")
+set_target_properties(Catch2WithMain PROPERTIES FOLDER "ThirdParty/Catch2")

cmake/recipes/eigen.cmake

@@ -44,6 +44,27 @@ if(EIGEN_WITH_MKL)
         EIGEN_USE_MKL_ALL
         EIGEN_USE_LAPACKE_STRICT
     )
+elseif(APPLE)
+    find_package(BLAS REQUIRED)
+    find_library(LAPACKE lapacke PATHS
+        "/opt/local/lib/lapack"
+        "/opt/homebrew/opt/lapack/lib"
+    )
+    if (NOT LAPACKE)
+        # BLAS should be available on macOS, but LAPACKE might not be
+        message(WARNING "LAPACKE library not found (required for EIGEN_USE_LAPACKE on macOS)! "
+            "Perhaps you need to install it (e.g., brew install lapack). "
+            "Eigen will be built without LAPACKE support.")
+    else()
+        message(STATUS "Found BLAS and LAPACKE. Enabling Eigen LAPACKE support.")
+        target_link_libraries(Eigen3_Eigen INTERFACE
+            ${BLAS_LIBRARIES} ${LAPACKE}
+        )
+        target_compile_definitions(Eigen3_Eigen INTERFACE
+            EIGEN_USE_BLAS
+            EIGEN_USE_LAPACKE_STRICT
+        )
+    endif()
 endif()
 
 # On Windows, enable natvis files to improve debugging experience

cmake/recipes/json.cmake

@@ -21,7 +21,7 @@ add_library(nlohmann_json INTERFACE)
 add_library(nlohmann_json::nlohmann_json ALIAS nlohmann_json)
 
 include(GNUInstallDirs)
-target_include_directories(nlohmann_json INTERFACE
+target_include_directories(nlohmann_json SYSTEM INTERFACE
     "$<BUILD_INTERFACE:${nlohmann_json_SOURCE_DIR}>/include"
     "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>"
 )

cmake/recipes/libigl.cmake

@@ -9,4 +9,4 @@ message(STATUS "Third-party: creating target 'igl::core'")
 include(eigen)
 
 include(CPM)
-CPMAddPackage("gh:libigl/libigl@2.5.0")
+CPMAddPackage("gh:libigl/libigl#89267b4a80b1904de3f6f2812a2053e5e9332b7e")

cmake/recipes/onetbb.cmake

@@ -53,7 +53,7 @@ function(onetbb_import_target)
 
     set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME tbb)
     include(CPM)
-    CPMAddPackage("gh:oneapi-src/oneTBB@2021.9.0")
+    CPMAddPackage("gh:uxlfoundation/oneTBB@2022.1.0")
 
     pop_variable(BUILD_SHARED_LIBS)
 endfunction()
@@ -67,7 +67,7 @@ endif()
 foreach(name IN ITEMS tbb tbbmalloc tbbmalloc_proxy)
     if(TARGET ${name})
         # Folder name for IDE
-        set_target_properties(${name} PROPERTIES FOLDER "third_party//tbb")
+        set_target_properties(${name} PROPERTIES FOLDER "ThirdParty/tbb")
 
         # Force debug postfix for library name. Our pre-compiled MKL library expects "tbb12.dll" (without postfix).
         set_target_properties(${name} PROPERTIES DEBUG_POSTFIX "")

cmake/recipes/spdlog.cmake

@@ -14,7 +14,8 @@ CPMAddPackage("gh:gabime/[email protected]")
 
 set_target_properties(spdlog PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
-set_target_properties(spdlog PROPERTIES FOLDER external)
+# Folder name for IDE
+set_target_properties(spdlog PROPERTIES FOLDER "ThirdParty")
 
 if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang" OR
    "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")