arm64 test

azerg · Jul 3, 2024 · 13bac30 · 13bac30
1 parent 2741e58
commit 13bac30
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 20 deletions.
diff --git a/.github/workflows/CI_build.yml b/.github/workflows/CI_build.yml
@@ -17,7 +17,7 @@ jobs:
             build_platform: Win32
             build_platform_vcpkg: x86
           - build_configuration: RelWithDebInfo
-            build_platform: ARM64
+            build_platform: arm64
             build_platform_vcpkg: arm64
 
     steps:

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 bin/
 build/
+vcpkg_installed/
 
diff --git a/src/NppBplistPlugin/src/CMakeLists.txt b/src/NppBplistPlugin/src/CMakeLists.txt
@@ -7,11 +7,11 @@ find_files_by_mask(SOURCE_FILES "*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}")
 find_files_by_mask(HEADER_FILES "*.h" "${CMAKE_CURRENT_SOURCE_DIR}")
 find_files_by_mask(RC_FILES "rsrc.rc" "${CMAKE_CURRENT_SOURCE_DIR}")
 
-if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-  set(TARGET_TRIPLET "x64-windows-static")
-elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
-  set(TARGET_TRIPLET "x86-windows-static")
-endif()
+#if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+#  set(TARGET_TRIPLET "x64-windows-static")
+#elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
+#  set(TARGET_TRIPLET "x86-windows-static")
+#endif()
 
 add_library(NppBplistPlugin SHARED ${SOURCE_FILES} ${HEADER_FILES} ${RC_FILES})
 
@@ -20,7 +20,8 @@ set_property(TARGET NppBplistPlugin PROPERTY
 
 target_include_directories(NppBplistPlugin PUBLIC "${VCPKG_INSTALLED_DIR}/${TARGET_TRIPLET}/include")
 
-find_library(PLISTPP_LIB NAMES plist++-2.0 PATHS "${VCPKG_INSTALLED_DIR}/${TARGET_TRIPLET}/lib" NO_DEFAULT_PATH)
-find_library(PLIST_LIB NAMES plist-2.0 PATHS "${VCPKG_INSTALLED_DIR}/${TARGET_TRIPLET}/lib" NO_DEFAULT_PATH)
+#find_library(PLISTPP_LIB NAMES plist++-2.0 PATHS "${VCPKG_INSTALLED_DIR}/${TARGET_TRIPLET}/lib" NO_DEFAULT_PATH)
+#find_library(PLIST_LIB NAMES plist-2.0 PATHS "${VCPKG_INSTALLED_DIR}/${TARGET_TRIPLET}/lib" NO_DEFAULT_PATH)
+find_package(unofficial-libplist CONFIG REQUIRED)
 
-target_link_libraries(NppBplistPlugin PUBLIC ${PLIST_LIB} ${PLISTPP_LIB})
+target_link_libraries(NppBplistPlugin PUBLIC unofficial::libplist::libplist unofficial::libplist::libplist++)
diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json
@@ -2,14 +2,6 @@
   "default-registry": {
     "kind": "git",
     "repository": "https://github.com/microsoft/vcpkg",
-    "baseline": "5962cf5a3bfc2124e8de991a4e45a8edcb3b4c69"
-  },
-  "registries": [
-    {
-      "kind": "filesystem",
-      "path": "./vcpkg/vcpkg-registry",
-      "baseline": "",
-      "packages": [ "libplist" ]
-    }
-  ]
+    "baseline": "c202ce4d469096bd6d46fe65de74a4737beee01b"
+  }
 }
diff --git a/vcpkg.json b/vcpkg.json
@@ -4,4 +4,4 @@
   "dependencies": [
     "libplist"
   ]
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,4 +4,4 @@ @@
       "dependencies": [
         "libplist"
       ]
-    }
+    }