[ncurses] Fix "lib model" control. (#29881)

* [cmake-user] Test CMake package Curses with port ncurses * [ncurses] Control lib models
microsoft · Feb 28, 2023 · f937103 · f937103
1 parent 1d26dc8
commit f937103
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/ports/ncurses/portfile.cmake b/ports/ncurses/portfile.cmake
@@ -17,9 +17,9 @@ vcpkg_list(SET OPTIONS)
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
     list(APPEND OPTIONS
-        --with-shared
         --with-cxx-shared
-        --without-normal
+        --with-shared    # "lib model"
+        --without-normal # "lib model"
     )
 endif()
 
@@ -46,17 +46,12 @@ vcpkg_configure_make(
         --disable-db-install
         --enable-pc-files
         --without-ada
+        --without-debug # "lib model"
         --without-manpages
         --without-progs
         --without-tack
         --without-tests
         --with-pkg-config-libdir=libdir
-    OPTIONS_DEBUG
-        --with-debug
-        --without-normal
-    OPTIONS_RELEASE
-        --without-debug
-        --with-normal
 )
 vcpkg_install_make()
 

diff --git a/ports/ncurses/vcpkg.json b/ports/ncurses/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "ncurses",
   "version": "6.4",
+  "port-version": 1,
   "description": "Free software emulation of curses in System V Release 4.0, and more",
   "homepage": "https://invisible-island.net/ncurses/announce.html",
   "license": "MIT",

diff --git a/scripts/test_ports/cmake-user/vcpkg.json b/scripts/test_ports/cmake-user/vcpkg.json
@@ -133,6 +133,11 @@
           "default-features": false,
           "platform": "!uwp & !mingw"
         },
+        {
+          "$package": "Curses",
+          "name": "ncurses",
+          "platform": "!windows | mingw"
+        },
         {
           "$package": "PhysFS",
           "name": "physfs"

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -5354,7 +5354,7 @@
     },
     "ncurses": {
       "baseline": "6.4",
-      "port-version": 0
+      "port-version": 1
     },
     "neargye-semver": {
       "baseline": "0.3.0",

diff --git a/versions/n-/ncurses.json b/versions/n-/ncurses.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "faaf5fff20ee04db0b33a595cd37f41b89c840d6",
+      "version": "6.4",
+      "port-version": 1
+    },
     {
       "git-tree": "c557b7daa2f3a87a54e037e7b984ad8a661c5903",
       "version": "6.4",