MeshInspector · oitel · Apr 20, 2026 · Apr 21, 2026 · Apr 21, 2026 · Apr 21, 2026
diff --git a/.github/workflows/build-test-linux-vcpkg.yml b/.github/workflows/build-test-linux-vcpkg.yml
@@ -115,7 +115,7 @@ jobs:
           # related issue: https://github.com/actions/checkout/issues/1779
           export HOME=${RUNNER_TEMP}
           git config --global --add safe.directory ${GITHUB_WORKSPACE}
-          git submodule update --init --recursive --depth 1 thirdparty/imgui thirdparty/mrbind-pybind11 thirdparty/mrbind thirdparty/fastmcpp thirdparty/nlohmann-json thirdparty/cpp-httplib
+          git submodule update --init --recursive --depth 1 thirdparty/imgui thirdparty/mrbind-pybind11 thirdparty/mrbind
 
       - name: Install MRBind
         if: ${{ inputs.mrbind || inputs.mrbind_c }}

diff --git a/.github/workflows/build-test-windows.yml b/.github/workflows/build-test-windows.yml
@@ -103,6 +103,11 @@ jobs:
           role-to-assume: arn:aws:iam::259351611210:role/GitHubMeshLibAwsCredsRole
           aws-region: us-east-1
 
+      - name: Enable VS2019 toolset for vcpkg
+        if: ${{ matrix.cxx_compiler == 'msvc-2019' }}
+        run: |
+          (Get-Content thirdparty\vcpkg\triplets\x64-windows-meshlib.cmake) -Replace '^#vs2019toolset#', '' | Set-Content thirdparty\vcpkg\triplets\x64-windows-meshlib.cmake
+
       - name: Update vcpkg packages
         run: |
           .\thirdparty\install.bat --write-s3 --use-s3-asset-provider

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -58,9 +58,6 @@ option(MESHLIB_BUILD_GENERATED_C_BINDINGS "Build C bindings (assuming they are a
 
 option(MESHLIB_BUILD_MRCUDA "Build MRCuda library" ON)
 option(MESHLIB_EXPERIMENTAL_HIP "(experimental) Use HIP toolkit for MRCuda library" OFF)
-IF(MR_EMSCRIPTEN)
-  set(MESHLIB_BUILD_MCP OFF)
-ENDIF()
 IF(MR_EMSCRIPTEN OR APPLE)
   set(MESHLIB_BUILD_MRCUDA OFF)
 ENDIF()
@@ -76,6 +73,7 @@ IF(MR_EMSCRIPTEN)
   set(MESHLIB_PYTHON_SUPPORT OFF)
   set(MESHLIB_BUILD_PYTHON_MODULES OFF)
   set(MESHLIB_BUILD_MESHCONV OFF)
+  set(MESHLIB_BUILD_MCP OFF)
 ENDIF()
 
 # Python modules are incompatible with _ITERATOR_DEBUG_LEVEL=2 because the

diff --git a/docker/rockylinux8-vcpkgDockerfile b/docker/rockylinux8-vcpkgDockerfile
@@ -27,6 +27,10 @@ RUN python3.12 -m venv venv && \
     source venv/bin/activate && \
     pip install jinja2
 
+COPY requirements/vcpkg-linux.txt MeshLib/requirements.txt
+COPY thirdparty/vcpkg/ports MeshLib/ports
+COPY thirdparty/vcpkg/triplets MeshLib/triplets
+
 ARG VCPKG_VERSION
 ENV VCPKG_VERSION=$VCPKG_VERSION
 RUN git clone https://github.com/microsoft/vcpkg.git --branch $VCPKG_VERSION --single-branch && \
@@ -40,17 +44,13 @@ RUN sed -i 's|https://ftp.gnu.org/|https://www.mirrorservice.org/sites/ftp.gnu.o
     sed -i 's|https://ftp.gnu.org/|https://www.mirrorservice.org/sites/ftp.gnu.org/|' ports/gettext/portfile.cmake
 
 # build vcpkg packages
-COPY requirements/vcpkg-linux.txt MeshLib/requirements.txt
-COPY thirdparty/vcpkg/ports MeshLib/ports
-COPY thirdparty/vcpkg/triplets MeshLib/triplets
-
 ARG VCPKG_TRIPLET
 ENV VCPKG_TRIPLET=$VCPKG_TRIPLET
 RUN source /opt/rh/gcc-toolset-11/enable && \
     source /opt/autoconf27/enable && \
     source /root/venv/bin/activate && \
-    ./vcpkg install --host-triplet=${VCPKG_TRIPLET} --overlay-triplets=MeshLib/triplets --overlay-ports=MeshLib/ports $(cat MeshLib/requirements.txt | tr '\n' ' ')
-RUN ./vcpkg export --host-triplet=${VCPKG_TRIPLET} --overlay-triplets=MeshLib/triplets --x-all-installed --raw --output=vcpkg --output-dir=/opt
+    ./vcpkg install --host-triplet=${VCPKG_TRIPLET} --overlay-triplets=../MeshLib/triplets --overlay-ports=../MeshLib/ports $(cat ../MeshLib/requirements.txt | tr '\n' ' ')
+RUN ./vcpkg export --host-triplet=${VCPKG_TRIPLET} --overlay-triplets=../MeshLib/triplets --x-all-installed --raw --output=vcpkg --output-dir=/opt
 
 
 FROM nvidia/cuda:12.0.1-devel-rockylinux8 AS production

diff --git a/docker/rockylinux9-vcpkgDockerfile b/docker/rockylinux9-vcpkgDockerfile
@@ -16,6 +16,10 @@ RUN echo "install_weak_deps=false" >> /etc/dnf/dnf.conf && \
 
 WORKDIR /root
 
+COPY requirements/vcpkg-linux.txt MeshLib/requirements.txt
+COPY thirdparty/vcpkg/ports MeshLib/ports
+COPY thirdparty/vcpkg/triplets MeshLib/triplets
+
 ARG VCPKG_VERSION
 ENV VCPKG_VERSION=$VCPKG_VERSION
 RUN git clone https://github.com/microsoft/vcpkg.git --branch $VCPKG_VERSION --single-branch && \
@@ -29,15 +33,11 @@ RUN sed -i 's|https://ftp.gnu.org/|https://www.mirrorservice.org/sites/ftp.gnu.o
     sed -i 's|https://ftp.gnu.org/|https://www.mirrorservice.org/sites/ftp.gnu.org/|' ports/gettext/portfile.cmake
 
 # build vcpkg packages
-COPY requirements/vcpkg-linux.txt MeshLib/requirements.txt
-COPY thirdparty/vcpkg/ports MeshLib/ports
-COPY thirdparty/vcpkg/triplets MeshLib/triplets
-
 ARG VCPKG_TRIPLET
 ENV VCPKG_TRIPLET=$VCPKG_TRIPLET
 RUN source /opt/rh/autoconf271/enable && \
-    ./vcpkg install --host-triplet=${VCPKG_TRIPLET} --overlay-triplets=MeshLib/triplets --overlay-ports=MeshLib/ports $(cat MeshLib/requirements.txt | tr '\n' ' ')
-RUN ./vcpkg export --host-triplet=${VCPKG_TRIPLET} --overlay-triplets=MeshLib/triplets --x-all-installed --raw --output=vcpkg --output-dir=/opt
+    ./vcpkg install --host-triplet=${VCPKG_TRIPLET} --overlay-triplets=../MeshLib/triplets --overlay-ports=../MeshLib/ports $(cat ../MeshLib/requirements.txt | tr '\n' ' ')
+RUN ./vcpkg export --host-triplet=${VCPKG_TRIPLET} --overlay-triplets=../MeshLib/triplets --x-all-installed --raw --output=vcpkg --output-dir=/opt
 
 
 FROM nvidia/cuda:12.0.1-devel-rockylinux9 AS production

diff --git a/requirements/macos.txt b/requirements/macos.txt
@@ -1,5 +1,6 @@
 boost
 cmake
+cpp-httplib
 cpr
 eigen
 fmt
@@ -14,6 +15,7 @@ libtiff
 libzip
 llvm@14
 ninja
+nlohmann-json
 opencascade
 openssl@3
 openvdb

diff --git a/requirements/vcpkg-linux.txt b/requirements/vcpkg-linux.txt
@@ -15,6 +15,7 @@ clip
 cpr
 dbus
 eigen3
+fastmcpp
 freetype
 gdcm
 glad

diff --git a/requirements/windows.txt b/requirements/windows.txt
@@ -14,6 +14,7 @@ boost-url
 libjpeg-turbo
 cpr
 eigen3
+fastmcpp
 freetype
 gdcm
 gtest

diff --git a/scripts/build_thirdparty.sh b/scripts/build_thirdparty.sh
@@ -153,17 +153,8 @@ else
 
   # build clip separately
   CMAKE_OPTIONS="${MR_CMAKE_OPTIONS}" ${SCRIPT_DIR}/thirdparty/clip.sh ${MESHLIB_THIRDPARTY_DIR}/clip
-
-  # Skip this on Mac, we use `add_subdirectory()` for those libraries there.
-  # This is because we can't use `find_package()` there to find our own libraries, because that breaks Python modules, as documented in the root `CMakeLists.txt`.
-  if [[ $OSTYPE != 'darwin'* ]]; then
-    # Build nlohmann-json separately. It is header-only, this just installs it. It is a dependency of fastmcpp.
-    CMAKE_OPTIONS="${MR_CMAKE_OPTIONS}" ${SCRIPT_DIR}/thirdparty/nlohmann-json.sh "$MESHLIB_THIRDPARTY_DIR/nlohmann-json"
-    # Build cpp-httplib separately. It is header-only, this just installs it. It is a dependency of fastmcpp.
-    CMAKE_OPTIONS="${MR_CMAKE_OPTIONS}" ${SCRIPT_DIR}/thirdparty/cpp-httplib.sh "$MESHLIB_THIRDPARTY_DIR/cpp-httplib"
-    # Build fastmcpp separately.
-    CMAKE_OPTIONS="${MR_CMAKE_OPTIONS}" ${SCRIPT_DIR}/thirdparty/fastmcpp.sh "$MESHLIB_THIRDPARTY_DIR/fastmcpp" ./fastmcpp_build "${MESHLIB_THIRDPARTY_ROOT_DIR}"
-  fi
+  # build fastmcpp separately
+  CMAKE_OPTIONS="${MR_CMAKE_OPTIONS}" ${SCRIPT_DIR}/thirdparty/fastmcpp.sh ${MESHLIB_THIRDPARTY_DIR}/fastmcpp
 fi
 popd
 

diff --git a/scripts/thirdparty/cpp-httplib.sh b/scripts/thirdparty/cpp-httplib.sh
diff --git a/scripts/thirdparty/fastmcpp.sh b/scripts/thirdparty/fastmcpp.sh
@@ -1,10 +1,9 @@
 #!/bin/bash
-set -exo pipefail
+set -eo pipefail
 
 SOURCE_DIR="$1"
 BUILD_DIR="${2:-./fastmcpp_build}"
 
-# Sync those flags with `source/fastmcpp/CMakeLists.txt`.
 CMAKE_OPTIONS="${CMAKE_OPTIONS} \
   -D FASTMCPP_BUILD_TESTS=OFF \
   -D FASTMCPP_BUILD_EXAMPLES=OFF \

diff --git a/scripts/thirdparty/nlohmann-json.sh b/scripts/thirdparty/nlohmann-json.sh
diff --git a/source/MRMcp/CMakeLists.txt b/source/MRMcp/CMakeLists.txt
@@ -5,29 +5,25 @@ file(GLOB SOURCES "*.cpp")
 
 add_library(${PROJECT_NAME} SHARED ${SOURCES} ${HEADERS})
 
+find_package(fastmcpp REQUIRED
+  HINTS "${MESHLIB_THIRDPARTY_ROOT_DIR}"
+)
+
 target_link_libraries(${PROJECT_NAME}
   PUBLIC
     MRMesh
+  PRIVATE
+    fastmcpp::fastmcpp_core
 )
+# TODO: why does it affect only Linux+vcpkg?
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND MESHLIB_USE_VCPKG)
+  # fix missing references to 'getaddrinfo_a' and 'gai_*' functions (required by cpp-httplib)
+  target_link_libraries(${PROJECT_NAME} PRIVATE anl)
+endif()
 
