[ports/inih] Upgrade to latest vcpkg recommendations

microsoft · Jul 20, 2022 · de69082 · de69082
1 parent dcfc086
commit de69082
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/ports/inih/CMakeLists.txt b/ports/inih/CMakeLists.txt
@@ -1,9 +1,10 @@
-project(inih)
+cmake_minimum_required(VERSION 3.14)
+project(iniparser LANGUAGES C CXX)
 
 set(SOURCES ini.c cpp/INIReader.cpp)
 set(HEADERS ini.h cpp/INIReader.h)
 
-add_library(inih ${SOURCES})
+add_library(inih ${HEADERS} ${SOURCES})
 
 install(
     TARGETS inih

diff --git a/ports/inih/portfile.cmake b/ports/inih/portfile.cmake
@@ -10,12 +10,11 @@ vcpkg_from_github(
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/inih RENAME copyright)
 

diff --git a/ports/inih/vcpkg.json b/ports/inih/vcpkg.json
@@ -1,5 +1,17 @@
 {
   "name": "inih",
   "version": "56",
-  "description": "Simple .INI file parser"
+  "description": "Simple .INI file parser",
+  "homepage": "https://github.com/benhoyt/inih",
+  "license": "BSD-3-Clause",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/versions/i-/inih.json b/versions/i-/inih.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "c2dda57212f34f1402b1b156cc869f1888a2c6ed",
+      "git-tree": "8c8ad9416cc29d6261d2ff076e96cde766248d33",
       "version": "56",
       "port-version": 0
     },