Revert "Remove fmt dependency (spdlog based on std)"

This reverts commit aaa9b82.

Github MacOS 13 runner is bound to XCode 15.2, which does not implement
`std::format`. This would require Xcode 15.3 (see
https://developer.apple.com/xcode/cpp/#c++20).
Various options could exist, among them cross-compiling from MacOS 14,
or changing compiler to gcc-14, but none is straightforward, so I
abandon the idea...

Author: howetuft

.github/workflows/wheels.yml

@@ -51,6 +51,7 @@ jobs:
       GH_TOKEN: ${{ github.token }}
       PYTHON_MINOR: ${{ matrix.python-minor }}
       BOOST_INSTALL_LAYOUT: system
+      SPDLOG_FMT_EXTERNAL: on
       LUXCORE_REPO: ${{ inputs.luxcore_repo != '' && inputs.luxcore_repo || 'Howetuft/LuxCore' }}  # TODO
       LUXCORE_REF: ${{ inputs.luxcore_ref != '' && inputs.luxcore_ref || 'for_v2.10' }}
       # Versions
@@ -64,6 +65,7 @@ jobs:
       OPENVDB_VERSION: 11.0.0
       SPDLOG_VERSION: 1.15.0
       EMBREE3_VERSION: 3.13.5
+      FMT_VERSION: 11.0.2
       OPENSUBDIV_VERSION: 3.6.0
       JSON_VERSION: 3.11.3
       EIGEN_VERSION: 3.4.0
@@ -99,7 +101,7 @@ jobs:
             macOS) _workspace="$GITHUB_WORKSPACE";;
             *) echo "Unhandled os ${{ runner.os }}";exit 64;;
           esac
-          echo "WORKSPACE=${_workspace}" >> $GITHUB_ENV
+          echo "WORKSPACE=${_workspace}" >> "$GITHUB_ENV"
 
       - name: Set conan preset
         uses: actions/github-script@v7
@@ -175,24 +177,25 @@ jobs:
 
           echo "ASAN_PATH=${_T}/usr/lib/gcc/x86_64-redhat-linux/${_V}/libasan.so" >> $GITHUB_ENV
 
-      - name: Prepare MacOS
+      - name: Set MacOS deployment target
         if: runner.os == 'macOS'
-        shell: bash
-        run: |
-          if [[ '${{ runner.arch }}' == 'X64' ]]; then
-            echo "PKG_ARCH=x86_64" >> $GITHUB_ENV
-            brew install llvm@16
-            echo "CC=$(brew --prefix llvm@16)/bin/clang" >> $GITHUB_ENV
-            echo "CXX=$(brew --prefix llvm@16)/bin/clang++" >> $GITHUB_ENV
-            echo "CPLUS_INCLUDE_PATH=" >> $GITHUB_ENV
-            #sudo xcodes install 15.3
-            #sudo xcode-select -switch /Applications/Xcode_15.3.app
-          else
-            echo "PKG_ARCH=armv8" >> $GITHUB_ENV
-            sudo xcode-select -switch /Applications/Xcode_16.2.app
-          fi
-
-          echo "MACOSX_DEPLOYMENT_TARGET=13.13" >> "$GITHUB_ENV"
+        uses: actions/github-script@v7
+        with:
+          script: |
+            if ('${{ runner.arch }}' == 'X64') {
+              target = '10.13';
+              arch='x86_64';
+            }
+            else if ('${{ env.PYTHON_MINOR }}' != '8') {
+              target = '11.0';
+              arch='armv8';
+            }
+            else {
+              target = '12.0';
+              arch='armv8';
+            }
+            core.exportVariable('MACOSX_DEPLOYMENT_TARGET', target);
+            core.exportVariable('PKG_ARCH', arch);
 
       - name: Retrieve cached dependencies
         id: retrieve-cache-deps
@@ -229,6 +232,7 @@ jobs:
             CMAKE_C_COMPILER_LAUNCHER
             PYTHON_MINOR
             BOOST_INSTALL_LAYOUT
