[cppad/cpuid] Update to latest version (#20187)

* [cppad/cpuid] Update to latest version

* Add quotes to SOURCE_PATH

Co-authored-by: Cheney-Wang <v-xincwa@microsoft.com>

8 files changed, 55 insertions, 88 deletions

diff --git a/ports/cppad/portfile.cmake b/ports/cppad/portfile.cmake
index 1c9fc8ddf..1a041d48f 100644
--- a/ports/cppad/portfile.cmake
+++ b/ports/cppad/portfile.cmake
@@ -5,17 +5,15 @@ vcpkg_fail_port_install(ON_TARGET "uwp" and "arm")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO coin-or/CppAD
-    REF 20200000.3
-    SHA512 4e980665a21c76cf355d1c5597c65fbfba7ac3e15c43a88ccfe3ba0267b85b4e9aa7c6e8a0ed7a728f8cf2c6e1424625d5cbcdd295a6c0a08b47b4b121572d13
+    REF 90c510458b61049c51f937fc6ed2e611fbb17b8b #20210000.7
+    SHA512 112a4663a3e13f2d852c4ce4e57f6bee2dc7584915fcbab75972568258faab0d4a5761c4eaa4c664543cb8674e8e70c0623054c07dff933f9513a47f1c7d6261
     HEAD_REF master
     PATCHES
         windows-fix.patch
-        pkgconfig-fix.patch
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         -Dcppad_prefix=${CURRENT_PACKAGES_DIR}
@@ -26,17 +24,17 @@ vcpkg_configure_cmake(
         -Dcmake_install_libdirs=debug/lib
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 # Install the pkgconfig file
 if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-    file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/pkgconfig/cppad.pc DESTINATION ${CURRENT_PACKAGES_DIR}/lib/pkgconfig)
+    file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/pkgconfig/cppad.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
 endif()
 if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-    file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/pkgconfig/cppad.pc DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig)
