fix link order

.github/workflows/CI.yml

@@ -28,6 +28,7 @@ jobs:
       - name: fmt
         run: |
           make fmt
+          git diff --exit-code
       - name: test
         run: |
           make test

CMakeLists.txt

@@ -8,7 +8,7 @@ include(FetchContent)
 FetchContent_Declare(
   vsag
   GIT_REPOSITORY https://github.com/alipay/vsag
-  GIT_TAG v0.11.6
+  GIT_TAG v0.11.7
 )
 FetchContent_MakeAvailable(vsag)
 

Makefile

@@ -2,6 +2,7 @@
 .PHONY: fmt
 fmt:
 	find src include -iname "*.h" -o -iname "*.cpp" | xargs clang-format -i
+	cargo fmt
 
 .PHONY: test
 test:

build.rs

@@ -15,6 +15,7 @@
 fn main() {
     println!("cargo:rerun-if-changed=include/wrapper.h");
     println!("cargo:rerun-if-changed=src/wrapper.cpp");
+    println!("cargo:rerun-if-changed=build.rs");
 
     let dst = cmake::Config::new("")
         .build_target("vsag_wrapper")
@@ -23,11 +24,11 @@ fn main() {
         .env("TARGET", "")
         .build();
 
+    println!("cargo:rustc-link-lib=static=vsag_wrapper");
+    println!("cargo:rustc-link-lib=dylib=vsag");
     println!("cargo:rustc-link-search=native={}/build", dst.display());
     println!(
         "cargo:rustc-link-search=native={}/build/_deps/vsag-build/src",
         dst.display()
     );
-    println!("cargo:rustc-link-lib=dylib=vsag");
-    println!("cargo:rustc-link-lib=static=vsag_wrapper");
 }

include/wrapper.h

@@ -18,7 +18,9 @@
 #include <cstddef>
 #include <cstdint>
 
+#ifdef __cplusplus
 extern "C" {
+#endif
 
 #define VSAG_WRAPPER_MAX_ERROR_MESSAGE_LENGTH 256
 
@@ -61,4 +63,6 @@ void free_i64_vector(int64_t *vector);
 void free_f32_vector(float *vector);
 } // extern "C"
 
+#ifdef __cplusplus
 #endif // WRAPPER_H
+#endif

src/wrapper.cpp

@@ -33,6 +33,7 @@ template <typename T> static void readBinaryPOD(std::istream &in, T &podRef) {
 }
 
 extern "C" {
+
 CError *new_error(int type_, const char *msg) {
   CError *err = (CError *)malloc(sizeof(CError));
   if (err == NULL) {