-IF(MR_PCH)
+if(MR_PCH)
   target_precompile_headers(${PROJECT_NAME} REUSE_FROM MRPch)
-ENDIF()
-
-# On Windows, and on Linux+Vcpkg there is no third-party build script, so add fastmcpp as a subdirectory.
-IF(MESHLIB_USE_VCPKG OR APPLE)
-  set(FASTMCPP_DEPS_ADD_SUBDIRECTORY ON)
-  add_subdirectory(../fastmcpp fastmcpp)
-  target_link_libraries(${PROJECT_NAME} PRIVATE fastmcpp_core)
-  target_include_directories(${PROJECT_NAME} PRIVATE
-    ${MESHLIB_THIRDPARTY_DIR}/fastmcpp/include
-    ${MESHLIB_THIRDPARTY_DIR}/cpp-httplib
-    ${MESHLIB_THIRDPARTY_DIR}/nlohmann-json/include
-  )
-ELSE()
-  find_package(fastmcpp REQUIRED)
-  target_link_libraries(${PROJECT_NAME} PUBLIC fastmcpp::fastmcpp_core)
-ENDIF()
+endif()
 
 install(
   TARGETS ${PROJECT_NAME}

diff --git a/source/MRMcp/MRMcp.vcxproj b/source/MRMcp/MRMcp.vcxproj
@@ -18,9 +18,6 @@
     <ClCompile Include="MRMcp.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\fastmcpp\fastmcpp.vcxproj">
-      <Project>{7853aec9-a364-4587-89ae-faa9a463e6ed}</Project>
-    </ProjectReference>
     <ProjectReference Include="..\MRMesh\MRMesh.vcxproj">
       <Project>{c7780500-ca0e-4f5f-8423-d7ab06078b14}</Project>
     </ProjectReference>
@@ -66,7 +63,7 @@
       <PreprocessorDefinitions>MRMcp_EXPORTS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <TreatWarningAsError>true</TreatWarningAsError>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);..\..\thirdparty\fastmcpp\include;..\..\thirdparty\cpp-httplib;..\..\thirdparty\nlohmann-json\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4099;4100;4242;4244;4355;4456;4458;4464;4505;4702;5204;5220;5233;5245;5267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