+    file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/pkgconfig/cppad.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
 endif()
 
 vcpkg_fixup_pkgconfig()
 
 # Add the copyright
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/cppad/vcpkg.json b/ports/cppad/vcpkg.json
index a2108bcec..fdc3cad7a 100644
--- a/ports/cppad/vcpkg.json
+++ b/ports/cppad/vcpkg.json
@@ -1,8 +1,17 @@
 {
   "name": "cppad",
-  "version-string": "20200000.3",
-  "port-version": 1,
+  "version-string": "20210000.7",
   "description": "CppAD: A Package for Differentiation of C++ Algorithms",
   "homepage": "https://github.com/coin-or/CppAD",
-  "supports": "!(arm | uwp)"
+  "supports": "!(arm | uwp)",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/ports/cppad/windows-fix.patch b/ports/cppad/windows-fix.patch
index 50c38ca12..585e3294e 100644
--- a/ports/cppad/windows-fix.patch
+++ b/ports/cppad/windows-fix.patch
@@ -1,60 +1,3 @@
-diff --git a/cppad_lib/cppad_colpack.cpp b/cppad_lib/cppad_colpack.cpp
-index dc3327053..739363292 100644
---- a/cppad_lib/cppad_colpack.cpp
-+++ b/cppad_lib/cppad_colpack.cpp
-@@ -17,7 +17,7 @@ in the Eclipse Public License, Version 2.0 are satisfied:
- 
- # if CPPAD_HAS_COLPACK == 0
- namespace CppAD { namespace local {
--    CPPAD_LIB_EXPORT void this_routine_should_never_get_called(void)
-+    void this_routine_should_never_get_called(void)
-     {   CPPAD_ASSERT_UNKNOWN(false); }
- } }
- # else // CPPAD_HAS_COLPACK
-@@ -52,7 +52,7 @@ the entry with index (i, adolc_pattern[i][k]) is a non-zero
- in the sparsity pattern for the matrix.
- */
- // ----------------------------------------------------------------------
--CPPAD_LIB_EXPORT void cppad_colpack_general(
-+void cppad_colpack_general(
-     CppAD::vector<size_t>&               color         ,
-     size_t                               m             ,
-     size_t                               n             ,
-@@ -164,7 +164,7 @@ For i = 0 , ... , m-1, and for k = 1, ... ,adolc_pattern[i][0],
- the entry with index (i, adolc_pattern[i][k]) is
- in the sparsity pattern for the symmetric matrix.
- */
--CPPAD_LIB_EXPORT void cppad_colpack_symmetric(
-+void cppad_colpack_symmetric(
-     CppAD::vector<size_t>&               color         ,
-     size_t                               m             ,
-     const CppAD::vector<unsigned int*>&  adolc_pattern )
-diff --git a/cppad_lib/json_parser.cpp b/cppad_lib/json_parser.cpp
-index fac417d9f..ac0910cee 100644
---- a/cppad_lib/json_parser.cpp
-+++ b/cppad_lib/json_parser.cpp
-@@ -20,7 +20,7 @@ in the Eclipse Public License, Version 2.0 are satisfied:
- // documentation for this routine is in the file below
- # include <cppad/local/graph/json_parser.hpp>
- 
--CPPAD_LIB_EXPORT void CppAD::local::graph::json_parser(
-+void CppAD::local::graph::json_parser(
-     const std::string& json      ,
-     cpp_graph&         graph_obj )
- {   using std::string;
-diff --git a/cppad_lib/json_writer.cpp b/cppad_lib/json_writer.cpp
-index 250345c6e..add4b20a9 100644
---- a/cppad_lib/json_writer.cpp
-+++ b/cppad_lib/json_writer.cpp
-@@ -17,7 +17,7 @@ in the Eclipse Public License, Version 2.0 are satisfied:
- // documentation for this routine is in the file below
- # include <cppad/local/graph/json_writer.hpp>
- 
--CPPAD_LIB_EXPORT void CppAD::local::graph::json_writer(
-+void CppAD::local::graph::json_writer(
-     std::string&                              json                   ,
-     const cpp_graph&                          graph_obj              )
- {   using std::string;
 diff --git a/include/cppad/local/cppad_colpack.hpp b/include/cppad/local/cppad_colpack.hpp
 index ee96ab5fe..6dd022180 100644
 --- a/include/cppad/local/cppad_colpack.hpp
diff --git a/ports/cpuid/portfile.cmake b/ports/cpuid/portfile.cmake
index 48849dc0f..00f374a92 100644
--- a/ports/cpuid/portfile.cmake
+++ b/ports/cpuid/portfile.cmake
@@ -4,25 +4,23 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO anrieff/libcpuid
-    REF f2ab8b7ef2c286f619d96c3ce8902cb76b801bf0
-    SHA512 fcd2d35994554eed80c04315f1cf3bc91f272a5051dde040fe2266d71af902b60ecfd74b6f9dc8284a22f222208c6789bfb94cc12d61de17d605265d3cd2c43d
+    REF 179fbcb713566c2084a1903729b6eebba68a4424 #0.5.1
+    SHA512 76eef8147a9ed2f116ddfd07ab95f76126bee0e23d0e6b5be54d157a1456b769fb698a4799a43c5f81ac12368d76fe8904bff735a698342ad8ee41d43e72645b
     HEAD_REF master
-    PATCHES fix-install-headers.patch
 )
 
-vcpkg_configure_cmake(
-        SOURCE_PATH ${SOURCE_PATH}
-        PREFER_NINJA
-        OPTIONS
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
         -DENABLE_DOCS=OFF
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cpuid)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cpuid)
 
 vcpkg_copy_pdbs()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/cpuid/vcpkg.json b/ports/cpuid/vcpkg.json
index 6c63a4c77..7e8a6aa4e 100644
--- a/ports/cpuid/vcpkg.json
+++ b/ports/cpuid/vcpkg.json
@@ -1,8 +1,17 @@
 {
   "name": "cpuid",
-  "version-string": "0.4.1",
-  "port-version": 2,
+  "version": "0.5.1",
   "description": "Provides CPU identification for the x86 (and x86_64)",
   "homepage": "https://github.com/anrieff/libcpuid",
-  "supports": "x86 | x64"
+  "supports": "x86 | x64",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index 2a64bf513..2f3903a29 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1497,8 +1497,8 @@
       "port-version": 1
     },
     "cppad": {
-      "baseline": "20200000.3",
-      "port-version": 1
+      "baseline": "20210000.7",
+      "port-version": 0
     },
     "cppcms": {
       "baseline": "1.2.1",
@@ -1565,8 +1565,8 @@
       "port-version": 0
     },
     "cpuid": {
-      "baseline": "0.4.1",
-      "port-version": 2
+      "baseline": "0.5.1",
+      "port-version": 0
     },
     "cpuinfo": {
       "baseline": "2021-04-04",
diff --git a/versions/c-/cppad.json b/versions/c-/cppad.json
index 739c86ddb..bfe05de38 100644
--- a/versions/c-/cppad.json
+++ b/versions/c-/cppad.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "00e184c8de4368f8ee0b6b5dd0c16034d7a99a8f",
+      "version-string": "20210000.7",
+      "port-version": 0
+    },
+    {
       "git-tree": "f03801828709574ede2215d05d984764cc271a18",
       "version-string": "20200000.3",
       "port-version": 1
diff --git a/versions/c-/cpuid.json b/versions/c-/cpuid.json
index a7dc8451f..4ba992173 100644
--- a/versions/c-/cpuid.json
+++ b/versions/c-/cpuid.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "65cb7ff3fc46a78367e4c700b587e8093386e4b3",
+      "version": "0.5.1",
+      "port-version": 0
+    },
+    {
       "git-tree": "c85228de687c3b4748a8867c1fbf82f0b64c8d9c",
       "version-string": "0.4.1",
       "port-version": 2