adapt macos platform (#3)

* adapt macos platform

mcpp-community/OpenOrg#1

Signed-off-by: SPeak Shen <speakshen@163.com>

* chagne module-partition to json-module, but add `mcpplibs.llmapi`prefix to avoid module conflict issue

---------

Signed-off-by: SPeak Shen <speakshen@163.com>

Author: Sunrisepeak

examples/xmake.lua

@@ -1,16 +1,23 @@
-target("hello_mcpp")
-    set_kind("binary")
-    add_files("hello_mcpp.cpp")
-    add_deps("llmapi")
+-- TODO: fix build on macOS (12.3) libc++/println issue
+if not is_host("macosx") then
+    -- xmake f --toolchain=llvm --sdk=/opt/homebrew/opt/llvm@20
+    --add_ldflags("-L/opt/homebrew/opt/llvm@20/lib/c++ -L/opt/homebrew/opt/llvm@20/lib/unwind -lunwind")
 
-target("basic")
-    set_kind("binary")
-    add_files("basic.cpp")
-    add_deps("llmapi")
+    target("hello_mcpp")
+        set_kind("binary")
+        add_files("hello_mcpp.cpp")
+        add_deps("llmapi")
+
+    target("basic")
+        set_kind("binary")
+        add_files("basic.cpp")
+        add_deps("llmapi")
+
+    target("chat")
+        set_kind("binary")
+        add_files("chat.cpp")
+        add_deps("llmapi")
+end
 
-target("chat")
-    set_kind("binary")
-    add_files("chat.cpp")
-    add_deps("llmapi")
 
 includes("c")

src/json/json.cppm

@@ -2,7 +2,8 @@ module;
 
 #include <json.hpp>
 
-export module nlohmann.json;
+//export module nlohmann.json; // workaround for module name conflict in some build systems
+export module mcpplibs.llmapi.nlohmann.json;
 
 export namespace nlohmann {
     using ::nlohmann::adl_serializer;

src/llmapi.cppm

@@ -1,11 +1,11 @@
 export module mcpplibs.llmapi;
 
-import std;
+export import :url;
+export import :openai;
 
-import nlohmann.json;
+import std;
 
-import mcpplibs.llmapi.url;
-import mcpplibs.llmapi.openai;
+import mcpplibs.llmapi.nlohmann.json;
 
 namespace mcpplibs::llmapi {
     export using OpenAI = openai::OpenAI;

src/openai.cppm

@@ -2,12 +2,13 @@ module;
 
 #include <curl/curl.h>
 
-export module mcpplibs.llmapi.openai;
+export module mcpplibs.llmapi:openai;
+
+export import :url;
 
 import std;
-import nlohmann.json;
 
-import mcpplibs.llmapi.url;
+import mcpplibs.llmapi.nlohmann.json;
 
 export namespace mcpplibs::llmapi::openai {
 

src/url.cppm

@@ -1,4 +1,4 @@
-export module mcpplibs.llmapi.url;
+export module mcpplibs.llmapi:url;
 
 import std;
 

xmake.lua

@@ -7,24 +7,23 @@ add_requires("libcurl 8.11.0")
 set_languages("c++23")
 
 target("llmapi")
-    set_kind("static")
+    set_kind("moduleonly")
     add_files("src/*.cppm", { public = true, install = true })
-    add_packages("libcurl")
+    add_packages("libcurl", { public = true })
     --add_deps("__nlohmann_json")
     add_includedirs("src/json")
     add_headerfiles("src/json/json.hpp")
     add_files("src/json/json.cppm", { public = true })
     -- relocation R_X86_64_32 against `.rodata' can not be used when making a shared object; recompile with -fPIC
     -- ld: failed to set dynamic section sizes: bad value
     -- collect2: error: ld returned 1 exit status
-    add_cxxflags("-fPIC")
+    --add_cxxflags("-fPIC")
 
 target("llmapi_c")
     --set_kind("shared")
     set_kind("static")
     add_files("src/c/llmapi.cpp")
     add_deps("llmapi")
-    add_packages("libcurl")
     add_includedirs("include", { public = true })
     add_headerfiles("include/llmapi.h")