@@ -104,4 +101,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/source/MRMcp/MRMcpConfig.cmake b/source/MRMcp/MRMcpConfig.cmake
@@ -1,5 +1,3 @@
 include(CMakeFindDependencyMacro)
 
-IF(NOT MESHLIB_USE_VCPKG AND NOT APPLE)
-  find_dependency(fastmcpp)
-endif()
+find_dependency(fastmcpp)
diff --git a/source/MRMcp/exports.h b/source/MRMcp/exports.h
@@ -1,6 +1,5 @@
 #pragma once
 
-// see explanation in MRMesh/MRMeshFwd.h
 #ifdef _WIN32
 #   ifdef MRMcp_EXPORTS
 #       define MRMCP_API __declspec(dllexport)

diff --git a/source/MRPch/MRPch.h b/source/MRPch/MRPch.h
@@ -1,14 +1,5 @@
 #pragma once
 
-// Work around Clang quirk: https://github.com/llvm/llvm-project/issues/86077
-// This quirk causes issues for Fastmcpp on Mac Arm.
-// This must be included before `<exception>` to work correctly, so effectively before any standard library headers.
-#if defined( __APPLE__ ) && defined( __arm64__ )
-#include <version>
-#undef _LIBCPP_AVAILABILITY_HAS_INIT_PRIMARY_EXCEPTION
-#define _LIBCPP_AVAILABILITY_HAS_INIT_PRIMARY_EXCEPTION 0
-#endif
-
 #pragma warning(push)
 #pragma warning(disable: 4820) //#pragma warning: N bytes padding added after data member
 