+            SPDLOG_FMT_EXTERNAL
             CXX_VERSION
             BOOST_VERSION
             OIIO_VERSION
@@ -240,6 +244,7 @@ jobs:
             OPENVDB_VERSION
             SPDLOG_VERSION
             EMBREE3_VERSION
+            FMT_VERSION
             OPENSUBDIV_VERSION
             JSON_VERSION
             EIGEN_VERSION

conan-profiles/conan-profile-common

@@ -24,8 +24,6 @@ pkgconf/*
 yasm/*
 
 [options]
-spdlog/*:use_std_fmt=True
-spdlog/*:header_only=True
 oidn/*:shared=True
 embree3/*:shared=True
 embree3/*:with_tbb=True

conan-profiles/conan-profile-macOS-ARM64

@@ -4,7 +4,7 @@ include(conan-profile-common)
 
 [settings]
 os=Macos
-os.version=13.3
+os.version=11.0
 arch=armv8
 compiler=apple-clang
 compiler.version=15
@@ -37,3 +37,8 @@ embree3/*:avx2=False
 embree3/*:neon2x=True
 
 {% endif %}
+
+[buildenv]
+CXX=clang++
+CC=clang
+&:tools.build:cxxflags=["-O3"]

conan-profiles/conan-profile-macOS-X64

@@ -2,20 +2,22 @@ include(conan-profile-common)
 
 [settings]
 os=Macos
-os.version=13.3
+os.version=10.13
 arch=x86_64
-compiler=clang
-compiler.version=16
+compiler=apple-clang
+compiler.version=14.0
 compiler.cppstd={{ os.getenv("CXX_VERSION") }}
-compiler.libcxx=libstdc++11
+compiler.libcxx=libc++
 
 [options]
 minizip-ng/*:with_zlib=True
 minizip-ng/*:with_libcomp=False
 openvdb/*:simd=AVX
 
+[buildenv]
+CXX=clang++
+CC=clang
+
 [conf]
-&:tools.build:cxxflags+=["-ftree-vectorize", "-march=x86-64-v3", "-O3", "-mno-avx2", "-I/usr/local/opt/llvm@16/include"]
-&:tools.build:exelinkflags+=['-L/usr/local/opt/llvm@16/lib/c++ -Wl,-rpath,/usr/local/opt/llvm@16/lib/c++"]
-&:tools.build:sharedlinkflags+=['-L/usr/local/opt/llvm@16/lib/c++ -Wl,-rpath,/usr/local/opt/llvm@16/lib/c++"]
+&:tools.build:cxxflags+=["-ftree-vectorize", "-march=x86-64-v3", "-O3", "-mno-avx2"]
 # NB: Github MacOS X64 runner does not support avx2 nor avx512

conanfile.py

@@ -24,6 +24,7 @@
 _tbb_version = os.environ["TBB_VERSION"]
 _spdlog_version = os.environ["SPDLOG_VERSION"]
 _embree3_version = os.environ["EMBREE3_VERSION"]
+_fmt_version = os.environ["FMT_VERSION"]
 _opensubdiv_version = os.environ["OPENSUBDIV_VERSION"]
 _json_version = os.environ["JSON_VERSION"]
 _eigen_version = os.environ["EIGEN_VERSION"]
@@ -57,7 +58,7 @@ class LuxCore(ConanFile):
     ]
 
     default_options = {
-        # "fmt/*:header_only": True,  # TODO
+        "fmt/*:header_only": True,
         "spdlog/*:header_only": True,
         "openimageio/*:with_ffmpeg": False,
         "openimageio/*:with_libheif": False,
@@ -82,7 +83,7 @@ def requirements(self):
             transitive_libs=True,
         )
         self.requires("imath/3.1.9", override=True)
-        # self.requires(f"fmt/{_fmt_version}", override=True)  # TODO
+        self.requires(f"fmt/{_fmt_version}", override=True)
 
         if self.settings.os == "Macos":
             self.requires("llvm-openmp/18.1.8")