Try again.

Author: adalisk-emikhaylov

CMakeLists.txt

@@ -295,15 +295,6 @@ IF(NOT MR_EMSCRIPTEN AND NOT APPLE)
 ENDIF()
 
 IF(MESHLIB_BUILD_MCP AND NOT MR_EMSCRIPTEN)
-  # 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)
-    IF(APPLE)
-      set(FASTMCPP_DEPS_ADD_SUBDIRECTORY ON)
-    ENDIF()
-    add_subdirectory(${MESHLIB_THIRDPARTY_DIR}/fastmcpp fastmcpp)
-  ELSE()
-    find_package(fastmcpp REQUIRED)
-  ENDIF()
   add_subdirectory(${PROJECT_SOURCE_DIR}/MRMcp ./MRMcp)
 ENDIF()
 

source/MRMcp/CMakeLists.txt

@@ -8,25 +8,27 @@ add_library(${PROJECT_NAME} SHARED ${SOURCES} ${HEADERS})
 target_link_libraries(${PROJECT_NAME}
   PUBLIC
     MRMesh
-    fastmcpp::fastmcpp_core
 )
 
 IF(MR_PCH)
   target_precompile_headers(${PROJECT_NAME} REUSE_FROM MRPch)
 ENDIF()
 
-# Fastmcpp stuff.
-option(MESHLIB_BUILD_MCP "Enable MCP server" ON)
-IF(MESHLIB_BUILD_MCP AND NOT MR_EMSCRIPTEN)
+# 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)
+  IF(APPLE)
+    set(FASTMCPP_DEPS_ADD_SUBDIRECTORY ON)
+  ENDIF()
+  add_subdirectory(${MESHLIB_THIRDPARTY_DIR}/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()
-  target_compile_definitions(${PROJECT_NAME} PRIVATE MR_ENABLE_MCP_SERVER=0)
+  find_package(fastmcpp REQUIRED)
+  target_link_libraries(${PROJECT_NAME} PUBLIC fastmcpp::fastmcpp_core)
 ENDIF()
 
 install(