diff --git a/source/MRViewer/CMakeLists.txt b/source/MRViewer/CMakeLists.txt
@@ -117,13 +117,6 @@ ENDIF()
 
 IF(MESHLIB_BUILD_MCP)
   target_link_libraries(${PROJECT_NAME} PRIVATE MRMcp)
-
-  # If we're using fastmcpp from a subdirectory, we need to add this explicitly. Not the best way to do this, we should probably find a proper solution.
-  IF(MESHLIB_USE_VCPKG OR APPLE)
-    target_include_directories(${PROJECT_NAME} PRIVATE
-      ${MESHLIB_THIRDPARTY_DIR}/nlohmann-json/include
-    )
-  ENDIF()
 ELSE()
   target_compile_definitions(${PROJECT_NAME} PRIVATE MESHLIB_NO_MCP)
 ENDIF()

diff --git a/source/MRViewer/MRViewer.vcxproj b/source/MRViewer/MRViewer.vcxproj
@@ -522,7 +522,7 @@
       <ConformanceMode>true</ConformanceMode>
       <TreatWarningAsError>true</TreatWarningAsError>
       <PrecompiledHeaderFile>$(ProjectDir)..\MRPch\MRPch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(ProjectDir)..\..\thirdparty;$(ProjectDir)\..\..\thirdparty\imgui\;..\..\thirdparty\fastmcpp\include;..\..\thirdparty\cpp-httplib;..\..\thirdparty\nlohmann-json\include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(ProjectDir)..\..\thirdparty;$(ProjectDir)\..\..\thirdparty\imgui\</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>$(ProjectDir)..\MRPch\MRPch.h</ForcedIncludeFiles>
       <PrecompiledHeaderOutputFile>$(SolutionDir)TempOutput\MRPch\$(Platform)\$(Configuration)\MRPch.pch</PrecompiledHeaderOutputFile>
     </ClCompile>
@@ -568,4 +568,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/source/MRViewer/MRViewer.vcxproj.filters b/source/MRViewer/MRViewer.vcxproj.filters
@@ -529,8 +529,8 @@
     <ClCompile Include="MRI18n.cpp">
       <Filter>Localization</Filter>
     </ClCompile>
-    <ClCompile Include="MRMcp.cpp">
-      <Filter>AI</Filter>
+    <ClCompile Include="MRViewerMcp.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -1050,9 +1050,6 @@
     <ClInclude Include="MRLocaleMacos.h">
       <Filter>Localization</Filter>
     </ClInclude>
-    <ClInclude Include="MRMcp.h">
-      <Filter>AI</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="$(ProjectDir)..\.editorconfig" />
@@ -1273,4 +1270,4 @@
       <Filter>resource\independent_icons\X3</Filter>
     </Image>
   </ItemGroup>
-</Project>
+</Project>
diff --git a/source/MeshLib.sln b/source/MeshLib.sln
@@ -62,8 +62,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MREmbeddedPython", "MREmbed
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MRTestCuda", "MRTestCuda\MRTestCuda.vcxproj", "{FFB8D063-FF1E-4F18-8479-249B36714EF7}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fastmcpp", "fastmcpp\fastmcpp.vcxproj", "{7853AEC9-A364-4587-89AE-FAA9A463E6ED}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MRMcp", "MRMcp\MRMcp.vcxproj", "{C8250F26-E01D-4A63-98CD-68069D818080}"
 EndProject
 Global
@@ -156,11 +154,7 @@ Global
 		{FFB8D063-FF1E-4F18-8479-249B36714EF7}.Debug|x64.Build.0 = Debug|x64
 		{FFB8D063-FF1E-4F18-8479-249B36714EF7}.Release|x64.ActiveCfg = Release|x64
 		{FFB8D063-FF1E-4F18-8479-249B36714EF7}.Release|x64.Build.0 = Release|x64
-        {7853AEC9-A364-4587-89AE-FAA9A463E6ED}.Debug|x64.ActiveCfg = Debug|x64
-		{7853AEC9-A364-4587-89AE-FAA9A463E6ED}.Debug|x64.Build.0 = Debug|x64
-		{7853AEC9-A364-4587-89AE-FAA9A463E6ED}.Release|x64.ActiveCfg = Release|x64
-		{7853AEC9-A364-4587-89AE-FAA9A463E6ED}.Release|x64.Build.0 = Release|x64
-        {C8250F26-E01D-4A63-98CD-68069D818080}.Debug|x64.ActiveCfg = Debug|x64
+		{C8250F26-E01D-4A63-98CD-68069D818080}.Debug|x64.ActiveCfg = Debug|x64
 		{C8250F26-E01D-4A63-98CD-68069D818080}.Debug|x64.Build.0 = Debug|x64
 		{C8250F26-E01D-4A63-98CD-68069D818080}.Release|x64.ActiveCfg = Release|x64
 		{C8250F26-E01D-4A63-98CD-68069D818080}.Release|x64.Build.0 = Release|x64
@@ -190,7 +184,6 @@ Global
 		{5612E480-6980-4242-9039-BE367F4ECBF0} = {DAEF3759-BD96-475D-AA71-96ACC5279E43}
 		{E0202297-EDB2-4CDC-9CD0-8921EFF08DA0} = {AE8B4895-7920-4AD3-B554-C858A08B1680}
 		{FFB8D063-FF1E-4F18-8479-249B36714EF7} = {E0BE85ED-C366-40EF-8BDE-70E1EDC8860F}
-		{7853AEC9-A364-4587-89AE-FAA9A463E6ED} = {AE8B4895-7920-4AD3-B554-C858A08B1680}
 		{C8250F26-E01D-4A63-98CD-68069D818080} = {AE8B4895-7920-4AD3-B554-C858A08B1680}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,7 @@ clip @@
     cpr
     dbus
     eigen3
+    fastmcpp
     freetype
     gdcm
     glad
@@ Expand Down @@